From cb922ca8c8498faa5fb2ba862fe49004dd57ef39 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 29 Sep 2022 13:38:44 -0500
Subject: [PATCH 001/332] DEV: update .ruby-version.sample (#18426)

---
 .ruby-version.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version.sample b/.ruby-version.sample
index 37c2961c24..49cdd668e1 100644
--- a/.ruby-version.sample
+++ b/.ruby-version.sample
@@ -1 +1 @@
-2.7.2
+2.7.6

From f60e6837c676af8d9b270cf8a3a308f4a22a2a94 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:49:17 +0300
Subject: [PATCH 002/332] FEATURE: Add setting to always confirm old email
 (#18417)

By default, only staff members have to confirm their old email when
changing it. This commit adds a site setting that when enabled will
always ask the user to confirm old email.
---
 config/locales/server.en.yml   |  1 +
 config/site_settings.yml       |  1 +
 lib/email_updater.rb           |  3 +--
 spec/lib/email_updater_spec.rb | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fdfa668e77..251474c7f5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2044,6 +2044,7 @@ en:
     raw_email_max_length: "How many characters should be stored for incoming email."
     raw_rejected_email_max_length: "How many characters should be stored for rejected incoming email."
     delete_rejected_email_after_days: "Delete rejected emails older than (n) days."
+    require_change_email_confirmation: "Require non-staff users to confirm their old email address before changing it. Does not apply to staff users, they always need to confirm their old email address."
 
     manual_polling_enabled: "Push emails using the API for email replies."
     pop3_polling_enabled: "Poll via POP3 for email replies."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7dc15b9746..ebf5c76a6b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1291,6 +1291,7 @@ email:
   max_participant_names:
     default: 10
     hidden: true
+  require_change_email_confirmation: false
 
 files:
   max_image_size_kb:
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index c3e3ea8abf..8f5fb292e2 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -58,8 +58,7 @@ class EmailUpdater
     end
 
     if @change_req.change_state.blank? || @change_req.change_state == EmailChangeRequest.states[:complete]
-      @change_req.change_state = if @user.staff?
-        # Staff users must confirm their old email address first.
+      @change_req.change_state = if SiteSetting.require_change_email_confirmation || @user.staff?
         EmailChangeRequest.states[:authorizing_old]
       else
         EmailChangeRequest.states[:authorizing_new]
diff --git a/spec/lib/email_updater_spec.rb b/spec/lib/email_updater_spec.rb
index 0c8b4c6531..a7afd76979 100644
--- a/spec/lib/email_updater_spec.rb
+++ b/spec/lib/email_updater_spec.rb
@@ -43,6 +43,21 @@ RSpec.describe EmailUpdater do
         end
       end
 
+      it "sends an email to confirm old email first if require_change_email_confirmation is enabled" do
+        SiteSetting.require_change_email_confirmation = true
+
+        expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_old_email, to_address: old_email }) do
+          updater.change_to(new_email)
+        end
+
+        expect(updater.change_req).to be_present
+        expect(updater.change_req.old_email).to eq(old_email)
+        expect(updater.change_req.new_email).to eq(new_email)
+        expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old])
+        expect(updater.change_req.old_email_token.email).to eq(old_email)
+        expect(updater.change_req.new_email_token).to be_blank
+      end
+
       it "logs the admin user as the requester" do
         updater.change_to(new_email)
         expect(updater.change_req.requested_by).to eq(admin)

From 9daa6328b525069556de8e9a293f197fbf62fe7f Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 30 Sep 2022 11:01:40 +1000
Subject: [PATCH 003/332] FIX: Quirks around starting new uploads when one was
 in progress (#18393)

This commit addresses issues around starting new uploads in a composer etc.
when one or more uploads are already processing or uploading.
There were a couple of issues:

1. When all preprocessors were complete, we were not resetting
    `completeProcessing` to 0, which meant that `needProcessing`
    would never match `completeProcessing` if a new upload was
    started.
2. We were relying on the uppy "complete" event which is supposed
    to fire when all uploads are complete, but this doesn't seem to take
    into account new uploads that are added. Instead now we can rely on
    our own `inProgressUploads` tracker, and consider all uploads complete
    when there are no `inProgressUploads` in flight
---
 .../app/mixins/composer-upload-uppy.js        |  17 ++-
 .../app/mixins/extendable-uploader.js         |   2 +
 .../discourse/app/mixins/uppy-upload.js       |  27 +++--
 .../acceptance/composer-uploads-uppy-test.js  | 111 ++++++++++++++----
 4 files changed, 115 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
index 8d8f7c9678..d87ea6a46a 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
@@ -339,20 +339,18 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
           file.name,
           upload
         );
+
+        if (this.inProgressUploads.length === 0) {
+          this.appEvents.trigger(
+            `${this.composerEventPrefix}:all-uploads-complete`
+          );
+          this._reset();
+        }
       });
     });
 
     this._uppyInstance.on("upload-error", this._handleUploadError);
 
-    this._uppyInstance.on("complete", () => {
-      run(() => {
-        this.appEvents.trigger(
-          `${this.composerEventPrefix}:all-uploads-complete`
-        );
-        this._reset();
-      });
-    });
-
     this._uppyInstance.on("cancel-all", () => {
       // uppyInstance.reset() also fires cancel-all, so we want to
       // only do the manual cancelling work if the user clicked cancel
@@ -553,6 +551,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
       isUploading: false,
       isProcessingUpload: false,
       isCancellable: false,
+      inProgressUploads: [],
     });
     this._resetPreProcessors();
     this.fileInputEl.value = "";
diff --git a/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js b/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
index ca2a312d3b..8a20a5858b 100644
--- a/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
+++ b/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
@@ -139,6 +139,7 @@ export default Mixin.create(UploadDebugging, {
   _addNeedProcessing(fileCount) {
     this._eachPreProcessor((pluginName, status) => {
       status.needProcessing += fileCount;
+      status.allComplete = false;
     });
   },
 
@@ -167,6 +168,7 @@ export default Mixin.create(UploadDebugging, {
     ) {
       preProcessorStatus.allComplete = true;
       preProcessorStatus.needProcessing = 0;
+      preProcessorStatus.completeProcessing = 0;
 
       if (this._allPreprocessorsComplete()) {
         callback(true);
diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
index 9428e4aea8..11f849bf12 100644
--- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
@@ -221,6 +221,9 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
             );
 
             this._triggerInProgressUploadsEvent();
+            if (this.inProgressUploads.length === 0) {
+              this._allUploadsComplete();
+            }
           })
           .catch((errResponse) => {
             displayErrorForUpload(errResponse, this.siteSettings, file.name);
@@ -235,7 +238,11 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
           upload
         );
         this.uploadDone(deepMerge(upload, { file_name: file.name }));
+
         this._triggerInProgressUploadsEvent();
+        if (this.inProgressUploads.length === 0) {
+          this._allUploadsComplete();
+        }
       }
     });
 
@@ -260,17 +267,6 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
       });
     });
 
-    this._uppyInstance.on("complete", () => {
-      run(() => {
-        if (this.isDestroying || this.isDestroyed) {
-          return;
-        }
-
-        this.appEvents.trigger(`upload-mixin:${this.id}:all-uploads-complete`);
-        this._reset();
-      });
-    });
-
     // TODO (martin) preventDirectS3Uploads is necessary because some of
     // the current upload mixin components, for example the emoji uploader,
     // send the upload to custom endpoints that do fancy things in the rails
@@ -485,4 +481,13 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
   _uploadDropTargetOptions() {
     return { target: this.element };
   },
+
+  _allUploadsComplete() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this.appEvents.trigger(`upload-mixin:${this.id}:all-uploads-complete`);
+    this._reset();
+  },
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
index 0ff8883870..2f62ab4cad 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js
@@ -13,6 +13,8 @@ import { skip, test } from "qunit";
 import { Promise } from "rsvp";
 import sinon from "sinon";
 
+let uploadNumber = 1;
+
 function pretender(server, helper) {
   server.post("/uploads/lookup-urls", () => {
     return helper.response([
@@ -21,27 +23,53 @@ function pretender(server, helper) {
         short_path: "/uploads/short-url/yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
         short_url: "upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
       },
+      {
+        url: "/images/discourse-logo-sketch-small.png",
+        short_path: "/uploads/short-url/sdfljsdfgjlkwg4328.jpeg",
+        short_url: "upload://sdfljsdfgjlkwg4328.jpeg",
+      },
     ]);
   });
 
   server.post(
     "/uploads.json",
     () => {
-      return helper.response({
-        extension: "jpeg",
-        filesize: 126177,
-        height: 800,
-        human_filesize: "123 KB",
-        id: 202,
-        original_filename: "avatar.PNG.jpg",
-        retain_hours: null,
-        short_path: "/uploads/short-url/yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
-        short_url: "upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
-        thumbnail_height: 320,
-        thumbnail_width: 690,
-        url: "/images/discourse-logo-sketch-small.png",
-        width: 1920,
-      });
+      let response = null;
+      if (uploadNumber === 1) {
+        response = {
+          extension: "jpeg",
+          filesize: 126177,
+          height: 800,
+          human_filesize: "123 KB",
+          id: 202,
+          original_filename: "avatar.PNG.jpg",
+          retain_hours: null,
+          short_path: "/uploads/short-url/yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
+          short_url: "upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
+          thumbnail_height: 320,
+          thumbnail_width: 690,
+          url: "/images/discourse-logo-sketch-small.png",
+          width: 1920,
+        };
+        uploadNumber += 1;
+      } else {
+        response = {
+          extension: "jpeg",
+          filesize: 4322,
+          height: 800,
+          human_filesize: "566 KB",
+          id: 202,
+          original_filename: "avatar2.PNG.jpg",
+          retain_hours: null,
+          short_path: "/uploads/short-url/sdfljsdfgjlkwg4328.jpeg",
+          short_url: "upload://sdfljsdfgjlkwg4328.jpeg",
+          thumbnail_height: 320,
+          thumbnail_width: 690,
+          url: "/images/discourse-logo-sketch-small.png",
+          width: 1920,
+        };
+      }
+      return helper.response(response);
     },
     500 // this delay is important to slow down the uploads a bit so we can click elements in the UI like the cancel button
   );
@@ -54,6 +82,9 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
     simultaneous_uploads: 2,
     enable_rich_text_paste: true,
   });
+  needs.hooks.afterEach(() => {
+    uploadNumber = 1;
+  });
 
   test("should insert the Uploading placeholder then the complete image placeholder", async function (assert) {
     await visit("/");
@@ -62,7 +93,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
     const appEvents = loggedInUser().appEvents;
     const done = assert.async();
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n"
@@ -81,6 +113,35 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
     appEvents.trigger("composer:add-files", image);
   });
 
+  test("should handle adding one file for upload then adding another when the first is still in progress", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn(".d-editor-input", "The image:\n");
+    const appEvents = loggedInUser().appEvents;
+    const done = assert.async();
+
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
+      assert.strictEqual(
+        query(".d-editor-input").value,
+        "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n![avatar2.PNG|690x320](upload://sdfljsdfgjlkwg4328.jpeg)\n"
+      );
+      done();
+    });
+
+    let image2Added = false;
+    appEvents.on("composer:upload-started", () => {
+      if (!image2Added) {
+        appEvents.trigger("composer:add-files", image2);
+        image2Added = true;
+      }
+    });
+
+    const image1 = createFile("avatar.png");
+    const image2 = createFile("avatar2.png");
+    appEvents.trigger("composer:add-files", image1);
+  });
+
   test("should handle placeholders correctly even if the OS rewrites ellipses", async function (assert) {
     const execCommand = document.execCommand;
     sinon.stub(document, "execCommand").callsFake(function (...args) {
@@ -96,7 +157,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
     const appEvents = loggedInUser().appEvents;
     const done = assert.async();
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n"
@@ -221,7 +283,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
       );
     });
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n"
@@ -251,7 +314,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
       );
     });
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n Text after the image."
@@ -284,7 +348,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
       );
     });
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n Text after the image."
@@ -309,7 +374,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
       );
     });
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n"
@@ -335,7 +401,8 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) {
       );
     });
 
-    appEvents.on("composer:all-uploads-complete", () => {
+    appEvents.on("composer:all-uploads-complete", async () => {
+      await settled();
       assert.strictEqual(
         query(".d-editor-input").value,
         "The image:\n![avatar.PNG|690x320](upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg)\n"

From 4c5e575c15292232c58ce44e2d1566c6f433dc81 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 30 Sep 2022 10:02:51 +0800
Subject: [PATCH 004/332] FIX: Ensure closing sidebar tears down all callbacks.
 (#18434)

---
 .../sidebar/common/community-section.js       |  9 +++++++-
 .../sidebar/user/categories-section.js        |  2 ++
 .../sidebar/user/community-section.js         |  2 ++
 .../sidebar-user-community-section-test.js    | 23 ++++++-------------
 .../tests/acceptance/sidebar-user-test.js     | 22 ++++++++++++++++++
 5 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
index 9a2e5174d8..b40754fcbc 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
@@ -35,7 +35,14 @@ export default class SidebarCommunitySection extends Component {
   }
 
   willDestroy() {
-    this.sectionLinks.forEach((sectionLink) => sectionLink.teardown());
+    [
+      ...this.sectionLinks,
+      ...this.moreSectionLinks,
+      ...this.moreSecondarySectionLinks,
+    ].forEach((sectionLink) => {
+      sectionLink.teardown?.();
+    });
+
     this.topicTrackingState.offStateChange(this.callbackId);
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
index aee1619f04..4e0d3c3e7c 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
@@ -21,6 +21,8 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
   }
 
   willDestroy() {
+    super.willDestroy(...arguments);
+
     this.topicTrackingState.offStateChange(this.callbackId);
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
index c3b0fe911a..8f2ffef367 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
@@ -39,6 +39,8 @@ export default class SidebarUserCommunitySection extends SidebarCommonCommunityS
   }
 
   willDestroy() {
+    super.willDestroy(...arguments);
+
     this.appEvents.off(
       "user-reviewable-count:changed",
       this._refreshSectionLinks
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index f034d089f4..e56736f273 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -984,6 +984,8 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
   });
 
   test("adding section link via plugin API with callback function", async function (assert) {
+    let teardownCalled = false;
+
     withPluginApi("1.2.0", (api) => {
       api.addCommunitySectionLink((baseSectionLink) => {
         return class CustomSectionLink extends baseSectionLink {
@@ -1006,6 +1008,10 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
           get text() {
             return "my summary";
           }
+
+          get teardown() {
+            teardownCalled = true;
+          }
         };
       });
     });
@@ -1035,24 +1041,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       "eviltrout summary",
       "displays the right title for the link"
     );
-  });
-
-  test("clean up topic tracking state state changed callbacks when section is destroyed", async function (assert) {
-    await visit("/");
-
-    const topicTrackingState = this.container.lookup(
-      "service:topic-tracking-state"
-    );
-
-    const initialCallbackCount = Object.keys(
-      topicTrackingState.stateChangeCallbacks
-    ).length;
 
     await click(".btn-sidebar-toggle");
 
-    assert.ok(
-      Object.keys(topicTrackingState.stateChangeCallbacks).length <
-        initialCallbackCount
-    );
+    assert.ok(teardownCalled, "section link teardown callback was called");
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
index 5f5aa93fca..10ed04ae0f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
@@ -169,5 +169,27 @@ acceptance(
         "displays the mobile icon for the button"
       );
     });
+
+    test("clean up topic tracking state state changed callbacks when sidebar is destroyed", async function (assert) {
+      this.siteSettings.tagging_enabled = true;
+
+      await visit("/");
+
+      const topicTrackingState = this.container.lookup(
+        "service:topic-tracking-state"
+      );
+
+      const initialCallbackCount = Object.keys(
+        topicTrackingState.stateChangeCallbacks
+      ).length;
+
+      await click(".btn-sidebar-toggle");
+
+      assert.strictEqual(
+        Object.keys(topicTrackingState.stateChangeCallbacks).length,
+        initialCallbackCount - 3,
+        "the 3 topic tracking state change callbacks are removed"
+      );
+    });
   }
 );

From 5f81f5d392b1ea767d2fbd2e9f2f482066611831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 10:03:11 +0800
Subject: [PATCH 005/332] Build(deps): Bump excon from 0.92.5 to 0.93.0
 (#18433)

Bumps [excon](https://github.com/excon/excon) from 0.92.5 to 0.93.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.92.5...v0.93.0)

---
updated-dependencies:
- dependency-name: excon
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a47d48853..a532e1a9c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
       sprockets (>= 3.3, < 4.1)
     ember-source (2.18.2)
     erubi (1.11.0)
-    excon (0.92.5)
+    excon (0.93.0)
     execjs (2.8.1)
     exifr (1.3.9)
     fabrication (2.30.0)

From ff456510530b6c2dd22af5bbfe8c0dd327311de3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 10:03:25 +0800
Subject: [PATCH 006/332] Build(deps): Bump net-imap from 0.3.0 to 0.3.1
 (#18432)

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.3.0...v0.3.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a532e1a9c5..8f6fd96267 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     mustache (1.1.1)
     net-http (0.2.2)
       uri
-    net-imap (0.3.0)
+    net-imap (0.3.1)
       net-protocol
     net-pop (0.1.2)
       net-protocol

From 847e1db7fbe9886de7f9059079feadc0395cfe88 Mon Sep 17 00:00:00 2001
From: Meghna <11170663+MeghnaAJ@users.noreply.github.com>
Date: Fri, 30 Sep 2022 07:34:54 +0530
Subject: [PATCH 007/332] UX: move dismiss button on the bottom to the right of
 the footer message (#18424)

---
 app/assets/stylesheets/desktop/topic-list.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 8587b1b278..e516d09ec0 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -137,6 +137,12 @@
 
 .topic-list-bottom {
   margin: 20px 0;
+  .footer-message {
+    padding-top: 4px;
+  }
+  .dismiss-container-bottom {
+    float: right;
+  }
 }
 
 // Misc. stuff

From 69c20a3a5e418d700ccd7f5b328034d43fff18b7 Mon Sep 17 00:00:00 2001
From: Frank <frank3manuel@gmail.com>
Date: Fri, 30 Sep 2022 10:35:42 +0800
Subject: [PATCH 008/332] FIX: Removed bookmark reminder alert for reminders
 set in the past (#18398)

---
 .../discourse/app/components/bookmark.js      |  6 +-
 .../components/bookmark-alert-test.js         | 70 +++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js

diff --git a/app/assets/javascripts/discourse/app/components/bookmark.js b/app/assets/javascripts/discourse/app/components/bookmark.js
index 0ede10b3c2..14997c5aad 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark.js
@@ -261,7 +261,11 @@ export default Component.extend({
     KeyboardShortcuts.unpause();
   },
 
-  showExistingReminderAt: notEmpty("model.reminderAt"),
+  @discourseComputed("model.reminderAt")
+  showExistingReminderAt(reminderAt) {
+    return reminderAt && Date.parse(reminderAt) > new Date().getTime();
+  },
+
   showDelete: notEmpty("model.id"),
   userHasTimezoneSet: notEmpty("userTimezone"),
   editingExistingBookmark: and("model", "model.id"),
diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js
new file mode 100644
index 0000000000..f90e5415ab
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js
@@ -0,0 +1,70 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { exists } from "discourse/tests/helpers/qunit-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Integration | Component | bookmark-alert", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.setProperties({
+      model: {},
+      closeModal: () => {},
+      afterSave: () => {},
+      afterDelete: () => {},
+      registerOnCloseHandler: () => {},
+      onCloseWithoutSaving: () => {},
+    });
+  });
+
+  test("alert exists for reminder in the future", async function (assert) {
+    let name = "test";
+    let futureDate = new Date();
+    futureDate.setDate(futureDate.getDate() + 10);
+
+    let reminderAt = futureDate.toISOString();
+    this.model = { id: 1, name, reminderAt };
+
+    await render(hbs`
+      <Bookmark
+        @model={{this.model}}
+        @afterSave={{this.afterSave}}
+        @afterDelete={{this.afterDelete}}
+        @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
+        @registerOnCloseHandler={{this.registerOnCloseHandler}}
+        @closeModal={{this.closeModal}}
+      />
+    `);
+
+    assert.ok(
+      exists(".existing-reminder-at-alert"),
+      "alert found for future reminder"
+    );
+  });
+
+  test("alert does not exist for reminder in the past", async function (assert) {
+    let name = "test";
+    let pastDate = new Date();
+    pastDate.setDate(pastDate.getDate() - 1);
+
+    let reminderAt = pastDate.toISOString();
+    this.model = { id: 1, name, reminderAt };
+
+    await render(hbs`
+      <Bookmark
+        @model={{this.model}}
+        @afterSave={{this.afterSave}}
+        @afterDelete={{this.afterDelete}}
+        @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
+        @registerOnCloseHandler={{this.registerOnCloseHandler}}
+        @closeModal={{this.closeModal}}
+      />
+    `);
+
+    assert.ok(
+      !exists(".existing-reminder-at-alert"),
+      "alert not found for past reminder"
+    );
+  });
+});

From 079450c9e496ac9bed8ff491ceb1e4ac0b83448f Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 30 Sep 2022 06:10:07 +0300
Subject: [PATCH 009/332] DEV: Do not show handled reviewables in the user menu
 (#18402)

Currently, the reviewables tab in the user menu shows pending reviewables at the top of the menu and fills the remaining space in the menu with old/handled reviewables. This PR makes the revieables tab show only pending reviewables and hides the tab altogether from the menu if there are no pending reviewables. We're going to follow-up with another change soon that will show pending reviewables in the main tab of the user menu.

Internal topic: t/73220.
---
 .../app/components/user-menu/menu.js          |  4 +-
 .../tests/acceptance/user-menu-test.js        |  9 ++-
 .../components/user-menu/menu-test.js         | 11 ++-
 app/controllers/reviewables_controller.rb     |  2 +-
 app/models/reviewable.rb                      | 22 -----
 spec/models/reviewable_spec.rb                | 81 -------------------
 spec/requests/reviewables_controller_spec.rb  | 32 ++++----
 7 files changed, 37 insertions(+), 124 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
index d94c3a941c..403737a898 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
@@ -218,7 +218,9 @@ const CORE_TOP_TABS = [
     }
 
     get shouldDisplay() {
-      return this.currentUser.can_review;
+      return (
+        this.currentUser.can_review && this.currentUser.get("reviewable_count")
+      );
     }
 
     get count() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index da24b409fd..a6fba10a5e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -119,6 +119,7 @@ acceptance("User menu", function (needs) {
   });
 
   test("clicking on user menu items", async function (assert) {
+    updateCurrentUser({ reviewable_count: 1 });
     await visit("/");
     await click(".d-header-icons .current-user");
     await click("#user-menu-button-review-queue");
@@ -169,6 +170,7 @@ acceptance("User menu", function (needs) {
   });
 
   test("tabs have title attributes", async function (assert) {
+    updateCurrentUser({ reviewable_count: 1 });
     withPluginApi("0.1", (api) => {
       api.registerUserMenuTab((UserMenuTab) => {
         return class extends UserMenuTab {
@@ -208,7 +210,10 @@ acceptance("User menu", function (needs) {
       "user-menu-button-messages": I18n.t("user_menu.tabs.messages"),
       "user-menu-button-bookmarks": I18n.t("user_menu.tabs.bookmarks"),
       "user-menu-button-tiny-tab-1": "Custom title: 73",
-      "user-menu-button-review-queue": I18n.t("user_menu.tabs.review_queue"),
+      "user-menu-button-review-queue": I18n.t(
+        "user_menu.tabs.review_queue_with_unread",
+        { count: 1 }
+      ),
       "user-menu-button-other-notifications": I18n.t(
         "user_menu.tabs.other_notifications"
       ),
@@ -235,6 +240,7 @@ acceptance("User menu", function (needs) {
   });
 
   test("tabs added via the plugin API", async function (assert) {
+    updateCurrentUser({ reviewable_count: 1 });
     withPluginApi("0.1", (api) => {
       api.registerUserMenuTab((UserMenuTab) => {
         return class extends UserMenuTab {
@@ -674,6 +680,7 @@ acceptance("User menu", function (needs) {
   });
 
   test("the active tab can be clicked again to navigate to a page", async function (assert) {
+    updateCurrentUser({ reviewable_count: 1 });
     withPluginApi("0.1", (api) => {
       api.registerUserMenuTab((UserMenuTab) => {
         return class extends UserMenuTab {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
index 3687efe765..58b348297b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
@@ -82,8 +82,9 @@ module("Integration | Component | user-menu", function (hooks) {
     );
   });
 
-  test("reviewables tab is shown if current user can review", async function (assert) {
+  test("reviewables tab is shown if current user can review and there are pending reviewables", async function (assert) {
     this.currentUser.set("can_review", true);
+    this.currentUser.set("reviewable_count", 1);
     await render(template);
     const tab = query("#user-menu-button-review-queue");
     assert.strictEqual(tab.dataset.tabNumber, "7");
@@ -98,6 +99,13 @@ module("Integration | Component | user-menu", function (hooks) {
     );
   });
 
+  test("reviewables tab is not shown if current user can review but there are no pending reviewables", async function (assert) {
+    this.currentUser.set("can_review", true);
+    this.currentUser.set("reviewable_count", 0);
+    await render(template);
+    assert.notOk(exists("#user-menu-button-review-queue"));
+  });
+
   test("messages tab isn't shown if current user isn't staff and user does not belong to personal_message_enabled_groups", async function (assert) {
     this.currentUser.set("moderator", false);
     this.currentUser.set("admin", false);
@@ -146,6 +154,7 @@ module("Integration | Component | user-menu", function (hooks) {
 
   test("changing tabs", async function (assert) {
     this.currentUser.set("can_review", true);
+    this.currentUser.set("reviewable_count", 1);
     await render(template);
     let queryParams;
     pretender.get("/notifications", (request) => {
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 7099796ce0..06d87927e4 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -71,7 +71,7 @@ class ReviewablesController < ApplicationController
   end
 
   def user_menu_list
-    reviewables = Reviewable.recent_list_with_pending_first(current_user).to_a
+    reviewables = Reviewable.list_for(current_user, limit: 30, status: :pending).to_a
     json = {
       reviewables: reviewables.map! { |r| r.basic_serializer.new(r, scope: guardian, root: nil).as_json }
     }
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 0f544519ea..b8f57b2b1f 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -534,28 +534,6 @@ class Reviewable < ActiveRecord::Base
     results
   end
 
-  def self.recent_list_with_pending_first(user, limit: 30)
-    min_score = Reviewable.min_score_for_priority
-
-    query = Reviewable
-      .includes(:created_by, :topic, :target)
-      .viewable_by(user, preload: false)
-      .except(:order)
-      .order(score: :desc, created_at: :desc)
-      .limit(limit)
-
-    if min_score > 0
-      query = query.where(<<~SQL, min_score: min_score)
-        reviewables.score >= :min_score OR reviewables.force_review
-      SQL
-    end
-    records = query.where(status: Reviewable.statuses[:pending]).to_a
-    if records.size < limit
-      records += query.where.not(status: Reviewable.statuses[:pending]).to_a
-    end
-    records
-  end
-
   def serializer
     self.class.serializer_for(self)
   end
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 9c1d63d012..53a6bcd252 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -300,87 +300,6 @@ RSpec.describe Reviewable, type: :model do
     end
   end
 
-  describe ".recent_list_with_pending_first" do
-    fab!(:pending_reviewable1) do
-      Fabricate(
-        :reviewable,
-        score: 150,
-        created_at: 7.minutes.ago,
-        status: Reviewable.statuses[:pending]
-      )
-    end
-    fab!(:pending_reviewable2) do
-      Fabricate(
-        :reviewable,
-        score: 100,
-        status: Reviewable.statuses[:pending]
-      )
-    end
-    fab!(:approved_reviewable1) do
-      Fabricate(
-        :reviewable,
-        created_at: 1.minutes.ago,
-        score: 300,
-        status: Reviewable.statuses[:approved]
-      )
-    end
-    fab!(:approved_reviewable2) do
-      Fabricate(
-        :reviewable,
-        created_at: 5.minutes.ago,
-        score: 200,
-        status: Reviewable.statuses[:approved]
-      )
-    end
-
-    fab!(:admin) { Fabricate(:admin) }
-
-    it "returns a list of reviewables with pending items first" do
-      list = Reviewable.recent_list_with_pending_first(admin)
-      expect(list.map(&:id)).to eq([
-        pending_reviewable1.id,
-        pending_reviewable2.id,
-        approved_reviewable1.id,
-        approved_reviewable2.id
-      ])
-
-      pending_reviewable1.update!(status: Reviewable.statuses[:rejected])
-      rejected_reviewable = pending_reviewable1
-
-      list = Reviewable.recent_list_with_pending_first(admin)
-      expect(list.map(&:id)).to eq([
-        pending_reviewable2.id,
-        approved_reviewable1.id,
-        approved_reviewable2.id,
-        rejected_reviewable.id,
-      ])
-    end
-
-    it "only includes reviewables whose score is above the minimum or are forced for review" do
-      SiteSetting.reviewable_default_visibility = 'high'
-      Reviewable.set_priorities({ high: 200 })
-
-      list = Reviewable.recent_list_with_pending_first(admin)
-      expect(list.map(&:id)).to eq([
-        approved_reviewable1.id,
-        approved_reviewable2.id,
-      ])
-
-      pending_reviewable1.update!(force_review: true)
-
-      list = Reviewable.recent_list_with_pending_first(admin)
-      expect(list.map(&:id)).to eq([
-        pending_reviewable1.id,
-        approved_reviewable1.id,
-        approved_reviewable2.id,
-      ])
-    end
-
-    it "accepts a limit argument to limit the number of returned records" do
-      expect(Reviewable.recent_list_with_pending_first(admin, limit: 2).size).to eq(2)
-    end
-  end
-
   it "valid_types returns the appropriate types" do
     expect(Reviewable.valid_type?('ReviewableUser')).to eq(true)
     expect(Reviewable.valid_type?('ReviewableQueuedPost')).to eq(true)
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 3a19ce3ecc..ae84f5e23f 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -255,7 +255,7 @@ RSpec.describe ReviewablesController do
     end
 
     describe "#user_menu_list" do
-      it "renders each reviewable with its basic serializers" do
+      it "renders each reviewable using its basic serializers" do
         reviewable_user = Fabricate(:reviewable_user, payload: { username: "someb0dy" })
         reviewable_flagged_post = Fabricate(:reviewable_flagged_post)
         reviewable_queued_post = Fabricate(:reviewable_queued_post)
@@ -284,40 +284,38 @@ RSpec.describe ReviewablesController do
       end
 
       it "returns JSON containing basic information of reviewables" do
-        reviewable1 = Fabricate(:reviewable)
-        reviewable2 = Fabricate(:reviewable, status: Reviewable.statuses[:approved])
+        reviewable = Fabricate(:reviewable)
         get "/review/user-menu-list.json"
         expect(response.status).to eq(200)
         reviewables = response.parsed_body["reviewables"]
-        expect(reviewables.size).to eq(2)
-        expect(reviewables[0]["flagger_username"]).to eq(reviewable1.created_by.username)
-        expect(reviewables[0]["id"]).to eq(reviewable1.id)
-        expect(reviewables[0]["type"]).to eq(reviewable1.type)
+        expect(reviewables.size).to eq(1)
+        expect(reviewables[0]["flagger_username"]).to eq(reviewable.created_by.username)
+        expect(reviewables[0]["id"]).to eq(reviewable.id)
+        expect(reviewables[0]["type"]).to eq(reviewable.type)
         expect(reviewables[0]["pending"]).to eq(true)
-
-        expect(reviewables[1]["flagger_username"]).to eq(reviewable2.created_by.username)
-        expect(reviewables[1]["id"]).to eq(reviewable2.id)
-        expect(reviewables[1]["type"]).to eq(reviewable2.type)
-        expect(reviewables[1]["pending"]).to eq(false)
       end
 
-      it "puts pending reviewables on top" do
-        approved1 = Fabricate(
+      it "responds with pending reviewables only" do
+        Fabricate(
           :reviewable,
           status: Reviewable.statuses[:approved]
         )
-        pending = Fabricate(
+        pending1 = Fabricate(
           :reviewable,
           status: Reviewable.statuses[:pending]
         )
-        approved2 = Fabricate(
+        Fabricate(
           :reviewable,
           status: Reviewable.statuses[:approved]
         )
+        pending2 = Fabricate(
+          :reviewable,
+          status: Reviewable.statuses[:pending]
+        )
         get "/review/user-menu-list.json"
         expect(response.status).to eq(200)
         reviewables = response.parsed_body["reviewables"]
-        expect(reviewables.map { |r| r["id"] }).to eq([pending.id, approved2.id, approved1.id])
+        expect(reviewables.map { |r| r["id"] }).to eq([pending2.id, pending1.id])
       end
     end
 

From 0bdb616edc23975fd33a39227781556246cceb35 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 30 Sep 2022 13:13:50 +0800
Subject: [PATCH 010/332] DEV: Refactor community section code (#18436)

In a recent commit when adding the review section link, I moved to a
pattern where we allowed the section links to be refreshed after the
section has been constructed. However, we were not tearing down the old
section links when refreshing. This made me realise that refreshing
section links in a section is not a pattern I want to adopt since people
can easily forget to teardown. Instead, each section link should be
responsible for defining a teardown function for cleanup which will
always be called when the sidebar is removed.
---
 .../sidebar/common/community-section.hbs      |   1 +
 .../sidebar/common/community-section.js       |  51 ++++---
 .../components/sidebar/more-section-link.hbs  |   1 +
 .../app/components/sidebar/section-link.hbs   | 126 +++++++++---------
 .../app/components/sidebar/section-link.js    |   8 ++
 .../sidebar/user/community-section.js         |  42 ++----
 .../sidebar/base-community-section-link.js    |   2 +
 .../community-section/review-section-link.js  |  34 ++++-
 8 files changed, 140 insertions(+), 125 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs
index b7b54e3173..2727a2093b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs
@@ -13,6 +13,7 @@
 
   {{#each this.sectionLinks as |sectionLink|}}
     <Sidebar::SectionLink
+      @shouldDisplay={{sectionLink.shouldDisplay}}
       @linkName={{sectionLink.name}}
       @href={{sectionLink.href}}
       @route={{sectionLink.route}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
index b40754fcbc..3def2b0480 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
@@ -25,7 +25,23 @@ export default class SidebarCommunitySection extends Component {
   constructor() {
     super(...arguments);
 
-    this.refreshSectionLinks();
+    this.moreSectionLinks = this.#initializeSectionLinks(
+      [...this.defaultMoreSectionLinks, ...customSectionLinks],
+      { inMoreDrawer: true }
+    );
+
+    this.moreSecondarySectionLinks = this.#initializeSectionLinks(
+      [
+        ...this.defaultMoreSecondarySectionLinks,
+        ...secondaryCustomSectionLinks,
+      ],
+      { inMoreDrawer: true }
+    );
+
+    this.sectionLinks = this.#initializeSectionLinks(
+      this.defaultMainSectionLinks,
+      { inMoreDrawer: false }
+    );
 
     this.callbackId = this.topicTrackingState.onStateChange(() => {
       this.sectionLinks.forEach((sectionLink) => {
@@ -61,41 +77,20 @@ export default class SidebarCommunitySection extends Component {
     return [];
   }
 
-  refreshSectionLinks() {
-    this.moreSectionLinks = this.#initializeSectionLinks([
-      ...this.defaultMoreSectionLinks,
-      ...customSectionLinks,
-    ]);
-
-    this.moreSecondarySectionLinks = this.#initializeSectionLinks([
-      ...this.defaultMoreSecondarySectionLinks,
-      ...secondaryCustomSectionLinks,
-    ]);
-
-    this.sectionLinks = this.#initializeSectionLinks(
-      this.defaultMainSectionLinks
-    );
+  #initializeSectionLinks(sectionLinkClasses, { inMoreDrawer } = {}) {
+    return sectionLinkClasses.map((sectionLinkClass) => {
+      return this.#initializeSectionLink(sectionLinkClass, inMoreDrawer);
+    });
   }
 
-  #initializeSectionLinks(sectionLinkClasses) {
-    return sectionLinkClasses.reduce((links, sectionLinkClass) => {
-      const sectionLink = this.#initializeSectionLink(sectionLinkClass);
-
-      if (sectionLink.shouldDisplay) {
-        links.push(sectionLink);
-      }
-
-      return links;
-    }, []);
-  }
-
-  #initializeSectionLink(sectionLinkClass) {
+  #initializeSectionLink(sectionLinkClass, inMoreDrawer) {
     return new sectionLinkClass({
       topicTrackingState: this.topicTrackingState,
       currentUser: this.currentUser,
       appEvents: this.appEvents,
       router: this.router,
       siteSettings: this.siteSettings,
+      inMoreDrawer,
     });
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
index 321beab314..408e8abc65 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
@@ -1,4 +1,5 @@
 <Sidebar::SectionLink
+  @shouldDisplay={{@sectionLink.shouldDisplay}}
   @linkName={{@sectionLink.name}}
   @route={{@sectionLink.route}}
   @href={{@sectionLink.href}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
index 570e57590f..6392680354 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
@@ -1,68 +1,70 @@
-<div class="sidebar-section-link-wrapper">
-  {{#if @href}}
-    <a href={{@href}} rel="noopener noreferrer" target="_blank" class={{this.classNames}} title={{@title}}>
-      <Sidebar::SectionLinkPrefix
-        @prefixType={{@prefixType}}
-        @prefixValue={{@prefixValue}}
-        @prefixCSSClass={{@prefixCSSClass}}
-        @prefixCSS={{this.prefixCSS}}
-        @prefixBadge={{@prefixBadge}}
-      />
+{{#if this.shouldDisplay}}
+  <div class="sidebar-section-link-wrapper">
+    {{#if @href}}
+      <a href={{@href}} rel="noopener noreferrer" target="_blank" class={{this.classNames}} title={{@title}}>
+        <Sidebar::SectionLinkPrefix
+          @prefixType={{@prefixType}}
+          @prefixValue={{@prefixValue}}
+          @prefixCSSClass={{@prefixCSSClass}}
+          @prefixCSS={{this.prefixCSS}}
+          @prefixBadge={{@prefixBadge}}
+        />
 
-      <span class="sidebar-section-link-content-text">
-        {{@content}}
-      </span>
-    </a>
-  {{else}}
-    <Sidebar::SectionLinkTo
-      @class={{this.classNames}}
-      @route={{@route}}
-      @query={{@query}}
-      @models={{this.models}}
-      @current-when={{@currentWhen}}
-      @title={{@title}}
-    >
-
-      <Sidebar::SectionLinkPrefix
-        @prefixType={{@prefixType}}
-        @prefixValue={{@prefixValue}}
-        @prefixCSSClass={{@prefixCSSClass}}
-        @prefixCSS={{this.prefixCSS}}
-        @prefixBadge={{@prefixBadge}}
-      />
-
-      <span class="sidebar-section-link-content-text">
-        {{@content}}
-      </span>
-
-      {{#if @badgeText}}
-        <span class="sidebar-section-link-content-badge">
-          {{@badgeText}}
+        <span class="sidebar-section-link-content-text">
+          {{@content}}
         </span>
-      {{/if}}
+      </a>
+    {{else}}
+      <Sidebar::SectionLinkTo
+        @class={{this.classNames}}
+        @route={{@route}}
+        @query={{@query}}
+        @models={{this.models}}
+        @current-when={{@currentWhen}}
+        @title={{@title}}
+      >
 
-      {{#if @suffixValue}}
-        <span class={{concat-class "sidebar-section-link-suffix" @suffixType @suffixCSSClass}}>
-          {{#if (eq @suffixType "icon")}}
-            {{d-icon @suffixValue}}
-          {{/if}}
+        <Sidebar::SectionLinkPrefix
+          @prefixType={{@prefixType}}
+          @prefixValue={{@prefixValue}}
+          @prefixCSSClass={{@prefixCSSClass}}
+          @prefixCSS={{this.prefixCSS}}
+          @prefixBadge={{@prefixBadge}}
+        />
+
+        <span class="sidebar-section-link-content-text">
+          {{@content}}
         </span>
-      {{/if}}
 
-      {{#if @hoverValue}}
-        <span class="sidebar-section-link-hover">
-          <button
-            type="button"
-            title={{@hoverTitle}}
-            class="sidebar-section-hover-button"
-            {{on "click" @hoverAction}}
-            >
-            {{#if (eq @hoverType "icon")}}
-              {{d-icon @hoverValue class="hover-icon"}}
+        {{#if @badgeText}}
+          <span class="sidebar-section-link-content-badge">
+            {{@badgeText}}
+          </span>
+        {{/if}}
+
+        {{#if @suffixValue}}
+          <span class={{concat-class "sidebar-section-link-suffix" @suffixType @suffixCSSClass}}>
+            {{#if (eq @suffixType "icon")}}
+              {{d-icon @suffixValue}}
             {{/if}}
-          </button>
-        </span>
-      {{/if}}
-    </Sidebar::SectionLinkTo>
-  {{/if}}
-</div>
+          </span>
+        {{/if}}
+
+        {{#if @hoverValue}}
+          <span class="sidebar-section-link-hover">
+            <button
+              type="button"
+              title={{@hoverTitle}}
+              class="sidebar-section-hover-button"
+              {{on "click" @hoverAction}}
+              >
+              {{#if (eq @hoverType "icon")}}
+                {{d-icon @hoverValue class="hover-icon"}}
+              {{/if}}
+            </button>
+          </span>
+        {{/if}}
+      </Sidebar::SectionLinkTo>
+    {{/if}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index 16385ec1f9..7b87c8f8e6 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -8,6 +8,14 @@ export default class SectionLink extends Component {
     }
   }
 
+  get shouldDisplay() {
+    if (this.args.shouldDisplay === undefined) {
+      return true;
+    }
+
+    return this.args.shouldDisplay;
+  }
+
   get classNames() {
     let classNames = [
       "sidebar-section-link",
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
index 8f2ffef367..1191981a20 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
@@ -1,6 +1,5 @@
 import I18n from "I18n";
 
-import { bind } from "discourse-common/utils/decorators";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import PermissionType from "discourse/models/permission-type";
@@ -31,50 +30,25 @@ export default class SidebarUserCommunitySection extends SidebarCommonCommunityS
         title: I18n.t("sidebar.sections.community.header_action_title"),
       },
     ];
-
-    this.appEvents.on(
-      "user-reviewable-count:changed",
-      this._refreshSectionLinks
-    );
-  }
-
-  willDestroy() {
-    super.willDestroy(...arguments);
-
-    this.appEvents.off(
-      "user-reviewable-count:changed",
-      this._refreshSectionLinks
-    );
-  }
-
-  @bind
-  _refreshSectionLinks() {
-    return this.refreshSectionLinks();
   }
 
   get defaultMainSectionLinks() {
-    const links = [
+    return [
       EverythingSectionLink,
       TrackedSectionLink,
       MyPostsSectionLink,
       AdminSectionLink,
+      ReviewSectionLink,
     ];
-
-    if (this.currentUser.reviewable_count > 0) {
-      links.push(ReviewSectionLink);
-    }
-
-    return links;
   }
 
   get defaultMoreSectionLinks() {
-    const links = [GroupsSectionLink, UsersSectionLink, BadgesSectionLink];
-
-    if (this.currentUser.reviewable_count === 0) {
-      links.push(ReviewSectionLink);
-    }
-
-    return links;
+    return [
+      GroupsSectionLink,
+      UsersSectionLink,
+      BadgesSectionLink,
+      ReviewSectionLink,
+    ];
   }
 
   get defaultMoreSecondarySectionLinks() {
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
index 0ed22c7390..e7dc1603fd 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
@@ -8,12 +8,14 @@ export default class BaseCommunitySectionLink {
     appEvents,
     router,
     siteSettings,
+    inMoreDrawer,
   } = {}) {
     this.router = router;
     this.topicTrackingState = topicTrackingState;
     this.currentUser = currentUser;
     this.appEvents = appEvents;
     this.siteSettings = siteSettings;
+    this.inMoreDrawer = inMoreDrawer;
   }
 
   /**
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
index 52563a0389..04716cca09 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
@@ -1,8 +1,40 @@
 import I18n from "I18n";
 
+import { tracked } from "@glimmer/tracking";
+
+import { bind } from "discourse-common/utils/decorators";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
 
 export default class ReviewSectionLink extends BaseSectionLink {
+  @tracked canDisplay;
+
+  constructor() {
+    super(...arguments);
+
+    this._refreshCanDisplay();
+    this.appEvents.on("user-reviewable-count:changed", this._refreshCanDisplay);
+  }
+
+  teardown() {
+    this.appEvents.off(
+      "user-reviewable-count:changed",
+      this._refreshCanDisplay
+    );
+  }
+
+  @bind
+  _refreshCanDisplay() {
+    if (!this.currentUser.can_review) {
+      this.canDisplay = false;
+    }
+
+    if (this.inMoreDrawer) {
+      this.canDisplay = this.currentUser.reviewable_count < 1;
+    } else {
+      this.canDisplay = this.currentUser.reviewable_count > 0;
+    }
+  }
+
   get name() {
     return "review";
   }
@@ -20,7 +52,7 @@ export default class ReviewSectionLink extends BaseSectionLink {
   }
 
   get shouldDisplay() {
-    return this.currentUser.can_review;
+    return this.canDisplay;
   }
 
   get badgeText() {

From 6ebd2cecda6330cc40bd70d6336a44ad65f22b3f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Fri, 30 Sep 2022 10:48:26 +0530
Subject: [PATCH 011/332] FIX: missing theme upload should not break precompile
 process. (#18431)

Previously, if an active default theme's upload record went missing then it will break the site and cause downtime.
---
 lib/stylesheet/manager/builder.rb   |  2 +-
 spec/lib/stylesheet/manager_spec.rb | 31 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/lib/stylesheet/manager/builder.rb b/lib/stylesheet/manager/builder.rb
index 4a0ed806c1..137d48db9f 100644
--- a/lib/stylesheet/manager/builder.rb
+++ b/lib/stylesheet/manager/builder.rb
@@ -222,7 +222,7 @@ class Stylesheet::Manager::Builder
     sha1s = []
 
     (theme&.upload_fields || []).map do |upload_field|
-      sha1s << upload_field.upload.sha1
+      sha1s << upload_field.upload&.sha1
     end
 
     Digest::SHA1.hexdigest(sha1s.sort!.join("\n"))
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index 9a24f9cb33..218f2c4938 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -351,6 +351,37 @@ RSpec.describe Stylesheet::Manager do
       expect(digest1).not_to eq(digest2)
     end
 
+    it 'can generate digest with a missing upload record' do
+      theme = Fabricate(:theme)
+
+      upload = UploadCreator.new(image, "logo.png").create_for(-1)
+      field = ThemeField.create!(
+        theme_id: theme.id,
+        target_id: Theme.targets[:common],
+        name: "logo",
+        value: "",
+        upload_id: upload.id,
+        type_id: ThemeField.types[:theme_upload_var]
+      )
+
+      manager = manager(theme.id)
+
+      builder = Stylesheet::Manager::Builder.new(
+        target: :desktop_theme, theme: theme, manager: manager
+      )
+
+      digest1 = builder.digest
+      upload.delete
+
+      builder = Stylesheet::Manager::Builder.new(
+        target: :desktop_theme, theme: theme.reload, manager: manager
+      )
+
+      digest2 = builder.digest
+
+      expect(digest1).not_to eq(digest2)
+    end
+
     it 'returns different digest based on target' do
       theme = Fabricate(:theme)
       builder = Stylesheet::Manager::Builder.new(target: :desktop_theme, theme: theme, manager: manager)

From 5a5625460bd9ac3e156c7fa26739ef073143bdd0 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 30 Sep 2022 08:44:04 +0300
Subject: [PATCH 012/332] DEV: Add group messages and group_message_summary
 notifications in the messages tab in the user menu (#18390)

This commit adds non-archived group messages and `group_message_summary` notifications in the messages tab in the user menu. With this change, the messages tab in the user menu now includes 3 types of items:

1. Unread `private_message` notifications (notifications when you receive a reply in a PM)
2. Unread and read `group_message_summary` notifications (notifications when there's a new message in a group inbox that you track)
3. Non-archived personal and group messages

Unread `private_message` notifications are always shown first, followed by unread `group_message_summary` notifications, and then everything else (messages and read `group_message_summary` notifications) sorted by recency (most recent first).

Internal topic: t/72976.
---
 .../app/components/user-menu/menu.js          |   2 +-
 .../app/components/user-menu/messages-list.js |  56 ++++-
 .../tests/acceptance/user-menu-test.js        |   4 +-
 .../discourse/tests/fixtures/user-menu.js     | 147 +++++------
 .../user-menu/messages-list-test.js           | 233 +++++++++++++++++-
 app/controllers/users_controller.rb           |  61 +++--
 app/models/notification.rb                    |  23 +-
 lib/topic_query/private_message_lists.rb      |  30 ++-
 spec/fabricators/post_fabricator.rb           |  19 ++
 spec/requests/users_controller_spec.rb        | 119 +++++++--
 10 files changed, 554 insertions(+), 140 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
index 403737a898..ff21b008a0 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
@@ -170,7 +170,7 @@ const CORE_TOP_TABS = [
     }
 
     get notificationTypes() {
-      return ["private_message"];
+      return ["private_message", "group_message_summary"];
     }
 
     get linkWhenActive() {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
index ac434948c0..7d916ec668 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
@@ -7,9 +7,21 @@ import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item"
 import UserMenuMessageItem from "discourse/lib/user-menu/message-item";
 import Topic from "discourse/models/topic";
 
+function parseDateString(date) {
+  if (date) {
+    return new Date(date);
+  }
+}
+
+async function initializeNotifications(rawList) {
+  const notifications = rawList.map((n) => Notification.create(n));
+  await Notification.applyTransformations(notifications);
+  return notifications;
+}
+
 export default class UserMenuMessagesList extends UserMenuNotificationsList {
   get dismissTypes() {
-    return ["private_message"];
+    return this.filterByTypes;
   }
 
   get showAllHref() {
@@ -51,9 +63,10 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
     );
     const content = [];
 
-    const notifications = data.notifications.map((n) => Notification.create(n));
-    await Notification.applyTransformations(notifications);
-    notifications.forEach((notification) => {
+    const unreadNotifications = await initializeNotifications(
+      data.unread_notifications
+    );
+    unreadNotifications.forEach((notification) => {
       content.push(
         new UserMenuNotificationItem({
           notification,
@@ -66,12 +79,39 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
 
     const topics = data.topics.map((t) => Topic.create(t));
     await Topic.applyTransformations(topics);
-    content.push(
-      ...topics.map((topic) => {
-        return new UserMenuMessageItem({ message: topic });
-      })
+
+    const readNotifications = await initializeNotifications(
+      data.read_notifications
     );
 
+    let latestReadNotificationDate = parseDateString(
+      readNotifications[0]?.created_at
+    );
+    let latestMessageDate = parseDateString(topics[0]?.bumped_at);
+
+    while (latestReadNotificationDate || latestMessageDate) {
+      if (
+        !latestReadNotificationDate ||
+        (latestMessageDate && latestReadNotificationDate < latestMessageDate)
+      ) {
+        content.push(new UserMenuMessageItem({ message: topics[0] }));
+        topics.shift();
+        latestMessageDate = parseDateString(topics[0]?.bumped_at);
+      } else {
+        content.push(
+          new UserMenuNotificationItem({
+            notification: readNotifications[0],
+            currentUser: this.currentUser,
+            siteSettings: this.siteSettings,
+            site: this.site,
+          })
+        );
+        readNotifications.shift();
+        latestReadNotificationDate = parseDateString(
+          readNotifications[0]?.created_at
+        );
+      }
+    }
     return content;
   }
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index a6fba10a5e..09f9a135f7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -805,7 +805,7 @@ acceptance("User menu - Dismiss button", function (needs) {
         const copy = cloneJSON(
           UserMenuFixtures["/u/:username/user-menu-private-messages"]
         );
-        copy.notifications = [];
+        copy.unread_notifications = [];
         return helper.response(copy);
       } else {
         return helper.response(
@@ -941,7 +941,7 @@ acceptance("User menu - Dismiss button", function (needs) {
     assert.ok(markRead, "mark-read request is sent");
     assert.strictEqual(
       markReadRequestBody,
-      "dismiss_types=private_message",
+      "dismiss_types=private_message%2Cgroup_message_summary",
       "mark-read request specifies private_message types"
     );
     assert.notOk(exists(".user-menu .notifications-dismiss"));
diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-menu.js b/app/assets/javascripts/discourse/tests/fixtures/user-menu.js
index a645cce16a..63b8bdc4b9 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/user-menu.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/user-menu.js
@@ -64,79 +64,80 @@ export default {
       ],
   },
   "/u/:username/user-menu-private-messages": {
-      notifications: [
-        {
-          id: 8315,
-          user_id: 1,
-          notification_type: 6,
-          read: false,
-          high_priority: true,
-          created_at: "2022-08-05T17:27:24.873Z",
-          post_number: 1,
-          topic_id: 249,
-          fancy_title: "Very secret message!",
-          slug: "very-secret-message",
-          data: {
-            topic_title: "very secret message!",
-            original_post_id: 1043,
-            original_post_type: 1,
-            original_username: "osama",
-            revision_number: null,
-            display_username: "osama"
-          },
+    unread_notifications: [
+      {
+        id: 8315,
+        user_id: 1,
+        notification_type: 6,
+        read: false,
+        high_priority: true,
+        created_at: "2022-08-05T17:27:24.873Z",
+        post_number: 1,
+        topic_id: 249,
+        fancy_title: "Very secret message!",
+        slug: "very-secret-message",
+        data: {
+          topic_title: "very secret message!",
+          original_post_id: 1043,
+          original_post_type: 1,
+          original_username: "osama",
+          revision_number: null,
+          display_username: "osama"
         },
-      ],
-      topics: [
-        {
-          id: 8092,
-          title: "BUG: Can not render emoji properly :/",
-          fancy_title: "BUG: Can not render emoji properly :confused:",
-          slug: "bug-can-not-render-emoji-properly",
-          posts_count: 1,
-          reply_count: 0,
-          highest_post_number: 2,
-          image_url: null,
-          created_at: "2019-07-26T01:29:24.008Z",
-          last_posted_at: "2019-07-26T01:29:24.177Z",
-          bumped: true,
-          bumped_at: "2019-07-26T01:29:24.177Z",
-          unseen: false,
-          last_read_post_number: 2,
-          unread_posts: 0,
-          pinned: false,
-          unpinned: null,
-          visible: true,
-          closed: false,
-          archived: false,
-          notification_level: 3,
-          bookmarked: false,
-          bookmarks: [],
-          liked: false,
-          views: 5,
-          like_count: 0,
-          has_summary: false,
-          archetype: "private_message",
-          last_poster_username: "mixtape",
-          category_id: null,
-          pinned_globally: false,
-          featured_link: null,
-          posters: [
-            {
-              extras: "latest single",
-              description: "Original Poster, Most Recent Poster",
-              user_id: 13,
-              primary_group_id: null,
-            },
-          ],
-          participants: [
-            {
-              extras: "latest",
-              description: null,
-              user_id: 13,
-              primary_group_id: null,
-            },
-          ],
-        }
-      ],
+      },
+    ],
+    topics: [
+      {
+        id: 8092,
+        title: "BUG: Can not render emoji properly :/",
+        fancy_title: "BUG: Can not render emoji properly :confused:",
+        slug: "bug-can-not-render-emoji-properly",
+        posts_count: 1,
+        reply_count: 0,
+        highest_post_number: 2,
+        image_url: null,
+        created_at: "2019-07-26T01:29:24.008Z",
+        last_posted_at: "2019-07-26T01:29:24.177Z",
+        bumped: true,
+        bumped_at: "2019-07-26T01:29:24.177Z",
+        unseen: false,
+        last_read_post_number: 2,
+        unread_posts: 0,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        notification_level: 3,
+        bookmarked: false,
+        bookmarks: [],
+        liked: false,
+        views: 5,
+        like_count: 0,
+        has_summary: false,
+        archetype: "private_message",
+        last_poster_username: "mixtape",
+        category_id: null,
+        pinned_globally: false,
+        featured_link: null,
+        posters: [
+          {
+            extras: "latest single",
+            description: "Original Poster, Most Recent Poster",
+            user_id: 13,
+            primary_group_id: null,
+          },
+        ],
+        participants: [
+          {
+            extras: "latest",
+            description: null,
+            user_id: 13,
+            primary_group_id: null,
+          },
+        ],
+      }
+    ],
+    read_notifications: [],
   }
 }
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/messages-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/messages-list-test.js
index 02fba00dc7..49de60fb0c 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/messages-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/messages-list-test.js
@@ -5,14 +5,128 @@ import { render, settled } from "@ember/test-helpers";
 import { NOTIFICATION_TYPES } from "discourse/tests/fixtures/concerns/notification-types";
 import { hbs } from "ember-cli-htmlbars";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import { cloneJSON, deepMerge } from "discourse-common/lib/object";
+import UserMenuFixtures from "discourse/tests/fixtures/user-menu";
 import I18n from "I18n";
 
+function getMessage(overrides = {}) {
+  return deepMerge(
+    {
+      id: 8092,
+      title: "Test ToPic 4422",
+      fancy_title: "Test topic 4422",
+      slug: "test-topic-4422",
+      posts_count: 1,
+      reply_count: 0,
+      highest_post_number: 2,
+      image_url: null,
+      created_at: "2019-07-26T01:29:24.008Z",
+      last_posted_at: "2019-07-26T01:29:24.177Z",
+      bumped: true,
+      bumped_at: "2019-07-26T01:29:24.177Z",
+      unseen: false,
+      last_read_post_number: 2,
+      unread_posts: 0,
+      pinned: false,
+      unpinned: null,
+      visible: true,
+      closed: false,
+      archived: false,
+      notification_level: 3,
+      bookmarked: false,
+      bookmarks: [],
+      liked: false,
+      views: 5,
+      like_count: 0,
+      has_summary: false,
+      archetype: "private_message",
+      last_poster_username: "mixtape",
+      category_id: null,
+      pinned_globally: false,
+      featured_link: null,
+      posters: [
+        {
+          extras: "latest single",
+          description: "Original Poster, Most Recent Poster",
+          user_id: 13,
+          primary_group_id: null,
+        },
+      ],
+      participants: [
+        {
+          extras: "latest",
+          description: null,
+          user_id: 13,
+          primary_group_id: null,
+        },
+      ],
+    },
+    overrides
+  );
+}
+
+function getGroupMessageSummaryNotification(overrides = {}) {
+  return deepMerge(
+    {
+      id: 9492,
+      user_id: 1,
+      notification_type: 16,
+      read: true,
+      high_priority: false,
+      created_at: "2022-08-05T17:27:24.873Z",
+      post_number: null,
+      topic_id: null,
+      fancy_title: null,
+      slug: null,
+      data: {
+        group_id: 1,
+        group_name: "jokers",
+        inbox_count: 4,
+        username: "joker.leader",
+      },
+    },
+    overrides
+  );
+}
+
 module("Integration | Component | user-menu | messages-list", function (hooks) {
   setupRenderingTest(hooks);
 
   const template = hbs`<UserMenu::MessagesList/>`;
 
-  test("renders notifications on top and messages on bottom", async function (assert) {
+  test("renders unread PM notifications first followed by messages and read group_message_summary notifications", async function (assert) {
+    pretender.get("/u/eviltrout/user-menu-private-messages", () => {
+      const copy = cloneJSON(
+        UserMenuFixtures["/u/:username/user-menu-private-messages"]
+      );
+      copy.read_notifications = [getGroupMessageSummaryNotification()];
+      return response(copy);
+    });
+    await render(template);
+    const items = queryAll("ul li");
+
+    assert.strictEqual(items.length, 3);
+
+    assert.ok(items[0].classList.contains("notification"));
+    assert.ok(items[0].classList.contains("unread"));
+    assert.ok(items[0].classList.contains("private-message"));
+
+    assert.ok(items[1].classList.contains("notification"));
+    assert.ok(items[1].classList.contains("read"));
+    assert.ok(items[1].classList.contains("group-message-summary"));
+
+    assert.ok(items[2].classList.contains("message"));
+  });
+
+  test("does not error when there are no group_message_summary notifications", async function (assert) {
+    pretender.get("/u/eviltrout/user-menu-private-messages", () => {
+      const copy = cloneJSON(
+        UserMenuFixtures["/u/:username/user-menu-private-messages"]
+      );
+      copy.read_notifications = [];
+      return response(copy);
+    });
+
     await render(template);
     const items = queryAll("ul li");
 
@@ -25,6 +139,117 @@ module("Integration | Component | user-menu | messages-list", function (hooks) {
     assert.ok(items[1].classList.contains("message"));
   });
 
+  test("does not error when there are no messages", async function (assert) {
+    pretender.get("/u/eviltrout/user-menu-private-messages", () => {
+      const copy = cloneJSON(
+        UserMenuFixtures["/u/:username/user-menu-private-messages"]
+      );
+      copy.topics = [];
+      copy.read_notifications = [getGroupMessageSummaryNotification()];
+      return response(copy);
+    });
+
+    await render(template);
+    const items = queryAll("ul li");
+
+    assert.strictEqual(items.length, 2);
+
+    assert.ok(items[0].classList.contains("notification"));
+    assert.ok(items[0].classList.contains("unread"));
+    assert.ok(items[0].classList.contains("private-message"));
+
+    assert.ok(items[1].classList.contains("notification"));
+    assert.ok(items[1].classList.contains("read"));
+    assert.ok(items[1].classList.contains("group-message-summary"));
+  });
+
+  test("merge-sorts group_message_summary notifications and messages", async function (assert) {
+    pretender.get("/u/eviltrout/user-menu-private-messages", () => {
+      const copy = cloneJSON(
+        UserMenuFixtures["/u/:username/user-menu-private-messages"]
+      );
+      copy.unread_notifications = [];
+      copy.topics = [
+        getMessage({
+          bumped_at: "2014-07-26T01:29:24.177Z",
+          fancy_title: "Test Topic 0003",
+        }),
+        getMessage({
+          bumped_at: "2012-07-26T01:29:24.177Z",
+          fancy_title: "Test Topic 0002",
+        }),
+        getMessage({
+          bumped_at: "2010-07-26T01:29:24.177Z",
+          fancy_title: "Test Topic 0001",
+        }),
+      ];
+      copy.read_notifications = [
+        getGroupMessageSummaryNotification({
+          created_at: "2015-07-26T01:29:24.177Z",
+          data: {
+            inbox_count: 13,
+          },
+        }),
+        getGroupMessageSummaryNotification({
+          created_at: "2013-07-26T01:29:24.177Z",
+          data: {
+            inbox_count: 12,
+          },
+        }),
+        getGroupMessageSummaryNotification({
+          created_at: "2011-07-26T01:29:24.177Z",
+          data: {
+            inbox_count: 11,
+          },
+        }),
+      ];
+      return response(copy);
+    });
+    await render(template);
+    const items = queryAll("ul li");
+
+    assert.strictEqual(items.length, 6);
+
+    assert.strictEqual(
+      items[0].textContent.trim(),
+      I18n.t("notifications.group_message_summary", {
+        count: 13,
+        group_name: "jokers",
+      })
+    );
+
+    assert.strictEqual(
+      items[1].textContent.trim().replaceAll(/\s+/g, " "),
+      "mixtape Test Topic 0003"
+    );
+
+    assert.strictEqual(
+      items[2].textContent.trim(),
+      I18n.t("notifications.group_message_summary", {
+        count: 12,
+        group_name: "jokers",
+      })
+    );
+
+    assert.strictEqual(
+      items[3].textContent.trim().replaceAll(/\s+/g, " "),
+      "mixtape Test Topic 0002"
+    );
+
+    assert.strictEqual(
+      items[4].textContent.trim(),
+      I18n.t("notifications.group_message_summary", {
+        count: 11,
+        group_name: "jokers",
+      })
+    );
+
+    assert.strictEqual(
+      items[5].textContent.trim().replaceAll(/\s+/g, " "),
+      "mixtape Test Topic 0001"
+    );
+  });
+
   test("show all link", async function (assert) {
     await render(template);
     const link = query(".panel-body-bottom .show-all");
@@ -66,7 +291,11 @@ module("Integration | Component | user-menu | messages-list", function (hooks) {
 
   test("empty state (aka blank page syndrome)", async function (assert) {
     pretender.get("/u/eviltrout/user-menu-private-messages", () => {
-      return response({ notifications: [], topics: [] });
+      return response({
+        unread_notifications: [],
+        topics: [],
+        read_notifications: [],
+      });
     });
     await render(template);
     assert.strictEqual(
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9367dd73ff..255da241f9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1746,11 +1746,10 @@ class UsersController < ApplicationController
       raise Discourse::InvalidAccess.new("username doesn't match current_user's username")
     end
 
-    reminder_notifications = Notification.unread_type(
-      current_user,
-      Notification.types[:bookmark_reminder],
-      USER_MENU_LIST_LIMIT
-    )
+    reminder_notifications = Notification
+      .for_user_menu(current_user.id, limit: USER_MENU_LIST_LIMIT)
+      .unread
+      .where(notification_type: Notification.types[:bookmark_reminder])
 
     if reminder_notifications.size < USER_MENU_LIST_LIMIT
       exclude_bookmark_ids = reminder_notifications
@@ -1803,29 +1802,37 @@ class UsersController < ApplicationController
       raise Discourse::InvalidAccess.new("personal messages are disabled.")
     end
 
-    message_notifications = Notification.unread_type(
-      current_user,
-      Notification.types[:private_message],
-      USER_MENU_LIST_LIMIT
-    )
+    unread_notifications = Notification
+      .for_user_menu(current_user.id, limit: USER_MENU_LIST_LIMIT)
+      .unread
+      .where(notification_type: [Notification.types[:private_message], Notification.types[:group_message_summary]])
+      .to_a
 
-    if message_notifications.size < USER_MENU_LIST_LIMIT
-      exclude_topic_ids = message_notifications.map(&:topic_id).uniq
+    if unread_notifications.size < USER_MENU_LIST_LIMIT
+      exclude_topic_ids = unread_notifications.filter_map(&:topic_id).uniq
+      limit = USER_MENU_LIST_LIMIT - unread_notifications.size
       messages_list = TopicQuery.new(
         current_user,
-        per_page: USER_MENU_LIST_LIMIT - message_notifications.size
-      ).list_private_messages(current_user) do |query|
+        per_page: limit
+      ).list_private_messages_direct_and_groups(current_user) do |query|
         if exclude_topic_ids.present?
           query.where("topics.id NOT IN (?)", exclude_topic_ids)
         else
           query
         end
       end
+      read_notifications = Notification
+        .for_user_menu(current_user.id, limit: limit)
+        .where(
+          read: true,
+          notification_type: Notification.types[:group_message_summary],
+        )
+        .to_a
     end
 
-    if message_notifications.present?
-      serialized_notifications = ActiveModel::ArraySerializer.new(
-        message_notifications,
+    if unread_notifications.present?
+      serialized_unread_notifications = ActiveModel::ArraySerializer.new(
+        unread_notifications,
         each_serializer: NotificationSerializer,
         scope: guardian
       )
@@ -1840,8 +1847,17 @@ class UsersController < ApplicationController
       )[:topics]
     end
 
+    if read_notifications.present?
+      serialized_read_notifications = ActiveModel::ArraySerializer.new(
+        read_notifications,
+        each_serializer: NotificationSerializer,
+        scope: guardian
+      )
+    end
+
     render json: {
-      notifications: serialized_notifications || [],
+      unread_notifications: serialized_unread_notifications || [],
+      read_notifications: serialized_read_notifications || [],
       topics: serialized_messages || []
     }
   end
@@ -2027,13 +2043,4 @@ class UsersController < ApplicationController
 
     { users: ActiveModel::ArraySerializer.new(users, each_serializer: each_serializer).as_json }
   end
-
-  def find_unread_notifications_of_type(type, limit)
-    current_user
-      .notifications
-      .visible
-      .includes(:topic)
-      .where(read: false, notification_type: type)
-      .limit(limit)
-  end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index fc4e8ffe69..3c72cc2f1d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -15,14 +15,26 @@ class Notification < ActiveRecord::Base
   scope :recent, lambda { |n = nil| n ||= 10; order('notifications.created_at desc').limit(n) }
   scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
     .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
-  scope :unread_type, ->(user, type, limit = 20) do
-    where(user_id: user.id, read: false, notification_type: type).visible.includes(:topic).limit(limit)
+  scope :unread_type, ->(user, type, limit = 30) do
+    unread_types(user, [type], limit)
   end
-  scope :prioritized, ->(limit = nil) do
+  scope :unread_types, ->(user, types, limit = 30) do
+    where(user_id: user.id, read: false, notification_type: types)
+      .visible
+      .includes(:topic)
+      .limit(limit)
+  end
+  scope :prioritized, ->() do
     order("notifications.high_priority AND NOT notifications.read DESC")
       .order("NOT notifications.read DESC")
       .order("notifications.created_at DESC")
-      .limit(limit || 30)
+  end
+  scope :for_user_menu, ->(user_id, limit: 30) do
+    where(user_id: user_id)
+      .visible
+      .prioritized
+      .includes(:topic)
+      .limit(limit)
   end
 
   attr_accessor :skip_send_email
@@ -226,7 +238,8 @@ class Notification < ActiveRecord::Base
     notifications = user.notifications
       .includes(:topic)
       .visible
-      .prioritized(count)
+      .prioritized
+      .limit(count)
 
     if types.present?
       notifications = notifications.where(notification_type: types)
diff --git a/lib/topic_query/private_message_lists.rb b/lib/topic_query/private_message_lists.rb
index cdf5201b02..395b54fad5 100644
--- a/lib/topic_query/private_message_lists.rb
+++ b/lib/topic_query/private_message_lists.rb
@@ -5,14 +5,16 @@ class TopicQuery
     def list_private_messages(user, &blk)
       list = private_messages_for(user, :user)
       list = not_archived(list, user)
+      list = have_posts_from_others(list, user)
 
-      list = list.where(<<~SQL)
-        NOT (
-          topics.participant_count = 1
-          AND topics.user_id = #{user.id.to_i}
-          AND topics.moderator_posts_count = 0
-        )
-      SQL
+      create_list(:private_messages, {}, list, &blk)
+    end
+
+    def list_private_messages_direct_and_groups(user, &blk)
+      list = private_messages_for(user, :all)
+      list = not_archived(list, user)
+      list = not_archived_in_groups(list)
+      list = have_posts_from_others(list, user)
 
       create_list(:private_messages, {}, list, &blk)
     end
@@ -252,6 +254,20 @@ class TopicQuery
         .where('um.user_id IS NULL')
     end
 
+    def not_archived_in_groups(list)
+      list.left_joins(:group_archived_messages).where(group_archived_messages: { id: nil })
+    end
+
+    def have_posts_from_others(list, user)
+      list.where(<<~SQL)
+        NOT (
+          topics.participant_count = 1
+          AND topics.user_id = #{user.id.to_i}
+          AND topics.moderator_posts_count = 0
+        )
+      SQL
+    end
+
     def group
       @group ||= begin
         Group
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 4b35bc721c..e18628a141 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -143,6 +143,25 @@ Fabricator(:private_message_post, from: :post) do
   raw "Ssshh! This is our secret conversation!"
 end
 
+Fabricator(:group_private_message_post, from: :post) do
+  transient :recipients
+  user
+  topic do |attrs|
+    Fabricate(:private_message_topic,
+      user: attrs[:user],
+      created_at: attrs[:created_at],
+      subtype: TopicSubtype.user_to_user,
+      topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: attrs[:user]),
+      ],
+      topic_allowed_groups: [
+        Fabricate.build(:topic_allowed_group, group: attrs[:recipients] || Fabricate(:group))
+      ]
+    )
+  end
+  raw "Ssshh! This is our group secret conversation!"
+end
+
 Fabricator(:private_message_post_one_user, from: :post) do
   user
   topic do |attrs|
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index ff74b1f41f..ebcf3a0c56 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -5797,9 +5797,21 @@ RSpec.describe UsersController do
   end
 
   describe "#user_menu_messages" do
+    fab!(:group1) { Fabricate(:group, has_messages: true, users: [user]) }
+    fab!(:group2) { Fabricate(:group, has_messages: true, users: [user, user1]) }
+    fab!(:group3) { Fabricate(:group, has_messages: true, users: [user1]) }
+
     fab!(:message_without_notification) { Fabricate(:private_message_post, recipient: user).topic }
     fab!(:message_with_read_notification) { Fabricate(:private_message_post, recipient: user).topic }
     fab!(:message_with_unread_notification) { Fabricate(:private_message_post, recipient: user).topic }
+    fab!(:archived_message) { Fabricate(:private_message_post, recipient: user).topic }
+
+    fab!(:group_message1) { Fabricate(:group_private_message_post, recipients: group1).topic }
+    fab!(:group_message2) { Fabricate(:group_private_message_post, recipients: group2).topic }
+    fab!(:group_message3) { Fabricate(:group_private_message_post, recipients: group3).topic }
+
+    fab!(:archived_group_message1) { Fabricate(:group_private_message_post, recipients: group1).topic }
+    fab!(:archived_group_message2) { Fabricate(:group_private_message_post, recipients: group2).topic }
 
     fab!(:user1_message_without_notification) do
       Fabricate(:private_message_post, recipient: user1).topic
@@ -5810,16 +5822,18 @@ RSpec.describe UsersController do
     fab!(:user1_message_with_unread_notification) do
       Fabricate(:private_message_post, recipient: user1).topic
     end
+    fab!(:user1_archived_message) { Fabricate(:private_message_post, recipient: user1).topic }
 
-    fab!(:unread_notification) do
+    fab!(:unread_pm_notification) do
       Fabricate(
         :private_message_notification,
         read: false,
         user: user,
-        topic: message_with_unread_notification
+        topic: message_with_unread_notification,
+        created_at: 4.minutes.ago
       )
     end
-    fab!(:read_notification) do
+    fab!(:read_pm_notification) do
       Fabricate(
         :private_message_notification,
         read: true,
@@ -5828,7 +5842,27 @@ RSpec.describe UsersController do
       )
     end
 
-    fab!(:user1_unread_notification) do
+    fab!(:unread_group_message_summary_notification) do
+      Fabricate(
+        :notification,
+        read: false,
+        user: user,
+        notification_type: Notification.types[:group_message_summary],
+        created_at: 2.minutes.ago
+      )
+    end
+
+    fab!(:read_group_message_summary_notification) do
+      Fabricate(
+        :notification,
+        read: true,
+        user: user,
+        notification_type: Notification.types[:group_message_summary],
+        created_at: 1.minutes.ago
+      )
+    end
+
+    fab!(:user1_unread_pm_notification) do
       Fabricate(
         :private_message_notification,
         read: false,
@@ -5836,7 +5870,7 @@ RSpec.describe UsersController do
         topic: user1_message_with_unread_notification
       )
     end
-    fab!(:user1_read_notification) do
+    fab!(:user1_read_pm_notification) do
       Fabricate(
         :private_message_notification,
         read: true,
@@ -5845,6 +5879,30 @@ RSpec.describe UsersController do
       )
     end
 
+    fab!(:user1_unread_group_message_summary_notification) do
+      Fabricate(
+        :notification,
+        read: false,
+        user: user1,
+        notification_type: Notification.types[:group_message_summary],
+      )
+    end
+    fab!(:user1_read_group_message_summary_notification) do
+      Fabricate(
+        :notification,
+        read: true,
+        user: user1,
+        notification_type: Notification.types[:group_message_summary],
+      )
+    end
+
+    before do
+      UserArchivedMessage.archive!(user.id, archived_message)
+      UserArchivedMessage.archive!(user1.id, user1_archived_message)
+      GroupArchivedMessage.archive!(group1.id, archived_group_message1)
+      GroupArchivedMessage.archive!(group2.id, archived_group_message2)
+    end
+
     context "when logged out" do
       it "responds with 404" do
         get "/u/#{user.username}/user-menu-private-messages"
@@ -5873,33 +5931,62 @@ RSpec.describe UsersController do
         get "/u/#{user.username}/user-menu-private-messages"
         expect(response.status).to eq(200)
 
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.map { |notification| notification["id"] }).to contain_exactly(
-          unread_notification.id
+        unread_notifications = response.parsed_body["unread_notifications"]
+        expect(unread_notifications.map { |notification| notification["id"] }).to eq([
+          unread_pm_notification.id,
+          unread_group_message_summary_notification.id
+        ])
+      end
+
+      it "sends an array of read group_message_summary notifications" do
+        read_group_message_summary_notification2 = Fabricate(
+          :notification,
+          read: true,
+          user: user,
+          notification_type: Notification.types[:group_message_summary],
+          created_at: 5.minutes.ago
         )
+        get "/u/#{user.username}/user-menu-private-messages"
+        expect(response.status).to eq(200)
+
+        read_notifications = response.parsed_body["read_notifications"]
+        expect(read_notifications.map { |notification| notification["id"] }).to eq([
+          read_group_message_summary_notification.id,
+          read_group_message_summary_notification2.id
+        ])
       end
 
       it "responds with an array of PM topics that are not associated with any of the unread private_message notifications" do
+        group_message1.update!(bumped_at: 1.minutes.ago)
+        message_without_notification.update!(bumped_at: 3.minutes.ago)
+        group_message2.update!(bumped_at: 6.minutes.ago)
+        message_with_read_notification.update!(bumped_at: 10.minutes.ago)
+        read_group_message_summary_notification.destroy!
+
         get "/u/#{user.username}/user-menu-private-messages"
         expect(response.status).to eq(200)
 
         topics = response.parsed_body["topics"]
-        expect(topics.map { |topic| topic["id"] }).to contain_exactly(
+        expect(topics.map { |topic| topic["id"] }).to eq([
+          group_message1.id,
           message_without_notification.id,
+          group_message2.id,
           message_with_read_notification.id
-        )
+        ])
       end
 
       it "fills up the remaining of the USER_MENU_LIST_LIMIT limit with PM topics" do
-        stub_const(UsersController, "USER_MENU_LIST_LIMIT", 2) do
+        stub_const(UsersController, "USER_MENU_LIST_LIMIT", 3) do
           get "/u/#{user.username}/user-menu-private-messages"
         end
         expect(response.status).to eq(200)
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.size).to eq(1)
+        unread_notifications = response.parsed_body["unread_notifications"]
+        expect(unread_notifications.size).to eq(2)
 
         topics = response.parsed_body["topics"]
+        read_notifications = response.parsed_body["read_notifications"]
         expect(topics.size).to eq(1)
+        expect(read_notifications.size).to eq(1)
 
         message2 = Fabricate(:private_message_post, recipient: user).topic
         Fabricate(
@@ -5913,11 +6000,13 @@ RSpec.describe UsersController do
           get "/u/#{user.username}/user-menu-private-messages"
         end
         expect(response.status).to eq(200)
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.size).to eq(2)
+        unread_notifications = response.parsed_body["unread_notifications"]
+        expect(unread_notifications.size).to eq(2)
 
         topics = response.parsed_body["topics"]
+        read_notifications = response.parsed_body["read_notifications"]
         expect(topics.size).to eq(0)
+        expect(read_notifications.size).to eq(0)
       end
     end
   end

From 58cc35fc780926a2a706077e573fd9bd4b655669 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 09:00:18 +0200
Subject: [PATCH 013/332] Build(deps-dev): Bump webdrivers from 5.1.0 to 5.2.0
 (#18435)

Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v5.1.0...v5.2.0)

---
updated-dependencies:
- dependency-name: webdrivers
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8f6fd96267..82ff3123e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -486,7 +486,7 @@ GEM
     uri (0.11.0)
     uri_template (0.7.0)
     version_gem (1.1.0)
-    webdrivers (5.1.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)

From 0c38757250e12304518d654b4efcc7db741b82c1 Mon Sep 17 00:00:00 2001
From: Selase Krakani <849886+s3lase@users.noreply.github.com>
Date: Fri, 30 Sep 2022 08:28:09 +0000
Subject: [PATCH 014/332] FIX: Revert recursively tag lookup with missing
 ancestor tags (#18439)

This reverts commit 049f8569d89264dd630e4eeb8625b44735c1ae92.

To be revisited with a more comprehensive solution covering parent
selection when multiple parents exist.
---
 lib/discourse_tagging.rb           | 32 +++++-------------
 spec/lib/discourse_tagging_spec.rb | 53 ------------------------------
 2 files changed, 8 insertions(+), 77 deletions(-)

diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index e3832fd0e1..8e64bab2a5 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -13,29 +13,6 @@ module DiscourseTagging
           ON tgm.tag_group_id = tg.id
   SQL
 
-  ANCESTOR_TAG_IDS_SQL ||= <<~SQL
-    WITH RECURSIVE ancestors AS (
-      SELECT
-        tgm.tag_id,
-        tg.parent_tag_id
-      FROM
-        tag_group_memberships tgm
-        INNER JOIN tag_groups tg ON tg.id = tgm.tag_group_id
-      WHERE
-        tg.parent_tag_id IS NOT NULL
-        AND tgm.tag_id IN (:tag_ids)
-      UNION
-      SELECT
-        tgm.tag_id,
-        tg.parent_tag_id
-      FROM
-        tag_group_memberships tgm
-        INNER JOIN tag_groups tg ON tg.id = tgm.tag_group_id
-        INNER JOIN ancestors ON tgm.tag_id = ancestors.parent_tag_id
-    )
-    SELECT * FROM ancestors
-  SQL
-
   def self.tag_topic_by_names(topic, guardian, tag_names_arg, append: false)
     if guardian.can_tag?(topic)
       tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || []
@@ -116,7 +93,14 @@ module DiscourseTagging
         # add missing mandatory parent tags
         tag_ids = tags.map(&:id)
 
-        parent_tags_map = DB.query(ANCESTOR_TAG_IDS_SQL, tag_ids: tag_ids).inject({}) do |h, v|
+        parent_tags_map = DB.query("
+          SELECT tgm.tag_id, tg.parent_tag_id
+            FROM tag_groups tg
+          INNER JOIN tag_group_memberships tgm
+              ON tgm.tag_group_id = tg.id
+           WHERE tg.parent_tag_id IS NOT NULL
+             AND tgm.tag_id IN (?)
+        ", tag_ids).inject({}) do |h, v|
           h[v.tag_id] ||= []
           h[v.tag_id] << v.parent_tag_id
           h
diff --git a/spec/lib/discourse_tagging_spec.rb b/spec/lib/discourse_tagging_spec.rb
index 548489c31b..ddcd88916d 100644
--- a/spec/lib/discourse_tagging_spec.rb
+++ b/spec/lib/discourse_tagging_spec.rb
@@ -497,19 +497,9 @@ RSpec.describe DiscourseTagging do
       end
 
       it "adds all parent tags that are missing" do
-        parent_tag_group = Fabricate(:tag_group)
         parent_tag = Fabricate(:tag, name: 'parent')
-        parent_tag_group.tags = [parent_tag]
-
         tag_group2 = Fabricate(:tag_group, parent_tag_id: parent_tag.id)
         tag_group2.tags = [tag2]
-
-        tag_group1 = Fabricate(:tag_group)
-        tag_group1.tags = [tag1]
-
-        tag_group3 = Fabricate(:tag_group, parent_tag_id: tag1.id)
-        tag_group3.tags = [tag3]
-
         valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag3.name, tag2.name])
         expect(valid).to eq(true)
         expect(topic.reload.tags.map(&:name)).to contain_exactly(
@@ -529,49 +519,6 @@ RSpec.describe DiscourseTagging do
         expect(valid).to eq(true)
         expect(topic.reload.tags.map(&:name)).to contain_exactly(*[parent_tag, common].map(&:name))
       end
-
-      context "when tag group has grandparents" do
-        let(:tag_group1) { Fabricate(:tag_group) }
-        let(:foo) { Fabricate(:tag, name: 'foo') }
-        let(:tag_group2) { Fabricate(:tag_group, parent_tag_id: foo.id) }
-        let(:bar) { Fabricate(:tag, name: 'bar') }
-        let(:tag_group3) { Fabricate(:tag_group, parent_tag_id: bar.id) }
-        let(:baz) { Fabricate(:tag, name: 'baz') }
-
-        before do
-          tag_group1.tags = [foo]
-          tag_group2.tags = [bar]
-          tag_group3.tags = [baz]
-        end
-
-        it "recursively adds all ancestors" do
-          valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [baz.name])
-          expect(valid).to eq(true)
-          expect(topic.reload.tags.map(&:name)).to contain_exactly(*[foo, bar, baz].map(&:name))
-        end
-
-        it "adds only one parent when multiple parents exist" do
-          alt_parent_group = Fabricate(:tag_group)
-          alt = Fabricate(:tag, name: 'alt')
-          alt_parent_group.tags = [alt]
-
-          alt_baz_group = Fabricate(:tag_group, parent_tag_id: alt.id)
-          alt_baz_group.tags = [baz]
-
-          valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [baz.name])
-          expect(valid).to eq(true)
-          expect(topic.reload.tags.map(&:name)).to contain_exactly(*[foo, bar, baz].map(&:name))
-        end
-
-        it "adds missing tags even with cycles" do
-          tag_group4 = Fabricate(:tag_group, parent_tag_id: baz.id)
-          tag_group4.tags = [foo]
-
-          valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [baz.name])
-          expect(valid).to eq(true)
-          expect(topic.reload.tags.map(&:name)).to contain_exactly(*[foo, bar, baz].map(&:name))
-        end
-      end
     end
 
     context "when enforcing required tags from a tag group" do

From 35a90b6a3fca11af7957f146af1c5db4352dd666 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 30 Sep 2022 13:35:00 +0300
Subject: [PATCH 015/332] FIX: Add better and more strict invite validators
 (#18399)

* FIX: Add validator for email xor domain

* FIX: Add validator for max_redemptions_allowed

* FIX: Add validator for redemption_count
---
 app/models/invite.rb         | 18 +++++++++++++++++-
 config/locales/server.en.yml |  3 +++
 spec/models/invite_spec.rb   | 27 ++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/app/models/invite.rb b/app/models/invite.rb
index b0cc7e38b7..4b0c92620e 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -31,8 +31,10 @@ class Invite < ActiveRecord::Base
   validates_presence_of :invited_by_id
   validates :email, email: true, allow_blank: true
   validate :ensure_max_redemptions_allowed
+  validate :valid_redemption_count
   validate :valid_domain, if: :will_save_change_to_domain?
   validate :user_doesnt_already_exist, if: :will_save_change_to_email?
+  validate :email_xor_domain
 
   before_create do
     self.invite_key ||= SecureRandom.base58(10)
@@ -66,6 +68,12 @@ class Invite < ActiveRecord::Base
     end
   end
 
+  def email_xor_domain
+    if email.present? && domain.present?
+      errors.add(:base, I18n.t('invite.email_xor_domain'))
+    end
+  end
+
   def is_invite_link?
     email.blank?
   end
@@ -253,12 +261,20 @@ class Invite < ActiveRecord::Base
       limit = invited_by&.staff? ? SiteSetting.invite_link_max_redemptions_limit
                                  : SiteSetting.invite_link_max_redemptions_limit_users
 
-      if !self.max_redemptions_allowed.between?(1, limit)
+      if self.email.present? && self.max_redemptions_allowed != 1
+        errors.add(:max_redemptions_allowed, I18n.t("invite.max_redemptions_allowed_one"))
+      elsif !self.max_redemptions_allowed.between?(1, limit)
         errors.add(:max_redemptions_allowed, I18n.t("invite_link.max_redemptions_limit", max_limit: limit))
       end
     end
   end
 
+  def valid_redemption_count
+    if self.redemption_count > self.max_redemptions_allowed
+      errors.add(:redemption_count, I18n.t("invite.redemption_count_less_than_max", max_redemptions_allowed: self.max_redemptions_allowed))
+    end
+  end
+
   def valid_domain
     return if self.domain.blank?
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 251474c7f5..1d08c5e04a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -264,6 +264,9 @@ en:
       invalid_access: "You are not permitted to view the requested resource."
     requires_groups: "Invite was not saved because the specified topic is inaccessible. Add one of the following groups: %{groups}."
     domain_not_allowed: "Your email cannot be used to redeem this invite."
+    max_redemptions_allowed_one: "for email invites should be 1."
+    redemption_count_less_than_max: "should be less than %{max_redemptions_allowed}."
+    email_xor_domain: "Email and domain fields are not allowed at the same time"
 
   bulk_invite:
     file_should_be_csv: "The uploaded file should be of csv format."
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index faabf6229d..2691659db3 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -41,12 +41,33 @@ RSpec.describe Invite do
     end
 
     it 'allows only valid domains' do
-      invite = Fabricate.build(:invite, domain: 'example', invited_by: user)
+      invite = Fabricate.build(:invite, email: nil, domain: 'example', invited_by: user)
       expect(invite).not_to be_valid
 
-      invite = Fabricate.build(:invite, domain: 'example.com', invited_by: user)
+      invite = Fabricate.build(:invite, email: nil, domain: 'example.com', invited_by: user)
       expect(invite).to be_valid
     end
+
+    it 'allows only email or only domain to be present' do
+      invite = Fabricate.build(:invite, email: nil, invited_by: user)
+      expect(invite).to be_valid
+
+      invite = Fabricate.build(:invite, email: nil, domain: 'example.com', invited_by: user)
+      expect(invite).to be_valid
+
+      invite = Fabricate.build(:invite, email: 'test@example.com', invited_by: user)
+      expect(invite).to be_valid
+
+      invite = Fabricate.build(:invite, email: 'test@example.com', domain: 'example.com', invited_by: user)
+      expect(invite).not_to be_valid
+      expect(invite.errors.full_messages).to include(I18n.t('invite.email_xor_domain'))
+    end
+
+    it 'checks if redemption_count is less or equal than max_redemptions_allowed' do
+      invite = Fabricate.build(:invite, redemption_count: 2, max_redemptions_allowed: 1, invited_by: user)
+      expect(invite).not_to be_valid
+      expect(invite.errors.full_messages.first).to include(I18n.t('invite.redemption_count_less_than_max', max_redemptions_allowed: 1))
+    end
   end
 
   describe 'before_save' do
@@ -355,7 +376,7 @@ RSpec.describe Invite do
     fab!(:inviter) { Fabricate(:user) }
 
     fab!(:pending_invite) { Fabricate(:invite, invited_by: inviter, email: 'pending@example.com') }
-    fab!(:pending_link_invite) { Fabricate(:invite, invited_by: inviter, max_redemptions_allowed: 5) }
+    fab!(:pending_link_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
     fab!(:pending_invite_from_another_user) { Fabricate(:invite) }
 
     fab!(:expired_invite) { Fabricate(:invite, invited_by: inviter, email: 'expired@example.com', expires_at: 1.day.ago) }

From b615201b886121c30547632acd04bf080d120706 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 30 Sep 2022 18:34:47 +0300
Subject: [PATCH 016/332] FIX: Remove zero-width space when not necessary
 (#18429)

A zero-width space character is inserted for icon-only buttons, but that
is unnecessary when the button has some rich-content and the block form
is used.
---
 .../javascripts/discourse/app/templates/components/d-button.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index e6586be8dd..a05a03a390 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -8,7 +8,7 @@
 
 {{~#if this.computedLabel~}}
   <span class="d-button-label">{{html-safe this.computedLabel}}{{#if this.ellipsis}}&hellip;{{/if}}</span>
-{{~else~}}
+{{~else if (not (has-block))~}}
   &#8203;
   {{! Zero-width space character, so icon-only button height = regular button height }}
 {{~/if~}}

From 136174e0eec7d5cfaefac657a919c19e587fa7c9 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <er.ajalan@gmail.com>
Date: Fri, 30 Sep 2022 21:27:41 +0530
Subject: [PATCH 017/332] FEATURE: when entering a topic scroll to last visited
 line marker (#18440)

When a user enters a topic they have already visited they are navigated
to that post that is newest for them (post_number_last_read + 1). Above
that post there is a "last visited" line marker which is visible when
the user scrolls a bit above the post they landed on. This commit makes
sure that the "last visited" line marker is visible as soon as user is
landed in the topic.
---
 app/assets/javascripts/discourse/app/lib/url.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 622911c417..1d979f4c56 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -117,6 +117,15 @@ const DiscourseURL = EmberObject.extend({
 
       if (!holder) {
         selector = holderId;
+
+        if (
+          document.getElementsByClassName(
+            `topic-post-visited-line post-${postNumber - 1}`
+          )?.length === 1
+        ) {
+          selector = ".small-action.topic-post-visited";
+        }
+
         holder = document.querySelector(selector);
       }
 

From c1a7fa6b5de6692d7b14b28ff89f08e4940f3837 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 30 Sep 2022 13:03:20 -0500
Subject: [PATCH 018/332] FIX: Allow logout for admins in
 staff-writes-only-mode (#18441)

---
 app/assets/javascripts/discourse/app/routes/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index a0962b7773..9a9f08e9ef 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -55,7 +55,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       this.controllerFor("application").send("toggleSidebar");
     },
 
-    logout: unlessReadOnly(
+    logout: unlessStrictlyReadOnly(
       "_handleLogout",
       I18n.t("read_only_mode.logout_disabled")
     ),

From 3b869743674e0a7f29b0954c32f00f4bb886a1ed Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 30 Sep 2022 12:20:21 -0600
Subject: [PATCH 019/332] FEATURE: Make General the default category (#18383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FEATURE: Make General the default category

* Set general as the default category in the composer model instead

* use semicolon

* Enable allow_uncategorized_topics in create_post spec helper for now

* Check if general_category_id is set

* Enable allow_uncategorized_topics for test env

* Provide an option to the create_post helper to not set allow_uncategorized_topics

* Add tests to check that category… is not present and that General is selected automatically
---
 .../discourse/app/models/composer.js          |  4 ++-
 .../tests/acceptance/composer-test.js         | 23 ++++++++++++++++-
 .../select-kit/category-chooser-test.js       | 17 +++++++++++++
 .../addon/components/category-chooser.js      |  5 +++-
 config/environments/test.rb                   |  5 ++++
 config/site_settings.yml                      |  3 ++-
 ...7_disable_allow_uncategorized_new_sites.rb | 25 +++++++++++++++++++
 spec/models/topic_converter_spec.rb           |  2 +-
 spec/support/helpers.rb                       |  6 +++++
 9 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 2c365f47f2..bf548f633c 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -143,7 +143,9 @@ const Composer = RestModel.extend({
       const oldCategoryId = this._categoryId;
 
       if (isEmpty(categoryId)) {
-        categoryId = null;
+        // Set General as the default category
+        const generalCategoryId = this.siteSettings.general_category_id;
+        categoryId = generalCategoryId ? generalCategoryId : null;
       }
       this._categoryId = categoryId;
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 88c616e3fd..6fa0cec03e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -39,8 +39,27 @@ acceptance("Composer", function (needs) {
   });
   needs.settings({
     enable_whispers: true,
+    general_category_id: 1,
+  });
+  needs.site({
+    can_tag_topics: true,
+    categories: [
+      {
+        id: 1,
+        name: "General",
+        slug: "general",
+        permission: 1,
+        topic_template: null,
+      },
+      {
+        id: 2,
+        name: "test too",
+        slug: "test-too",
+        permission: 1,
+        topic_template: "",
+      },
+    ],
   });
-  needs.site({ can_tag_topics: true });
   needs.pretender((server, helper) => {
     server.post("/uploads/lookup-urls", () => {
       return helper.response([]);
@@ -69,6 +88,8 @@ acceptance("Composer", function (needs) {
   test("Composer is opened", async function (assert) {
     await visit("/");
     await click("#create-topic");
+    // Check that General category is selected
+    assert.strictEqual(selectKit(".category-chooser").header().value(), "1");
 
     assert.strictEqual(
       document.documentElement.style.getPropertyValue("--composer-height"),
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
index 426b914d6f..5446f009a8 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
@@ -126,6 +126,23 @@ module(
       assert.strictEqual(this.subject.header().label(), "category…");
     });
 
+    test("with allowUncategorized=null and generalCategoryId present", async function (assert) {
+      this.siteSettings.allow_uncategorized_topics = false;
+      this.siteSettings.general_category_id = 4;
+
+      await render(hbs`
+        <CategoryChooser
+          @value={{this.value}}
+          @options={{hash
+            allowUncategorized=null
+          }}
+        />
+      `);
+
+      assert.strictEqual(this.subject.header().value(), null);
+      assert.strictEqual(this.subject.header().label(), "");
+    });
+
     test("with allowUncategorized=null none=true", async function (assert) {
       this.siteSettings.allow_uncategorized_topics = false;
 
diff --git a/app/assets/javascripts/select-kit/addon/components/category-chooser.js b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
index f2e420a0b4..2345fb2f61 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
@@ -44,7 +44,10 @@ export default ComboBoxComponent.extend({
     ) {
       return Category.findUncategorized();
     } else {
-      return this.defaultItem(null, htmlSafe(I18n.t("category.choose")));
+      const generalCategoryId = this.siteSettings.general_category_id;
+      if (!generalCategoryId) {
+        return this.defaultItem(null, htmlSafe(I18n.t("category.choose")));
+      }
     }
   },
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index ce5485047f..7a25d5b45c 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -68,6 +68,11 @@ Discourse::Application.configure do
       s.set_regardless_of_locale(:download_remote_images_to_local, false)
       s.set_regardless_of_locale(:unique_posts_mins, 0)
       s.set_regardless_of_locale(:max_consecutive_replies, 0)
+
+      # Most existing tests were written assuming allow_uncategorized_topics
+      # was enabled, so we should set it to true.
+      s.set_regardless_of_locale(:allow_uncategorized_topics, true)
+
       # disable plugins
       if ENV['LOAD_PLUGINS'] == '1'
         s.set_regardless_of_locale(:discourse_narrative_bot_enabled, false)
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ebf5c76a6b..8243bd1a7b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -806,7 +806,7 @@ posting:
   max_emojis_in_title: 1
   allow_uncategorized_topics:
     client: true
-    default: true
+    default: false
     refresh: true
   allow_duplicate_topic_titles: false
   allow_duplicate_topic_titles_category: false
@@ -2304,6 +2304,7 @@ uncategorized:
   general_category_id:
     default: -1
     hidden: true
+    client: true
   meta_category_id:
     default: -1
     hidden: true
diff --git a/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb b/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb
new file mode 100644
index 0000000000..979b8a6b56
--- /dev/null
+++ b/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class DisableAllowUncategorizedNewSites < ActiveRecord::Migration[7.0]
+  def up
+    result = execute <<~SQL
+      SELECT created_at
+      FROM schema_migration_details
+      ORDER BY created_at
+      LIMIT 1
+    SQL
+
+    # keep allow uncategorized for existing sites
+    if result.first['created_at'].to_datetime < 1.hour.ago
+      execute <<~SQL
+        INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+        VALUES('allow_uncategorized_topics', 5, 't', NOW(), NOW())
+        ON CONFLICT (name) DO NOTHING
+      SQL
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index d66b1cd045..7598b14432 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe TopicConverter do
     fab!(:author) { Fabricate(:user) }
     fab!(:category) { Fabricate(:category, topic_count: 1) }
     fab!(:private_message) { Fabricate(:private_message_topic, user: author) } # creates a topic without a first post
-    let(:first_post) { create_post(user: author, topic: private_message) }
+    let(:first_post) { create_post(user: author, topic: private_message, allow_uncategorized_topics: false) }
     let(:other_user) { private_message.topic_allowed_users.find { |u| u.user != author }.user }
 
     let(:uncategorized_category) do
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index c92b928185..9ef8c27d4d 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -45,6 +45,12 @@ module Helpers
   end
 
   def create_post(args = {})
+    # Pretty much all the tests with `create_post` will fail without this
+    # since allow_uncategorized_topics is now false by default
+    unless args[:allow_uncategorized_topics] == false
+      SiteSetting.allow_uncategorized_topics = true
+    end
+
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     args[:raw] ||= "This is the raw body of my post, it is cool #{Helpers.next_seq}"
     args[:topic_id] = args[:topic].id if args[:topic]

From afce65bb79f6d9afd3444bb0d4fc29c8c05a944a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 30 Sep 2022 14:51:44 -0400
Subject: [PATCH 020/332] UX: fix post placeholder on mobile (#18442)

---
 app/assets/stylesheets/mobile/topic-post.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 0dabffd02c..ffa4a91436 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -431,3 +431,7 @@ span.highlighted {
   opacity: 100%;
   margin-bottom: 1rem;
 }
+
+.placeholder .topic-body {
+  width: 100%;
+}

From 563ec624b2dcf497323e6b727cda9625fcf7a365 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 30 Sep 2022 14:12:49 -0500
Subject: [PATCH 021/332] FIX: Allow email login for admins in
 staff-writes-only-mode (#18443)

---
 app/controllers/session_controller.rb    |  2 ++
 app/controllers/users_controller.rb      |  1 +
 spec/requests/session_controller_spec.rb | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index be2535241f..68d8a367a8 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -11,6 +11,7 @@ class SessionController < ApplicationController
   requires_login only: [:second_factor_auth_show, :second_factor_auth_perform]
 
   allow_in_staff_writes_only_mode :create
+  allow_in_staff_writes_only_mode :email_login
 
   ACTIVATE_USER_KEY = "activate_user"
 
@@ -375,6 +376,7 @@ class SessionController < ApplicationController
       elsif payload = login_error_check(user)
         return render json: payload
       else
+        raise Discourse::ReadOnly if staff_writes_only_mode? && !user&.staff?
         user.update_timezone_if_missing(params[:timezone])
         log_on_user(user)
         return render json: success_json
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 255da241f9..a28716270e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -52,6 +52,7 @@ class UsersController < ApplicationController
   after_action :add_noindex_header, only: [:show, :my_redirect]
 
   allow_in_staff_writes_only_mode :admin_login
+  allow_in_staff_writes_only_mode :email_login
 
   MAX_RECENT_SEARCHES = 5
 
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index adebaface7..cadac9ece9 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -129,6 +129,27 @@ RSpec.describe SessionController do
       SiteSetting.enable_local_logins_via_email = true
     end
 
+    context "when in staff writes only mode" do
+      use_redis_snapshotting
+
+      before do
+        Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY)
+      end
+
+      it "allows admins to login" do
+        user.update!(admin: true)
+        post "/session/email-login/#{email_token.token}.json"
+        expect(response.status).to eq(200)
+        expect(session[:current_user_id]).to eq(user.id)
+      end
+
+      it "does not allow other users to login" do
+        post "/session/email-login/#{email_token.token}.json"
+        expect(response.status).to eq(503)
+        expect(session[:current_user_id]).to eq(nil)
+      end
+    end
+
     context "when local logins via email disabled" do
       before { SiteSetting.enable_local_logins_via_email = false }
 

From ff42bef1b69f9e274745c42aef6318691f228b5d Mon Sep 17 00:00:00 2001
From: jbrw <jamie.wilson@discourse.org>
Date: Fri, 30 Sep 2022 17:14:21 -0400
Subject: [PATCH 022/332] DEV: Add new plugin outlet in topic list header
 (#18444)

---
 .../javascripts/discourse/app/templates/topic-list-header.hbr    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
index cdca90b5c5..7a7c44f30d 100644
--- a/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
+++ b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
@@ -7,6 +7,7 @@
   </th>
 {{/if}}
 {{raw "topic-list-header-column" order='default' name=listTitle bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle canBulkSelect=canBulkSelect canDoBulkActions=canDoBulkActions}}
+{{raw-plugin-outlet name="topic-list-header-after-main-link"}}
 {{#if showPosters}}
   {{raw "topic-list-header-column" order='posters' ariaLabel=(i18n "category.sort_options.posters")}}
 {{/if}}

From a3ce93bb98e5e80d578cb9a67498ca8edec66b55 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Sun, 2 Oct 2022 22:56:57 +0300
Subject: [PATCH 023/332] FIX: Workaround a bug in the R2 gem to produce valid
 RTL CSS (#18446)

See the comment in the changed file for details. Meta report: https://meta.discourse.org/t/main-css-and-mobile-style-not-working-after-update-2-9-0-beta10/240553?u=osama.
---
 .../base/sidebar-more-section-links.scss      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/sidebar-more-section-links.scss b/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
index 41b698786d..9d237c57c2 100644
--- a/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
+++ b/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
@@ -44,7 +44,27 @@
     margin: 0 calc(var(--d-sidebar-row-horizontal-padding) * 2 / 3);
 
     .sidebar-row {
-      padding: 0.33rem calc(var(--d-sidebar-row-horizontal-padding) / 3);
+      // the multiplication by 1 here is a workaround for a bug in the R2 gem
+      // that we use to generate RTL CSS.
+      // the gem generates RTL CSS by converting anything left to right and
+      // vice versa. for example, a `padding-right: 1px;` property becomes
+      // `padding-left: 1px;` when it goes through the gem.
+      // the gem also handles the `padding` property (and similar properties)
+      // when it's in the 4-sides form, e.g. `padding: 1px 2px 3px 4px;` which
+      // gets converted to `padding: 1px 4px 3px 2px;`.
+      // however, the problem is that the gem detects 4-sides properties pretty
+      // naively - it splits the property value on /\s+/ and if it has 4 parts,
+      // it swaps the second and fourth parts.
+      // if you remove the by 1 multiplication in our rule below, we end up
+      // with a value that can be split into 4 parts and that causes the R2 gem
+      // to convert the rule to this:
+      //   padding: 0.33rem 3) / calc(var(--d-sidebar-row-horizontal-padding);
+      // which is clearly invalid and breaks all the rules that come after this
+      // one in the application CSS bundle.
+      // in the long term we should probably find (or write ourselves)
+      // something that's smarter than R2, but for now let's workaround the bug
+      // in R2.
+      padding: 0.33rem calc(1 * var(--d-sidebar-row-horizontal-padding) / 3);
     }
   }
 

From 28f8ade0aaef603d61d62f4af3978d9fe26b8b07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Oct 2022 23:26:14 +0200
Subject: [PATCH 024/332] Build(deps): Bump msgpack from 1.5.6 to 1.6.0
 (#18451)

Bumps [msgpack](https://github.com/msgpack/msgpack-ruby) from 1.5.6 to 1.6.0.
- [Release notes](https://github.com/msgpack/msgpack-ruby/releases)
- [Changelog](https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog)
- [Commits](https://github.com/msgpack/msgpack-ruby/compare/v1.5.6...v1.6.0)

---
updated-dependencies:
- dependency-name: msgpack
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 82ff3123e6..1fa10c3b45 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,7 +234,7 @@ GEM
       ffi (~> 1.9)
     minitest (5.16.3)
     mocha (1.15.0)
-    msgpack (1.5.6)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustache (1.1.1)

From 3f14df479620823275eadc395998d1b5b368e3de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Oct 2022 23:26:35 +0200
Subject: [PATCH 025/332] Build(deps): Bump zeitwerk from 2.6.0 to 2.6.1
 (#18450)

Bumps [zeitwerk](https://github.com/fxn/zeitwerk) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/fxn/zeitwerk/releases)
- [Changelog](https://github.com/fxn/zeitwerk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fxn/zeitwerk/compare/v2.6.0...v2.6.1)

---
updated-dependencies:
- dependency-name: zeitwerk
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1fa10c3b45..fc0fd8a697 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -502,7 +502,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yaml-lint (0.0.10)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   aarch64-linux

From 6ef4cf195a4fa4c75881c78119249b5a2db2500a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Oct 2022 23:26:54 +0200
Subject: [PATCH 026/332] Build(deps): Bump exifr from 1.3.9 to 1.3.10 (#18449)

Bumps [exifr](https://github.com/remvee/exifr) from 1.3.9 to 1.3.10.
- [Release notes](https://github.com/remvee/exifr/releases)
- [Changelog](https://github.com/remvee/exifr/blob/master/CHANGELOG)
- [Commits](https://github.com/remvee/exifr/compare/release-1.3.9...release-1.3.10)

---
updated-dependencies:
- dependency-name: exifr
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fc0fd8a697..ff6215699d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
     erubi (1.11.0)
     excon (0.93.0)
     execjs (2.8.1)
-    exifr (1.3.9)
+    exifr (1.3.10)
     fabrication (2.30.0)
     faker (2.23.0)
       i18n (>= 1.8.11, < 2)

From 8fe52bbee79f6b684c81ffa9b89302f6682e1974 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Oct 2022 23:27:55 +0200
Subject: [PATCH 027/332] Build(deps): Bump rack-protection from 3.0.1 to 3.0.2
 (#18448)

Bumps [rack-protection](https://github.com/sinatra/sinatra) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: rack-protection
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ff6215699d..2c71847775 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,7 +322,7 @@ GEM
     rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-protection (3.0.1)
+    rack-protection (3.0.2)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)

From 060123143f4effead00dc7e9092bc8cc471903c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Oct 2022 23:56:37 +0200
Subject: [PATCH 028/332] Build(deps): Bump jsdom from 20.0.0 to 20.0.1 in
 /app/assets/javascripts (#18452)

Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.0 to 20.0.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/20.0.0...20.0.1)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json |   2 +-
 app/assets/javascripts/yarn.lock              | 138 +++++++++---------
 2 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 5ba3b11d91..0c527390c9 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -71,7 +71,7 @@
     "eslint-plugin-qunit": "^6.2.0",
     "html-entities": "^2.3.3",
     "js-yaml": "^4.1.0",
-    "jsdom": "^20.0.0",
+    "jsdom": "^20.0.1",
     "loader.js": "^4.7.0",
     "markdown-it": "^13.0.1",
     "message-bus-client": "^4.2.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 8cc2cc6eb1..febf62ec39 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1881,13 +1881,13 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
   dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
@@ -1899,25 +1899,25 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+acorn-walk@^8.0.2:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.1.0, acorn@^8.7.1, acorn@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 after@0.8.2:
   version "0.8.2"
@@ -3207,11 +3207,6 @@ brorand@^1.0.1, brorand@^1.1.0:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browser-split@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/browser-split/-/browser-split-0.0.1.tgz#7b097574f8e3ead606fb4664e64adfdda2981a93"
@@ -4100,10 +4095,10 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decimal.js@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.1:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.1.tgz#be75eeac4a2281aace80c1a8753587c27ef053e7"
+  integrity sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -5069,10 +5064,10 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz#c34062a94c865c322f9d67b4384e4169bcede6a4"
-  integrity sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
 entities@~1.1.1:
   version "1.1.2"
@@ -7132,18 +7127,18 @@ js-yaml@^4.0.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^20.0.0:
-  version "20.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz#882825ac9cc5e5bbee704ba16143e1fa78361ebf"
-  integrity sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA==
+jsdom@^20.0.1:
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.1.tgz#d95b4a3b6e1eec6520aa01d9d908eade8c6ba153"
+  integrity sha512-pksjj7Rqoa+wdpkKcLzQRHhJCEE42qQhl/xLMUKHgoSejaKOdaXEAnqs6uDNwMl/fciHTzKeR8Wm8cw7N+g98A==
   dependencies:
     abab "^2.0.6"
-    acorn "^8.7.1"
-    acorn-globals "^6.0.0"
+    acorn "^8.8.0"
+    acorn-globals "^7.0.0"
     cssom "^0.5.0"
     cssstyle "^2.3.0"
     data-urls "^3.0.2"
-    decimal.js "^10.3.1"
+    decimal.js "^10.4.1"
     domexception "^4.0.0"
     escodegen "^2.0.0"
     form-data "^4.0.0"
@@ -7151,18 +7146,17 @@ jsdom@^20.0.0:
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "^7.0.0"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
+    tough-cookie "^4.1.2"
     w3c-xmlserializer "^3.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
-    ws "^8.8.0"
+    ws "^8.9.0"
     xml-name-validator "^4.0.0"
 
 jsesc@^1.3.0:
@@ -8280,10 +8274,10 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+nwsapi@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
 object-assign@4.1.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
@@ -8551,12 +8545,12 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
-  integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
+parse5@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
+  integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
   dependencies:
-    entities "^4.3.0"
+    entities "^4.4.0"
 
 parseqs@0.0.6:
   version "0.0.6"
@@ -8951,6 +8945,11 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -10432,14 +10431,15 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
 tr46@^3.0.0:
   version "3.0.0"
@@ -10641,11 +10641,16 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -10696,6 +10701,14 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -10787,13 +10800,6 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
 w3c-xmlserializer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
@@ -11120,10 +11126,10 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769"
-  integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==
+ws@^8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
+  integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
 
 ws@~7.4.2:
   version "7.4.4"

From c5544a762401e144fcd6dad5b8725e4c8b96532b Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 3 Oct 2022 16:59:25 +0800
Subject: [PATCH 029/332] FIX: Review sidebar link showing for users that can't
 review (#18454)

---
 .../lib/sidebar/user/community-section/review-section-link.js   | 1 +
 .../tests/acceptance/sidebar-user-community-section-test.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
index 04716cca09..b0e5e83c2a 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
@@ -26,6 +26,7 @@ export default class ReviewSectionLink extends BaseSectionLink {
   _refreshCanDisplay() {
     if (!this.currentUser.can_review) {
       this.canDisplay = false;
+      return;
     }
 
     if (this.inMoreDrawer) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index e56736f273..d48d92e0d1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -711,7 +711,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
   });
 
   test("review link is not shown when user cannot review", async function (assert) {
-    updateCurrentUser({ can_review: false });
+    updateCurrentUser({ can_review: false, reviewable_count: 0 });
 
     await visit("/");
 

From a5fbdba9d46232922f299ba18806b368d6c1da2b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 3 Oct 2022 11:55:50 -0400
Subject: [PATCH 030/332] UX: add max-width to digest email, format erb
 (#18445)

---
 app/views/user_notifications/digest.html.erb | 752 +++++++++----------
 1 file changed, 370 insertions(+), 382 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index e7750ecbdd..b55ee1976a 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -1,404 +1,392 @@
 <div class="summary-email">
-
-<span class="preheader" style="display:none!important;color:#f3f3f3;font-size:1px;line-height:1px;max-height:0;max-width:0;mso-hide:all!important;opacity:0;overflow:hidden;visibility:hidden">
-  <%= @preheader_text %>
-</span>
-
-<%- if I18n.t('user_notifications.digest.custom.html.header').present? %>
-  <table class="digest-header logo-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;min-width:100%;border-spacing:0;padding:0;">
+  <span class="preheader" style="display:none!important;color:#f3f3f3;font-size:1px;line-height:1px;max-height:0;max-width:0;mso-hide:all!important;opacity:0;overflow:hidden;visibility:hidden">
+    <%= @preheader_text %>
+  </span>
+  <table border="0" cellspacing="0" width="100%">
     <tr>
-      <td style="padding:0;">
-        <%= raw(t 'user_notifications.digest.custom.html.header') %>
-      </td>
-    </tr>
-  </table>
-<%- else %>
-<table class="digest-header text-header with-dir" style="background-color:#<%= @header_bgcolor -%>;width:100%;min-width:100%;">
-  <tr>
-    <td align="center" style="text-align: center;padding: 20px 0; font-family:Arial,sans-serif;">
-
-  <a href="<%= Discourse.base_url %>" style="color:#<%= @header_color -%>;font-size:22px;text-decoration:none;">
-  <%- if logo_url.blank? %>
-    <%= SiteSetting.title %>
-  <%- else %>
-    <img src="<%= logo_url %>" height="40" style="clear:both;display:block;height:40px;margin:auto;max-width:100%;outline:0;text-decoration:none;" alt="<%= SiteSetting.title %>">
-  <%- end %>
-  </a>
-
-    </td>
-  </tr>
-</table>
-<%- end %>
-
-<table class="body digest-content with-dir" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
-  <tr>
-    <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
-      <div class="with-accent-colors">
-        <table class="spacer with-accent-colors" style="border-spacing:0;padding:0;width:100%">
-          <tbody>
+      <td></td>
+      <td width="650">
+        <%- if I18n.t('user_notifications.digest.custom.html.header').present? %>
+          <table width="100%" class="digest-header logo-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;padding:0;">
             <tr>
-              <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
+              <td></td>
+              <td style="padding:0;">
+                <%= raw(t 'user_notifications.digest.custom.html.header') %>
+              </td>
+              <td></td>
             </tr>
-          </tbody>
-        </table>
-      </div>
-    </td>
-    <td style="vertical-align:top;padding:0;font-family:Arial,sans-serif;">
-      <table align="center" class="digest-content-header with-accent-colors with-dir" style="border-spacing:0;margin:0;padding:0;vertical-align:top;width:100%">
-        <tbody>
+          </table>
+        <%- else %>
+          <table width="100%" class="digest-header text-header with-dir" style="background-color:#<%= @header_bgcolor -%>;">
+            <tr>
+              <td></td>
+              <td align="center" style="text-align: center;padding: 20px 0; font-family:Arial,sans-serif;">
+                <a href="<%= Discourse.base_url %>" style="color:#<%= @header_color -%>;font-size:22px;text-decoration:none;">
+                <%- if logo_url.blank? %>
+                  <%= SiteSetting.title %>
+                <%- else %>
+                  <img src="<%= logo_url %>" height="40" style="clear:both;display:block;height:40px;margin:auto;max-width:100%;outline:0;text-decoration:none;" alt="<%= SiteSetting.title %>">
+                <%- end %>
+                </a>
+              </td>
+              <td></td>
+            </tr>
+          </table>
+        <%- end %>
+        <table width="100%" class="body digest-content with-dir" style="background:#f3f3f3;padding:0;border-spacing:0;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
           <tr>
-            <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
+            <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
+              <div class="with-accent-colors">
+                <table class="spacer with-accent-colors" style="border-spacing:0;padding:0;width:100%">
+                  <tbody>
+                    <tr>
+                      <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </td>
+            <td style="vertical-align:top;padding:0;font-family:Arial,sans-serif;">
+              <table align="center" class="digest-content-header with-accent-colors with-dir" style="border-spacing:0;margin:0;padding:0;vertical-align:top;width:100%">
+                <tbody>
+                  <tr>
+                    <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
+                      <br/>
+                      <center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.since_last_visit' %></center>
+                      <table class="header-stats with-dir" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%;min-width:100%;">
+                        <tbody>
+                          <tr class="header-stat-count">
+                            <%- @counts.each do |count| -%>
+                              <td style="text-align:center;font-size:36px;font-weight:400;">
+                                <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%= count[:value] -%></strong></a>
+                              </td>
+                            <%- end -%>
+                          </tr>
+                          <tr class="header-stat-description">
+                            <%- @counts.each do |count| -%>
+                              <td style="font-size:14px;font-weight:400;text-align:center;">
+                                <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%=t count[:label_key] -%></strong></a>
+                              </td>
+                            <%- end -%>
+                          </tr>
+                        </tbody>
+                      </table>
+                      <center class="header-popular-topics with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px; mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.popular_topics' %></center>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="with-dir" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
+                <tbody>
+                  <tr>
+                    <td class="digest-popular-topic-wrapper with-dir" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
+                      <% @popular_topics.each_with_index do |t, i| %>
+                        <!--   Beginning of Popular Topic   -->
+                        <table class="digest-topic popular-topic with-dir" style="width:100%">
+                          <tbody>
+                            <tr>
+                              <td class="digest-topic-category with-dir" style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;vertical-align:top;">
+                                <p style="color:#8f8f8f;line-height:1.3;margin: 20px 0 0 0;">
+                                  <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
+                                </p>
+                              </td>
+                              <td class="with-dir" style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
+                                <p class="text-right digest-created-at" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
+                                  <%= short_date(t.created_at) %>
+                                </p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <table class="digest-topic-title-wrapper with-dir" style="vertical-align:top;width:100%">
+                          <tbody>
+                            <tr>
+                              <td class="with-dir" style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>;width:100%;">
+                                <h2 class="digest-topic-title" style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
+                                  <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
+                                    <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
+                                  </a>
+                                </h2>
+                                <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
+                                  <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
+                                <%- end %>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <table class="digest-topic-title-wrapper with-dir" style="padding:0;position:relative;vertical-align:top;width:100%">
+                          <tbody>
+                            <tr>
+                              <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;vertical-align:top;">
+                                <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center" alt="<%= t.user.username -%>">
+                              </td>
+                              <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;">
+                                <% if t.user %>
+                                  <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
+                                    <h6 class="digest-topic-username" style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
+                                  <% end %>
+                                  <p class="digest-topic-name" style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
+                                <% end %>
+                              </td>
+                              <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
+                                <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;" align="right">
+                                  <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;" alt="topic image">
+                                </td>
+                              <%- end -%>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <%- if t.first_post.present? && !t.first_post.user_deleted %>
+                          <table class="digest-topic-body with-dir" style="border-bottom:1px solid #f3f3f3;mso-border-bottom-alt:none;padding:0;vertical-align:top;width:100%;">
+                            <tbody>
+                              <tr>
+                                <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;width:100%;font-weight:normal;mso-padding-alt: 16px;">
+                                  <%= @excerpts[t.first_post.id] %>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        <%- end %>
+                        <table class="digest-topic-stats with-dir" style="padding:0;vertical-align:top;width:100%; padding-top:20px;">
+                          <tbody>
+                            <tr>
+                              <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;white-space:nowrap;vertical-align:top;width:75px">
+                                <img class="digest-icon" src="<%= email_image_url 'heart_lightdark.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="likes">
+                                <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.like_count -%></span>
+                              </td>
+                              <td class="digest-topic-stat" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;width:75px">
+                                <img class="digest-icon" src="<%= email_image_url 'comment_lightdark.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="replies">
+                                <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.posts_count - 1 -%></span>
+                              </td>
+                              <td class="digest-read-more-wrap" style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
+                                <span class="with_accent-colors mso-accent-link">
+                                  <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
+                                    <%=t 'user_notifications.digest.join_the_discussion' %>
+                                  </a>
+                                </span>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <div style="background-color:#f3f3f3;">
+                          <table class="spacer with-dir" style="padding:0;width:100%;background-color:#f3f3f3">
+                            <tbody><tr><td height="20px" style="border-collapse:collapse!important;line-height:20px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr></tbody>
+                          </table>
+                        </div>
+                        <!--   End of Popular Topic   -->
 
-<br/>
-<center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.since_last_visit' %></center>
-
-
-
-<table class="header-stats with-dir" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%;min-width:100%;">
-<tbody>
-  <tr class="header-stat-count">
-    <%- @counts.each do |count| -%>
-      <td style="text-align:center;font-size:36px;font-weight:400;">
-        <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%= count[:value] -%></strong></a>
-      </td>
-    <%- end -%>
-  </tr>
-  <tr class="header-stat-description">
-    <%- @counts.each do |count| -%>
-      <td style="font-size:14px;font-weight:400;text-align:center;">
-        <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%=t count[:label_key] -%></strong></a>
-      </td>
-    <%- end -%>
-  </tr>
-</tbody>
-</table>
-
-<center class="header-popular-topics with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px; mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.popular_topics' %></center>
+                        <% if i < 5 %>
+                        <%= digest_custom_html("below_post_#{i+1}") %>
+                        <% end %>
 
+                      <% end %>
 
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+            <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
+              <!-- Background that goes down part-way behind content -->
+              <div class="with-accent-colors">
+                <table class="spacer with-dir with-accent-colors" style="border-spacing:0;padding:0;width:100%">
+                  <tbody>
+                    <tr>
+                      <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
             </td>
           </tr>
-        </tbody>
-      </table>
-      <table class="with-dir" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
-        <tbody>
-          <tr>
-            <td class="digest-popular-topic-wrapper with-dir" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
-
-<% @popular_topics.each_with_index do |t, i| %>
-<!--   Beginning of Popular Topic   -->
-<table class="digest-topic popular-topic with-dir" style="width:100%">
-  <tbody>
-    <tr>
-      <td class="digest-topic-category with-dir" style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;vertical-align:top;">
-        <p style="color:#8f8f8f;line-height:1.3;margin: 20px 0 0 0;">
-          <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
-        </p>
-      </td>
-      <td class="with-dir" style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
-        <p class="text-right digest-created-at" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
-          <%= short_date(t.created_at) %>
-        </p>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<table class="digest-topic-title-wrapper with-dir" style="vertical-align:top;width:100%">
-  <tbody>
-    <tr>
-      <td class="with-dir" style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>;width:100%;">
-        <h2 class="digest-topic-title" style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
-          <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
-            <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
-          </a>
-        </h2>
-        <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
-          <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
-        <%- end %>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<table class="digest-topic-title-wrapper with-dir" style="padding:0;position:relative;vertical-align:top;width:100%">
-  <tbody>
-    <tr>
-      <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;vertical-align:top;">
-        <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center" alt="<%= t.user.username -%>">
-      </td>
-      <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;">
-        <% if t.user %>
-          <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
-            <h6 class="digest-topic-username" style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
-          <% end %>
-          <p class="digest-topic-name" style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
-        <% end %>
-      </td>
-      <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
-        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;" align="right">
-          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;" alt="topic image">
-        </td>
-      <%- end -%>
-    </tr>
-  </tbody>
-</table>
-
-<%- if t.first_post.present? && !t.first_post.user_deleted %>
-<table class="digest-topic-body with-dir" style="border-bottom:1px solid #f3f3f3;mso-border-bottom-alt:none;padding:0;vertical-align:top;width:100%;">
-  <tbody>
-    <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;width:100%;font-weight:normal;mso-padding-alt: 16px;">
-        <%= @excerpts[t.first_post.id] %>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<%- end %>
-
-<table class="digest-topic-stats with-dir" style="padding:0;vertical-align:top;width:100%; padding-top:20px;">
-  <tbody>
-    <tr>
-      <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;white-space:nowrap;vertical-align:top;width:75px">
-        <img class="digest-icon" src="<%= email_image_url 'heart_lightdark.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="likes">
-        <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.like_count -%></span>
-      </td>
-      <td class="digest-topic-stat" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;width:75px">
-        <img class="digest-icon" src="<%= email_image_url 'comment_lightdark.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="replies">
-        <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.posts_count - 1 -%></span>
-      </td>
-      <td class="digest-read-more-wrap" style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
-        <span class="with_accent-colors mso-accent-link">
-          <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
-            <%=t 'user_notifications.digest.join_the_discussion' %>
-          </a>
-        </span>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<div style="background-color:#f3f3f3;">
-  <table class="spacer with-dir" style="padding:0;width:100%;background-color:#f3f3f3">
-    <tbody><tr><td height="20px" style="border-collapse:collapse!important;line-height:20px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr></tbody>
-  </table>
-</div>
-<!--   End of Popular Topic   -->
-
-<% if i < 5 %>
-<%= digest_custom_html("below_post_#{i+1}") %>
-<% end %>
-
-<% end %>
-
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </td>
-    <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
-      <!-- Background that goes down part-way behind content -->
-      <div class="with-accent-colors">
-        <table class="spacer with-dir with-accent-colors" style="border-spacing:0;padding:0;width:100%">
-          <tbody>
-            <tr>
-              <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
-            </tr>
-          </tbody>
         </table>
-      </div>
-    </td>
-  </tr>
-</table>
+        <% if @popular_posts.present? %>
+     
+          <center class="header-popular-posts" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Arial,sans-serif;">
+            <%=t 'user_notifications.digest.popular_posts' %>
+          </center>
+      
+          <table width="100%" class="body with-dir" style="background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
+            <tr>
+              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+              <td class="with-dir" align="center" valign="top" style="border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
 
-<% if @popular_posts.present? %>
+                <% @popular_posts.each do |post| %>
 
-<center class="header-popular-posts" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Arial,sans-serif;">
-  <%=t 'user_notifications.digest.popular_posts' %>
-</center>
+                  <!--   Beginning of Popular Post   -->
+                  <table class="popular-post-excerpt with-dir" style="width:100%;background:#fefefe;border-spacing:0;padding:0;vertical-align:top;">
+                    <tbody>
+                      <tr>
+                        <td class="post-excerpt with-dir" style="color:#0a0a0a;font-size:14px;font-weight:normal;padding:16px;width:100%;">
+                          <%= email_excerpt(post.cooked, post) %>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
 
-<table class="body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
-  <tr>
-    <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-    <td class="with-dir" align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
+                  <table class="popular-post-spacer with-dir" style="border-spacing:0;background-color:#f3f3f3;padding:0;vertical-align:top;width:100%">
+                    <tbody>
+                      <tr>
+                        <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;">
+                          <div style="width: 0;height: 0;border-top: 30px solid #fefefe;border-right: 30px solid transparent;" dm="triangle"></div>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
 
-<% @popular_posts.each do |post| %>
+                  <table class="popular-post-meta with-dir" style="background-color:#f3f3f3;padding:0;position:relative;vertical-align:top;width:100%">
+                    <tbody>
+                      <tr>
+                        <td style="padding:0 8px 8px 8px;width:50px;vertical-align:top;">
+                          <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;" alt="<%= post.user.username -%>">
+                        </td>
+                        <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
+                          <% if post.user %>
+                            <% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %>
+                              <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= post.user.name -%></h6>
+                            <% end %>
+                            <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= post.user.username -%></p>
+                          <% end %>
+                        </td>
+                        <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:<%= rtl? ? 'left' : 'right' %>;">
+                          <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;">
+                            <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%></a>
+                          </p>
+                          <a href="<%= post.full_url -%>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
+                            <%=t 'user_notifications.digest.join_the_discussion' %>
+                          </a>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
 
-<!--   Beginning of Popular Post   -->
-<table class="popular-post-excerpt with-dir" style="width:100%;background:#fefefe;border-spacing:0;padding:0;vertical-align:top;">
-  <tbody>
-    <tr>
-      <td class="post-excerpt with-dir" style="color:#0a0a0a;font-size:14px;font-weight:normal;padding:16px;width:100%;">
-        <%= email_excerpt(post.cooked, post) %>
-      </td>
-    </tr>
-  </tbody>
-</table>
+                  <div style="background-color:#f3f3f3">
+                    <table class="spacer with-dir" style="padding:0;vertical-align:top;width:100%;background-color:#f3f3f3">
+                      <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
+                    </table>
+                  </div>
+                  <!--   End of Popular Post   -->
 
-<table class="popular-post-spacer with-dir" style="border-spacing:0;background-color:#f3f3f3;padding:0;vertical-align:top;width:100%">
-  <tbody>
-    <tr>
-      <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;">
-        <div style="width: 0;height: 0;border-top: 30px solid #fefefe;border-right: 30px solid transparent;" dm="triangle"></div>
-      </td>
-    </tr>
-  </tbody>
-</table>
+                <% end %>
 
-<table class="popular-post-meta with-dir" style="background-color:#f3f3f3;padding:0;position:relative;vertical-align:top;width:100%">
-  <tbody>
-    <tr>
-      <td style="padding:0 8px 8px 8px;width:50px;vertical-align:top;">
-        <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;" alt="<%= post.user.username -%>">
-      </td>
-      <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
-        <% if post.user %>
-          <% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %>
-            <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= post.user.name -%></h6>
-          <% end %>
-          <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= post.user.username -%></p>
+              </td>
+              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+            </tr>
+          </table>
         <% end %>
-      </td>
-      <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:<%= rtl? ? 'left' : 'right' %>;">
-        <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;">
-          <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%></a>
-        </p>
-        <a href="<%= post.full_url -%>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
-          <%=t 'user_notifications.digest.join_the_discussion' %>
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
 
-<div style="background-color:#f3f3f3">
-  <table class="spacer with-dir" style="padding:0;vertical-align:top;width:100%;background-color:#f3f3f3">
-    <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
+        <%= digest_custom_html("above_popular_topics") %>
+
+        <% if @other_new_for_you.present? %>
+         
+          <center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Arial,sans-serif;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.more_new' %></center>
+         
+          <table width="100%" class="digest-new-topics body with-dir" style="background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
+            <tr>
+              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+              <td align="center" valign="top" style="border-collapse:collapse!important;margin:0;padding:0;">
+
+                <table class="digest-new-topic with-dir" style="padding:0;vertical-align:top;width:100%">
+                  <tbody>
+
+                    <% @other_new_for_you.each do |t| %>
+
+                      <!--   Begin new topic  -->
+                      <tr style="vertical-align:top;">
+                        <td class="digest-new-topic-title with-dir" style="padding:8px;">
+                          <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none;">
+                            <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
+                          </a>
+                          <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
+                            <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
+                          <%- end %>
+                          <p class="digest-new-topic-category" style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;">
+                            <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
+                          </p>
+                        </td>
+                        <td class="digest-new-topic-stat with-dir" style="padding:8px;">
+                          <img class="digest-icon" src="<%= email_image_url 'heart_lightdark.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="likes">
+                          <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
+                        </td>
+                        <td class="digest-new-topic-stat digest-replies with-dir" style="padding:8px;">
+                          <img class="digest-icon" src="<%= email_image_url 'comment_lightdark.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="replies">
+                          <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
+                        </td>
+                      </tr>
+
+                      <tr class="digest-new-topic-spacer"><td colspan="6" height="10px" style="border-collapse:collapse!important;line-height:10px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr>
+                      <!--   End new topic  -->
+
+                    <% end %>
+
+                  </tbody>
+                </table>
+
+              </td>
+              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+            </tr>
+          </table>
+
+        <% end %>
+
+        <%= digest_custom_html("below_popular_topics") %>
+
+        <style>
+          @media only screen {
+            html {
+              min-height: 100%;
+              background: #f3f3f3
+            }
+          }
+
+          @media only screen and (max-width:900px) {
+            table.body img {
+              width: auto;
+              height: auto
+            }
+            table.body center {
+              min-width: 0!important;
+            }
+            table.body .side-spacer {
+              width: 2.5%!important;
+            }
+            table.body .column,
+            table.body .columns {
+              height: auto!important;
+              -moz-box-sizing: border-box;
+              -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+              padding-left: 16px!important;
+              padding-right: 16px!important
+            }
+            table.body .column .column,
+            table.body .column .columns,
+            table.body .columns .column,
+            table.body .columns .columns {
+              padding-left: 0!important;
+              padding-right: 0!important
+            }
+          }
+        </style>
+
+        <%= digest_custom_html("above_footer") %>
+
+        <table width="100%" class='summary-footer with-dir'>
+          <tr>
+            <td></td>
+            <td align="center">
+              <%=raw(t 'user_notifications.digest.unsubscribe',
+                      site_link: html_site_link,
+                      email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
+                      unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}"))  %>
+            </td>
+            <td></td>
+          </tr>
+        </table>
+
+        <%= digest_custom_html("below_footer") %>
+      </td>
+      <td></td>
+    </tr>
   </table>
 </div>
-<!--   End of Popular Post   -->
-
-<% end %>
-
-    </td>
-    <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-  </tr>
-</table>
-
-<% end %>
-
-
-<%= digest_custom_html("above_popular_topics") %>
-
-<% if @other_new_for_you.present? %>
-<center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Arial,sans-serif;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.more_new' %></center>
-
-<table class="digest-new-topics body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
-  <tr>
-    <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-    <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;margin:0;padding:0;">
-
-<table class="digest-new-topic with-dir" style="padding:0;vertical-align:top;width:100%">
-  <tbody>
-
-<% @other_new_for_you.each do |t| %>
-
-<!--   Begin new topic  -->
-    <tr style="vertical-align:top;">
-      <td class="digest-new-topic-title with-dir" style="padding:8px;">
-        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none;">
-          <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
-        </a>
-        <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
-          <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
-        <%- end %>
-        <p class="digest-new-topic-category" style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;">
-          <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
-        </p>
-      </td>
-      <td class="digest-new-topic-stat with-dir" style="padding:8px;">
-        <img class="digest-icon" src="<%= email_image_url 'heart_lightdark.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="likes">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
-      </td>
-      <td class="digest-new-topic-stat digest-replies with-dir" style="padding:8px;">
-        <img class="digest-icon" src="<%= email_image_url 'comment_lightdark.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;width:20px;margin:0;max-width:100%;outline:0;text-decoration:none;" alt="replies">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
-      </td>
-    </tr>
-
-    <tr class="digest-new-topic-spacer"><td colspan="6" height="10px" style="border-collapse:collapse!important;line-height:10px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr>
-<!--   End new topic  -->
-
-<% end %>
-
-</tbody>
-</table>
-
-    </td>
-    <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-  </tr>
-</table>
-
-<% end %>
-
-<%= digest_custom_html("below_popular_topics") %>
-
-
-    </td>
-    <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-  </tr>
-</table>
-<style>
-  @media only screen {
-    html {
-      min-height: 100%;
-      background: #f3f3f3
-    }
-  }
-
-  @media only screen and (max-width:900px) {
-    table.body img {
-      width: auto;
-      height: auto
-    }
-    table.body center {
-      min-width: 0!important;
-    }
-    table.body .side-spacer {
-      width: 2.5%!important;
-    }
-    table.body .column,
-    table.body .columns {
-      height: auto!important;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      padding-left: 16px!important;
-      padding-right: 16px!important
-    }
-    table.body .column .column,
-    table.body .column .columns,
-    table.body .columns .column,
-    table.body .columns .columns {
-      padding-left: 0!important;
-      padding-right: 0!important
-    }
-  }
-</style>
-
-
-<%= digest_custom_html("above_footer") %>
-
-<table class='summary-footer with-dir' style="width: 100%">
-  <tr>
-    <td align="center">
-  <%=raw(t 'user_notifications.digest.unsubscribe',
-           site_link: html_site_link,
-           email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
-           unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}"))  %>
-    </td>
-  </tr>
-</table>
-
-<%= digest_custom_html("below_footer") %>
-
-</div>

From 6affbabfd3a09c09b8800a8b0f81f2a07498c2fb Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 3 Oct 2022 12:19:41 -0600
Subject: [PATCH 031/332] FIX: New general category changes preventing topic
 create (#18459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FIX: New general category changes preventing topic create

Follow up to: #18383

The logic in the previous commit was checking for null, but we are
seeding the SiteSetting.general_category_id with an id of -1 so we need
to check for a positive value as well as checking for null.

See: https://meta.discourse.org/t/240661

* Add js test for presence of category… dropdown option
---
 .../discourse/app/models/composer.js            |  3 ++-
 .../select-kit/category-chooser-test.js         | 17 +++++++++++++++++
 .../addon/components/category-chooser.js        |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index bf548f633c..466491ea4b 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -145,7 +145,8 @@ const Composer = RestModel.extend({
       if (isEmpty(categoryId)) {
         // Set General as the default category
         const generalCategoryId = this.siteSettings.general_category_id;
-        categoryId = generalCategoryId ? generalCategoryId : null;
+        categoryId =
+          generalCategoryId && generalCategoryId > 0 ? generalCategoryId : null;
       }
       this._categoryId = categoryId;
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
index 5446f009a8..c99ad0e64b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
@@ -143,6 +143,23 @@ module(
       assert.strictEqual(this.subject.header().label(), "");
     });
 
+    test("with allowUncategorized=null and generalCategoryId present, but not set", async function (assert) {
+      this.siteSettings.allow_uncategorized_topics = false;
+      this.siteSettings.general_category_id = -1;
+
+      await render(hbs`
+        <CategoryChooser
+          @value={{this.value}}
+          @options={{hash
+            allowUncategorized=null
+          }}
+        />
+      `);
+
+      assert.strictEqual(this.subject.header().value(), null);
+      assert.strictEqual(this.subject.header().label(), "category…");
+    });
+
     test("with allowUncategorized=null none=true", async function (assert) {
       this.siteSettings.allow_uncategorized_topics = false;
 
diff --git a/app/assets/javascripts/select-kit/addon/components/category-chooser.js b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
index 2345fb2f61..7193d6457f 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
@@ -45,7 +45,7 @@ export default ComboBoxComponent.extend({
       return Category.findUncategorized();
     } else {
       const generalCategoryId = this.siteSettings.general_category_id;
-      if (!generalCategoryId) {
+      if (!generalCategoryId || generalCategoryId < 0) {
         return this.defaultItem(null, htmlSafe(I18n.t("category.choose")));
       }
     }

From bd8e31cde99af862a610490c9a908c1a4f38ee38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 01:33:01 +0200
Subject: [PATCH 032/332] Build(deps): Bump sinon from 14.0.0 to 14.0.1 in
 /app/assets/javascripts (#18463)

Bumps [sinon](https://github.com/sinonjs/sinon) from 14.0.0 to 14.0.1.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v14.0.0...v14.0.1)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 0c527390c9..ea0a69d384 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -83,7 +83,7 @@
     "qunit-dom": "^2.0.0",
     "sass": "^1.55.0",
     "select-kit": "^1.0.0",
-    "sinon": "^14.0.0",
+    "sinon": "^14.0.1",
     "tippy.js": "^6.3.7",
     "virtual-dom": "^2.1.1",
     "webpack": "^5.74.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index febf62ec39..3e74b59ac7 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -9632,10 +9632,10 @@ simple-html-tokenizer@^0.5.11:
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
   integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
 
-sinon@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-14.0.0.tgz#203731c116d3a2d58dc4e3cbe1f443ba9382a031"
-  integrity sha512-ugA6BFmE+WrJdh0owRZHToLd32Uw3Lxq6E6LtNRU+xTVBefx632h03Q7apXWRsRdZAJ41LB8aUfn2+O4jsDNMw==
+sinon@^14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-14.0.1.tgz#9f02e13ad86b695c0c554525e3bf7f8245b31a9c"
+  integrity sha512-JhJ0jCiyBWVAHDS+YSjgEbDn7Wgz9iIjA1/RK+eseJN0vAAWIWiXBdrnb92ELPyjsfreCYntD1ORtLSfIrlvSQ==
   dependencies:
     "@sinonjs/commons" "^1.8.3"
     "@sinonjs/fake-timers" "^9.1.2"

From 8a83d37ea4ef0c430a142cb6d5b778c408757794 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 01:34:57 +0200
Subject: [PATCH 033/332] Build(deps): Bump faraday from 2.5.2 to 2.6.0
 (#18462)

Bumps [faraday](https://github.com/lostisland/faraday) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.5.2...v2.6.0)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2c71847775..65aa42ae53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,7 +148,7 @@ GEM
     faker (2.23.0)
       i18n (>= 1.8.11, < 2)
     fakeweb (1.3.0)
-    faraday (2.5.2)
+    faraday (2.6.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.0)

From 76a79b6adf1b16408febd54305b53785661a2266 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 4 Oct 2022 10:48:33 +0800
Subject: [PATCH 034/332] UX: Change notifications nav icon in user page to
 bell (#18455)

Now that we have chat, the comment icon is no longer ideal

Internal Ref: /t/67780/55
---
 app/assets/javascripts/discourse/app/components/user-nav.hbs | 2 +-
 app/assets/javascripts/discourse/app/templates/user.hbs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 237b2a19ad..6988e134fa 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -52,7 +52,7 @@
       {{#if @showNotificationsTab}}
         <li class="user-notifications">
           <LinkTo @route="userNotifications">
-            {{d-icon "comment" class="glyph"}}{{i18n "user.notifications"}}
+            {{d-icon "bell" class="glyph"}}{{i18n "user.notifications"}}
           </LinkTo>
         </li>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index c3b1e4e419..fa522ce8b2 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -267,7 +267,7 @@
             {{#if this.showNotificationsTab}}
               <li class="user-notifications">
                 <LinkTo @route="userNotifications">
-                  {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+                  {{d-icon "bell" class="glyph"}}{{i18n 'user.notifications'}}
                 </LinkTo>
               </li>
             {{/if}}

From de071fc1e8135750c9227424fb41b41d649f35dc Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 4 Oct 2022 12:05:09 +0800
Subject: [PATCH 035/332] DEV: Convert messages user page nav to experimental
 redesign (#18456)

No tests are written for now as we're still in a highly iterative stage
---
 .../user-nav/messages-groups-dropdown.js      |  53 ++++++
 .../app/components/user-nav/messages-nav.hbs  | 105 +++++++++++
 .../app/components/user-nav/messages-nav.js   |  24 +++
 .../app/controllers/user-private-messages.js  |   5 +-
 .../discourse/app/templates/user/messages.hbs | 171 ++++++++++--------
 app/assets/stylesheets/desktop/new-user.scss  |  17 ++
 app/assets/stylesheets/mobile/new-user.scss   |  13 ++
 config/locales/client.en.yml                  |   1 +
 8 files changed, 313 insertions(+), 76 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/messages-groups-dropdown.js
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/messages-nav.js

diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-groups-dropdown.js b/app/assets/javascripts/discourse/app/components/user-nav/messages-groups-dropdown.js
new file mode 100644
index 0000000000..3d5502d957
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-groups-dropdown.js
@@ -0,0 +1,53 @@
+import { gte, reads } from "@ember/object/computed";
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["messages-dropdown"],
+  classNames: ["message-dropdown"],
+  content: reads("groupsWithMessages"),
+  valueProperty: "name",
+  hasManyGroups: gte("content.length", 10),
+
+  selectKitOptions: {
+    caretDownIcon: "caret-right",
+    caretUpIcon: "caret-down",
+    filterable: "hasManyGroups",
+  },
+
+  groupsWithMessages: computed(function () {
+    const groups = [
+      {
+        name: I18n.t("user.messages.inbox"),
+      },
+    ];
+
+    this.user.groupsWithMessages.forEach((group) => {
+      groups.push({ name: group.name, icon: "inbox" });
+    });
+
+    if (this.pmTaggingEnabled) {
+      groups.push({ name: I18n.t("user.messages.tags") });
+    }
+
+    return groups;
+  }),
+
+  actions: {
+    onChange(item) {
+      let url;
+
+      if (this.user.groups.some((g) => g.name === item)) {
+        url = `/u/${this.user.username}/messages/group/${item}`;
+      } else if (item === I18n.t("user.messages.tags")) {
+        url = `/u/${this.user.username}/messages/tags`;
+      } else {
+        url = `/u/${this.user.username}/messages`;
+      }
+
+      DiscourseURL.routeToUrl(url);
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
new file mode 100644
index 0000000000..a35091d7a7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
@@ -0,0 +1,105 @@
+<div class="user-navigation-container">
+  {{#if (gt @user.groupsWithMessages.length 0)}}
+    <ol class="category-breadcrumb">
+      <li>
+        <UserNav::MessagesGroupsDropdown @user={{@user}} @pmTaggingEnabled={{@pmTaggingEnabled}} @value={{this.messagesDropdownvalue}} />
+      </li>
+    </ol>
+  {{/if}}
+
+  <ul id="navigation-bar" class="messages-nav nav-pills action-list">
+    {{#if @isPersonal}}
+      <li>
+        <LinkTo @route="userPrivateMessages.index" @model={{@user}}>
+          {{i18n "categories.latest"}}
+        </LinkTo>
+      </li>
+
+      <li class="archive">
+        <LinkTo @route="userPrivateMessages.sent" @model={{@user}}>
+          {{i18n "user.messages.sent"}}
+        </LinkTo>
+      </li>
+
+      {{#if @viewingSelf}}
+        <li class="archive">
+          <LinkTo @route="userPrivateMessages.new" @model={{@user}} class="new">
+            {{@newLinkText}}
+          </LinkTo>
+        </li>
+
+        <li class="archive">
+          <LinkTo @route="userPrivateMessages.unread" @model={{@user}} class="unread">
+            {{@unreadLinkText}}
+          </LinkTo>
+        </li>
+      {{/if}}
+
+      <li class="archive">
+        <LinkTo @route="userPrivateMessages.archive" @model={{@user}}>
+          {{i18n "user.messages.archive"}}
+        </LinkTo>
+      </li>
+    {{/if}}
+
+    {{#each @user.groups as |group|}}
+      {{#if (and @isGroup (eq @groupFilter group.name))}}
+        {{#if @viewingSelf}}
+          <li class="archive">
+            <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
+              {{i18n "categories.latest"}}
+            </LinkTo>
+          </li>
+
+          <li class="archive">
+            <LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
+              {{@newLinkText}}
+            </LinkTo>
+          </li>
+
+          <li class="archive">
+            <LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
+              {{@unreadLinkText}}
+            </LinkTo>
+          </li>
+        {{/if}}
+
+        <li class="archive">
+          <LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
+            {{i18n "user.messages.archive"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+    {{/each}}
+
+    {{#if this.displayTags}}
+      <li class="tags">
+        <LinkTo @route="userPrivateMessages.tags" @model={{@user}}>
+          {{i18n "user.messages.all_tags"}}
+        </LinkTo>
+      </li>
+
+      {{#if @tagId}}
+        <li class="archive">
+          <LinkTo @route="userPrivateMessages.tagsShow" @model={{@tagId}}>
+            {{@tagId}}
+          </LinkTo>
+        </li>
+      {{/if}}
+    {{/if}}
+
+    <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=@user}} />
+  </ul>
+
+  {{#if this.site.desktopView}}
+    <div class="navigation-controls">
+      {{#if @isGroup}}
+        <GroupNotificationsButton @value={{@group.group_user.notification_level}} @onChange={{action @changeGroupNotificationLevel}} />
+      {{/if}}
+
+      {{#if @showNewPM}}
+        <DButton @class="btn-primary new-private-message" @action={{route-action "composePrivateMessage"}} @icon="envelope" @label="user.new_private_message" />
+      {{/if}}
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.js b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.js
new file mode 100644
index 0000000000..b89709d85c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.js
@@ -0,0 +1,24 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class UserNavMessagesNav extends Component {
+  @service site;
+
+  get messagesDropdownvalue() {
+    switch (this.args.currentRouteName) {
+      case "userPrivateMessages.tags":
+      case "userPrivateMessages.tagsShow":
+        return "tags";
+      default:
+        if (this.args.groupFilter) {
+          return this.args.groupFilter;
+        } else {
+          return "inbox";
+        }
+    }
+  }
+
+  get displayTags() {
+    return this.args.pmTaggingEnabled && this.messagesDropdownvalue === "tags";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
index e0ec47bbe5..4b9e10fa47 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -1,6 +1,7 @@
 import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
-import { alias, and, equal } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
+import { alias, and, equal, readOnly } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { VIEW_NAME_WARNINGS } from "discourse/routes/user-private-messages-warnings";
 import I18n from "I18n";
@@ -9,6 +10,7 @@ export const PERSONAL_INBOX = "__personal_inbox__";
 
 export default Controller.extend({
   user: controller(),
+  router: service(),
 
   pmView: false,
   viewingSelf: alias("user.viewingSelf"),
@@ -17,6 +19,7 @@ export default Controller.extend({
   group: null,
   groupFilter: alias("group.name"),
   currentPath: alias("router._router.currentPath"),
+  currentRouteName: readOnly("router.currentRouteName"),
   pmTaggingEnabled: alias("site.can_tag_pms"),
   tagId: null,
 
diff --git a/app/assets/javascripts/discourse/app/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
index bf566c7ba5..5ca63d8f2c 100644
--- a/app/assets/javascripts/discourse/app/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
@@ -1,103 +1,124 @@
-<DSection @class="user-secondary-navigation" @pageClass="user-messages">
-  <MobileNav @class="messages-nav" @desktopClass="nav-stacked action-list">
-    <li>
-      <LinkTo @route="userPrivateMessages.index" @model={{this.model}}>
-        {{i18n "user.messages.inbox"}}
-      </LinkTo>
-    </li>
+{{#if this.currentUser.redesigned_user_page_nav_enabled}}
+  <DSection @pageClass="user-messages" />
 
-    {{#if this.isPersonal}}
-      <li class="archive">
-        <LinkTo @route="userPrivateMessages.sent" @model={{this.model}}>
-          {{i18n "user.messages.sent"}}
+  <UserNav::MessagesNav
+    @user={{this.model}}
+    @isPersonal={{this.isPersonal}}
+    @viewingSelf={{this.viewingSelf}}
+    @isGroup={{this.isGroup}}
+    @groupFilter={{this.groupFilter}}
+    @newLinkText={{this.newLinkText}}
+    @unreadLinkText={{this.unreadLinkText}}
+    @archiveLinkText={{this.archiveLinkText}}
+    @pmTaggingEnabled={{this.pmTaggingEnabled}}
+    @tagId={{this.tagId}}
+    @showNewPM={{this.showNewPM}}
+    @group={{this.group}}
+    @changeGroupNotificationLevel={{action "changeGroupNotificationLevel"}}
+    @currentRouteName={{this.currentRouteName}}
+  />
+{{else}}
+  <DSection @class="user-secondary-navigation" @pageClass="user-messages">
+    <MobileNav @class="messages-nav" @desktopClass="nav-stacked action-list">
+      <li>
+        <LinkTo @route="userPrivateMessages.index" @model={{this.model}}>
+          {{i18n "user.messages.inbox"}}
         </LinkTo>
       </li>
 
-      {{#if this.viewingSelf}}
+      {{#if this.isPersonal}}
         <li class="archive">
-          <LinkTo @route="userPrivateMessages.new" @model={{this.model}} class="new">
-            {{this.newLinkText}}
+          <LinkTo @route="userPrivateMessages.sent" @model={{this.model}}>
+            {{i18n "user.messages.sent"}}
           </LinkTo>
         </li>
 
+        {{#if this.viewingSelf}}
+          <li class="archive">
+            <LinkTo @route="userPrivateMessages.new" @model={{this.model}} class="new">
+              {{this.newLinkText}}
+            </LinkTo>
+          </li>
+
+          <li class="archive">
+            <LinkTo @route="userPrivateMessages.unread" @model={{this.model}} class="unread">
+              {{this.unreadLinkText}}
+            </LinkTo>
+          </li>
+        {{/if}}
+
         <li class="archive">
-          <LinkTo @route="userPrivateMessages.unread" @model={{this.model}} class="unread">
-            {{this.unreadLinkText}}
+          <LinkTo @route="userPrivateMessages.archive" @model={{this.model}}>
+            {{i18n "user.messages.archive"}}
           </LinkTo>
         </li>
       {{/if}}
 
-      <li class="archive">
-        <LinkTo @route="userPrivateMessages.archive" @model={{this.model}}>
-          {{i18n "user.messages.archive"}}
-        </LinkTo>
-      </li>
-    {{/if}}
+      {{#each this.model.groups as |group|}}
+        {{#if group.has_messages}}
+          <li>
+            <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
+              {{d-icon "users"}}
+              {{capitalize-string group.name}}
+            </LinkTo>
+          </li>
 
-    {{#each this.model.groups as |group|}}
-      {{#if group.has_messages}}
-        <li>
-          <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
-            {{d-icon "users"}}
-            {{capitalize-string group.name}}
-          </LinkTo>
-        </li>
+          {{#if (and this.isGroup (eq this.groupFilter group.name))}}
+            {{#if this.viewingSelf}}
+              <li class="archive">
+                <LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
+                  {{this.newLinkText}}
+                </LinkTo>
+              </li>
 
-        {{#if (and this.isGroup (eq this.groupFilter group.name))}}
-          {{#if this.viewingSelf}}
-            <li class="archive">
-              <LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
-                {{this.newLinkText}}
-              </LinkTo>
-            </li>
+              <li class="archive">
+                <LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
+                  {{this.unreadLinkText}}
+                </LinkTo>
+              </li>
+            {{/if}}
 
             <li class="archive">
-              <LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
-                {{this.unreadLinkText}}
+              <LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
+                {{i18n "user.messages.archive"}}
               </LinkTo>
             </li>
           {{/if}}
-
-          <li class="archive">
-            <LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
-              {{i18n "user.messages.archive"}}
-            </LinkTo>
-          </li>
         {{/if}}
+      {{/each}}
+
+      {{#if this.pmTaggingEnabled}}
+        <li class="tags">
+          <LinkTo @route="userPrivateMessages.tags" @model={{this.model}}>
+            {{i18n "user.messages.tags"}}
+          </LinkTo>
+
+          {{#if this.tagId}}
+            <li class="archive">
+              <LinkTo @route="userPrivateMessages.tagsShow" @model={{this.tagId}}>
+                {{this.tagId}}
+              </LinkTo>
+            </li>
+          {{/if}}
+        </li>
       {{/if}}
-    {{/each}}
 
-    {{#if this.pmTaggingEnabled}}
-      <li class="tags">
-        <LinkTo @route="userPrivateMessages.tags" @model={{this.model}}>
-          {{i18n "user.messages.tags"}}
-        </LinkTo>
+      <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
+    </MobileNav>
+  </DSection>
 
-        {{#if this.tagId}}
-          <li class="archive">
-            <LinkTo @route="userPrivateMessages.tagsShow" @model={{this.tagId}}>
-              {{this.tagId}}
-            </LinkTo>
-          </li>
-        {{/if}}
-      </li>
-    {{/if}}
+  {{#unless this.site.mobileView}}
+    <section class="user-additional-controls">
+      {{#if this.group}}
+        <GroupNotificationsButton @value={{this.group.group_user.notification_level}} @onChange={{action "changeGroupNotificationLevel"}} />
+      {{/if}}
 
-    <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
-  </MobileNav>
-</DSection>
-
-{{#unless this.site.mobileView}}
-  <section class="user-additional-controls">
-    {{#if this.group}}
-      <GroupNotificationsButton @value={{this.group.group_user.notification_level}} @onChange={{action "changeGroupNotificationLevel"}} />
-    {{/if}}
-
-    {{#if this.showNewPM}}
-      <DButton @class="btn-primary new-private-message" @action={{route-action "composePrivateMessage"}} @icon="envelope" @label="user.new_private_message" />
-    {{/if}}
-  </section>
-{{/unless}}
+      {{#if this.showNewPM}}
+        <DButton @class="btn-primary new-private-message" @action={{route-action "composePrivateMessage"}} @icon="envelope" @label="user.new_private_message" />
+      {{/if}}
+    </section>
+  {{/unless}}
+{{/if}}
 
 <section class="user-content">
   <div class="list-actions">
diff --git a/app/assets/stylesheets/desktop/new-user.scss b/app/assets/stylesheets/desktop/new-user.scss
index f360fd6551..dd378295a6 100644
--- a/app/assets/stylesheets/desktop/new-user.scss
+++ b/app/assets/stylesheets/desktop/new-user.scss
@@ -14,6 +14,23 @@
       grid-row-end: 2;
     }
 
+    .user-navigation-container {
+      grid-column-start: 1;
+      grid-column-end: 3;
+      grid-row-start: 1;
+      grid-row-end: 2;
+
+      display: flex;
+      flex-direction: row;
+    }
+
+    .user-navigation-container ~ .user-content {
+      grid-column-start: 1;
+      grid-column-end: 3;
+      grid-row-start: 2;
+      grid-row-end: 3;
+    }
+
     .user-content {
       grid-column-start: 1;
       grid-column-end: 3;
diff --git a/app/assets/stylesheets/mobile/new-user.scss b/app/assets/stylesheets/mobile/new-user.scss
index 24b6acc3fc..8fe72e0053 100644
--- a/app/assets/stylesheets/mobile/new-user.scss
+++ b/app/assets/stylesheets/mobile/new-user.scss
@@ -49,4 +49,17 @@
       @include ellipsis;
     }
   }
+
+  #navigation-bar {
+    margin-top: 1em;
+    display: flex;
+    flex-wrap: nowrap;
+    width: 100%;
+    overflow-x: scroll;
+    margin-bottom: 0;
+    padding-bottom: 0.5em;
+    a {
+      white-space: nowrap;
+    }
+  }
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index aabda302ec..3a485e8d00 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1275,6 +1275,7 @@ en:
         move_to_archive: "Archive"
         failed_to_move: "Failed to move selected messages (perhaps your network is down)"
         tags: "Tags"
+        all_tags: "All Tags"
         warnings: "Official Warnings"
         read_more_in_group: "Want to read more? Browse other messages in %{groupLink}."
         read_more: "Want to read more? Browse other messages in <a href='%{basePath}/u/%{username}/messages'>personal messages</a>."

From 044dc853589197d2bc323c816045fd9c66cb771c Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 4 Oct 2022 13:37:25 +0800
Subject: [PATCH 036/332] DEV: Remove broken line of code (#18465)

The router service isn't even injected so the code is not used and
broken.
---
 .../discourse/app/controllers/user-private-messages.js           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
index 4b9e10fa47..6e598d6fa0 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -18,7 +18,6 @@ export default Controller.extend({
   isPersonal: equal("pmView", "user"),
   group: null,
   groupFilter: alias("group.name"),
-  currentPath: alias("router._router.currentPath"),
   currentRouteName: readOnly("router.currentRouteName"),
   pmTaggingEnabled: alias("site.can_tag_pms"),
   tagId: null,

From ba2c5c7948e17db5a64f6491c60329f74b87ad16 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 4 Oct 2022 14:23:20 +0800
Subject: [PATCH 037/332] UX: Hide sidebar on 2FA route (#18464)

Internal Ref: /t/75929
---
 .../discourse/app/controllers/application.js  | 30 +++++++++----------
 .../app/routes/second-factor-auth.js          | 13 ++++++++
 .../acceptance/second-factor-auth-test.js     |  9 ++++++
 .../javascripts/wizard/addon/routes/wizard.js | 10 ++++++-
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js
index a7aede86aa..1f4c3c7cd5 100644
--- a/app/assets/javascripts/discourse/app/controllers/application.js
+++ b/app/assets/javascripts/discourse/app/controllers/application.js
@@ -7,13 +7,15 @@ import { action } from "@ember/object";
 const HIDE_SIDEBAR_KEY = "sidebar-hidden";
 
 export default Controller.extend({
-  queryParams: ["enable_sidebar"],
+  queryParams: [{ sidebarQueryParamOverride: "enable_sidebar" }],
 
   showTop: true,
   showFooter: false,
   router: service(),
   showSidebar: false,
-  enable_sidebar: null,
+  sidebarQueryParamOverride: null,
+  sidebarDisabledRouteOverride: false,
+  showSiteHeader: true,
 
   init() {
     this._super(...arguments);
@@ -62,20 +64,25 @@ export default Controller.extend({
   },
 
   @discourseComputed(
-    "enable_sidebar",
+    "sidebarQueryParamOverride",
     "siteSettings.enable_sidebar",
-    "router.currentRouteName",
-    "canDisplaySidebar"
+    "canDisplaySidebar",
+    "sidebarDisabledRouteOverride"
   )
   sidebarEnabled(
     sidebarQueryParamOverride,
     enableSidebar,
-    currentRouteName,
-    canDisplaySidebar
+    canDisplaySidebar,
+    sidebarDisabledRouteOverride
   ) {
     if (!canDisplaySidebar) {
       return false;
     }
+
+    if (sidebarDisabledRouteOverride) {
+      return false;
+    }
+
     if (sidebarQueryParamOverride === "1") {
       return true;
     }
@@ -84,10 +91,6 @@ export default Controller.extend({
       return false;
     }
 
-    if (currentRouteName.startsWith("wizard")) {
-      return false;
-    }
-
     // Always return dropdown on mobile
     if (this.site.mobileView) {
       return false;
@@ -96,11 +99,6 @@ export default Controller.extend({
     return enableSidebar;
   },
 
-  @discourseComputed("router.currentRouteName")
-  showSiteHeader(currentRouteName) {
-    return !currentRouteName.startsWith("wizard");
-  },
-
   @action
   toggleSidebar() {
     // enables CSS transitions, but not on did-insert
diff --git a/app/assets/javascripts/discourse/app/routes/second-factor-auth.js b/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
index 61d71fa5ab..50bfee3e1a 100644
--- a/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
+++ b/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
@@ -26,9 +26,22 @@ export default DiscourseRoute.extend({
     }
   },
 
+  activate() {
+    this.controllerFor("application").setProperties({
+      sidebarDisabledRouteOverride: true,
+    });
+  },
+
+  deactivate() {
+    this.controllerFor("application").setProperties({
+      sidebarDisabledRouteOverride: false,
+    });
+  },
+
   setupController(controller, model) {
     this._super(...arguments);
     controller.resetState();
+
     if (model.error) {
       controller.displayError(model.error);
       controller.set("loadError", true);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/second-factor-auth-test.js b/app/assets/javascripts/discourse/tests/acceptance/second-factor-auth-test.js
index f2ca750155..32b57a7e6d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/second-factor-auth-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/second-factor-auth-test.js
@@ -283,4 +283,13 @@ acceptance("Second Factor Auth Page", function (needs) {
     );
     assert.equal(callbackCount, 1, "callback request has been performed");
   });
+
+  test("sidebar is disabled on 2FA route", async function (assert) {
+    this.siteSettings.enable_experimental_sidebar_hamburger = true;
+    this.siteSettings.enable_sidebar = true;
+
+    await visit("/session/2fa?nonce=ok110111");
+
+    assert.notOk(exists(".sidebar-container"), "does not display the sidebar");
+  });
 });
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard.js b/app/assets/javascripts/wizard/addon/routes/wizard.js
index 73aa06c142..0048317818 100644
--- a/app/assets/javascripts/wizard/addon/routes/wizard.js
+++ b/app/assets/javascripts/wizard/addon/routes/wizard.js
@@ -8,14 +8,22 @@ export default Route.extend({
 
   activate() {
     document.body.classList.add("wizard");
+
     this.controllerFor("application").setProperties({
       showTop: false,
       showFooter: false,
+      sidebarDisabledRouteOverride: true,
+      showSiteHeader: false,
     });
   },
 
   deactivate() {
     document.body.classList.remove("wizard");
-    this.controllerFor("application").set("showTop", true);
+
+    this.controllerFor("application").setProperties({
+      showTop: true,
+      sidebarDisabledRouteOverride: false,
+      showSiteHeader: true,
+    });
   },
 });

From fe12817cb7a8f49a39a9db0d5db43ec457bd526e Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Tue, 4 Oct 2022 10:35:27 +0400
Subject: [PATCH 038/332] FIX: do not show user status on posts twice (#18458)

---
 .../discourse/app/widgets/poster-name.js      | 19 +++++++++----------
 .../acceptance/topic-user-status-test.js      | 17 +++++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  4 ----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index 77a79fed30..c5f28601ea 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -122,7 +122,9 @@ export default createWidget("poster-name", {
       }
     }
 
-    const afterNameContents = this.afterNameContents(attrs);
+    const afterNameContents =
+      applyDecorators(this, "after-name", attrs, this.state) || [];
+
     nameContents = nameContents.concat(afterNameContents);
 
     const contents = [
@@ -160,19 +162,16 @@ export default createWidget("poster-name", {
       );
     }
 
+    if (this.siteSettings.enable_user_status) {
+      this.addUserStatus(contents, attrs);
+    }
+
     return contents;
   },
 
-  afterNameContents(attrs) {
-    const contents = [];
-    if (
-      this.siteSettings.enable_user_status &&
-      attrs.user &&
-      attrs.user.status
-    ) {
+  addUserStatus(contents, attrs) {
+    if (attrs.user && attrs.user.status) {
       contents.push(this.attach("post-user-status", attrs.user.status));
     }
-    contents.push(...applyDecorators(this, "after-name", attrs, this.state));
-    return contents;
   },
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-user-status-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-user-status-test.js
index c8960b64fb..42310bc3a9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-user-status-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-user-status-test.js
@@ -19,6 +19,10 @@ acceptance("Topic - User Status", function (needs) {
       const response = cloneJSON(TopicFixtures["/t/299/1.json"]);
       response.post_stream.posts.forEach((post) => {
         post.user_status = status;
+
+        // we need the poster's name to be different from username
+        // so when display_name_on_posts = true, both name and username will be shown:
+        post.name = "Evil T";
       });
 
       return helper.response(200, response);
@@ -35,6 +39,19 @@ acceptance("Topic - User Status", function (needs) {
       "all posts has user status"
     );
   });
+
+  test("shows user status next to avatar on posts when displaying names on posts is enabled", async function (assert) {
+    this.siteSettings.enable_user_status = true;
+    this.siteSettings.display_name_on_posts = true;
+
+    await visit("/t/-/299/1");
+
+    assert.equal(
+      queryAll(".topic-post .user-status-message").length,
+      3,
+      "all posts has user status"
+    );
+  });
 });
 
 acceptance("Topic - User Status - live updates", function (needs) {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index bd2632d0f2..6ccb5eae0a 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -78,10 +78,6 @@ $quote-share-maxwidth: 150px;
   .user-title a {
     color: var(--primary-med-or-secondary-med);
   }
-
-  .user-status-message {
-    margin-left: 0.3em;
-  }
 }
 
 // global styles for the cooked HTML content in posts (and preview)

From c654bdbfa949672459070b55ac7bc533bb06c64a Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 4 Oct 2022 15:18:54 +0800
Subject: [PATCH 039/332] DEV: Experimental changes to user page notifications
 nav (#18466)

No tests as the changes are experimental and unconfirmed

Internal Ref: /t/67780/58
---
 .../app/templates/user/notifications.hbs      | 112 +++++++++++++-----
 1 file changed, 80 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 9637395e67..462340cf05 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -1,41 +1,89 @@
-<DSection @pageClass="user-notifications" @class="user-secondary-navigation">
-  <MobileNav @class="notifications-nav" @desktopClass="notification-list action-list nav-stacked">
-    <li>
-      <LinkTo @route="userNotifications.index">
-        {{i18n "user.filters.all"}}
-      </LinkTo>
-    </li>
-    <li>
-      <LinkTo @route="userNotifications.responses">
-        {{i18n "user_action_groups.6"}}
-      </LinkTo>
-    </li>
-    <li>
-      <LinkTo @route="userNotifications.likesReceived">
-        {{i18n "user_action_groups.2"}}
-      </LinkTo>
-    </li>
-    {{#if this.siteSettings.enable_mentions}}
+{{#if this.currentUser.redesigned_user_page_nav_enabled}}
+  <DSection @pageClass="user-notifications" />
+
+  <div class="user-navigation-container">
+    <ul id="navigation-bar" class="messages-nav nav-pills action-list">
       <li>
-        <LinkTo @route="userNotifications.mentions">
-          {{i18n "user_action_groups.7"}}
+        <LinkTo @route="userNotifications.index">
+          {{i18n "user.filters.all"}}
         </LinkTo>
       </li>
+
+      <li>
+        <LinkTo @route="userNotifications.responses">
+          {{i18n "user_action_groups.6"}}
+        </LinkTo>
+      </li>
+
+      <li>
+        <LinkTo @route="userNotifications.likesReceived">
+          {{i18n "user_action_groups.2"}}
+        </LinkTo>
+      </li>
+
+      {{#if this.siteSettings.enable_mentions}}
+        <li>
+          <LinkTo @route="userNotifications.mentions">
+            {{i18n "user_action_groups.7"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+
+      <li>
+        <LinkTo @route="userNotifications.edits">
+          {{i18n "user_action_groups.11"}}
+        </LinkTo>
+      </li>
+
+      <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
+    </ul>
+
+    {{#if this.model}}
+      <div class="navigation-controls">
+        <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
+      </div>
     {{/if}}
-    <li>
-      <LinkTo @route="userNotifications.edits">
-        {{i18n "user_action_groups.11"}}
-      </LinkTo>
-    </li>
-    <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
-  </MobileNav>
+  </div>
+{{else}}
+  <DSection @pageClass="user-notifications" @class="user-secondary-navigation">
+    <MobileNav @class="notifications-nav" @desktopClass="notification-list action-list nav-stacked">
+      <li>
+        <LinkTo @route="userNotifications.index">
+          {{i18n "user.filters.all"}}
+        </LinkTo>
+      </li>
+      <li>
+        <LinkTo @route="userNotifications.responses">
+          {{i18n "user_action_groups.6"}}
+        </LinkTo>
+      </li>
+      <li>
+        <LinkTo @route="userNotifications.likesReceived">
+          {{i18n "user_action_groups.2"}}
+        </LinkTo>
+      </li>
+      {{#if this.siteSettings.enable_mentions}}
+        <li>
+          <LinkTo @route="userNotifications.mentions">
+            {{i18n "user_action_groups.7"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <li>
+        <LinkTo @route="userNotifications.edits">
+          {{i18n "user_action_groups.11"}}
+        </LinkTo>
+      </li>
+      <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
+    </MobileNav>
 
-</DSection>
+  </DSection>
 
-{{#if this.model}}
-  <section class="user-additional-controls">
-    <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
-  </section>
+  {{#if this.model}}
+    <section class="user-additional-controls">
+      <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
+    </section>
+  {{/if}}
 {{/if}}
 
 <section class="user-content">

From ba27ee16376c961c93a4e3854b038a42f9577613 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 4 Oct 2022 04:42:46 -0400
Subject: [PATCH 040/332] DEV: Remove usage of `{{action}}` modifiers (#18333)

This PR enables the [`no-action-modifiers`](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-action-modifiers.md) template lint rule and removes all usages of the `{{action}}` modifier in core.

In general, instances of `{{action "x"}}` have been replaced with `{{on "click" (action "x")}}`.

In many cases, such as for `a` elements, we also need to prevent default event handling to avoid unwanted side effects. While the `{{action}}` modifier internally calls `event.preventDefault()`, we need to handle these cases more explicitly. For this purpose, this PR also adds the [ember-event-helpers](https://github.com/buschtoens/ember-event-helpers) dependency so we can use the `prevent-default` handler. For instance:

```
<a href {{on "click" (prevent-default (action "x"))}}>Do X</a>
```

Note that `action` has not in general been refactored away as a helper yet. In general, all event handlers should be methods on the corresponding component and referenced directly (e.g. `{{on "click" this.doSomething}}`). However, the `action` helper is used extensively throughout the codebase and often references methods in the `actions` hash on controllers or routes. Thus this refactor will also be extensive and probably deserves a separate PR.

Note: This work was done to complement #17767 by minimizing the potential impact of the `action` modifier override, which uses private API and arguably should be replaced with an AST transform.

Commits:
* Enable `no-action-modifiers` template lint rule
* Replace {{action "x"}} with {{on "click" (action "x")}}
* Remove unnecessary action helper usage
* Remove ctl+click tests for user-menu
   These tests now break in Chrome when used with addEventListener. As per the comment, they can probably be safely removed.
* Prevent default event handlers to avoid unwanted side effects
   Uses `event.preventDefault()` in event handlers to prevent default event handling. This had been done automatically by the `action` modifier, but is not always desirable or necessary.
* Restore UserCardContents#showUser action to avoid regression
   By keeping the `showUser` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showUser` argument that's been passed.
* Revert EditCategoryTab#selectTab -> EditCategoryTab#select
   Avoid potential breaking change in themes / plugins
* Restore GroupCardContents#showGroup action to avoid regression
   By keeping the `showGroup` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showGroup` argument that's been passed.
* Restore SecondFactorAddTotp#showSecondFactorKey action to avoid regression
   By keeping the `showSecondFactorKey` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showSecondFactorKey` property that's maintained on the controller.
* Refactor away from `actions` hash in ChooseMessage component
* Modernize EmojiPicker#onCategorySelection usage
* Modernize SearchResultEntry#logClick usage
* Modernize Discovery::Categories#showInserted usage
* Modernize Preferences::Account#resendConfirmationEmail usage
* Modernize MultiSelect::SelectedCategory#onSelectedNameClick usage
* Favor fn over action in SelectedChoice component
* Modernize WizardStep event handlers
* Favor fn over action usage in buttons
* Restore Login#forgotPassword action to avoid possible regression
---
 .template-lintrc.js                           |   1 +
 .../addon/components/admin-editable-field.js  |  14 +-
 .../addon/components/admin-theme-editor.js    |  33 +++--
 .../admin/addon/components/ip-lookup.js       |  12 +-
 .../addon/components/themes-list-item.js      |   9 +-
 .../addon/controllers/admin-badges/show.js    |   6 +
 .../addon/controllers/admin-email-bounced.js  |   7 +
 .../controllers/admin-email-preview-digest.js |  12 +-
 .../addon/controllers/admin-email-rejected.js |   7 +
 .../admin-logs-screened-ip-addresses.js       |  17 ++-
 .../admin-logs-staff-action-logs.js           | 125 ++++++++++--------
 .../admin-web-hooks-show-events.js            |  33 ++---
 .../modals/admin-uploaded-image-list.js       |  11 +-
 .../addon/templates/admin-badges/show.hbs     |   4 +-
 .../components/admin-editable-field.hbs       |   4 +-
 .../components/admin-theme-editor.hbs         |   6 +-
 .../addon/templates/components/ip-lookup.hbs  |   2 +-
 .../templates/components/themes-list-item.hbs |   2 +-
 .../admin/addon/templates/email-bounced.hbs   |   4 +-
 .../addon/templates/email-preview-digest.hbs  |   4 +-
 .../admin/addon/templates/email-rejected.hbs  |   4 +-
 .../templates/logs/screened-ip-addresses.hbs  |   2 +-
 .../templates/logs/staff-action-logs.hbs      |  20 +--
 .../modal/admin-uploaded-image-list.hbs       |   2 +-
 .../addon/templates/web-hooks-show-events.hbs |   2 +-
 .../app/components/categories-only.js         |   3 +-
 .../app/components/category-permission-row.js |  11 +-
 .../app/components/choose-message.js          |  15 +--
 .../app/components/composer-messages.js       |  12 +-
 .../app/components/edit-category-tab.js       |  16 +--
 .../discourse/app/components/emoji-picker.js  |   3 +-
 .../app/components/group-card-contents.js     |  23 +++-
 .../components/group-imap-email-settings.js   |   3 +-
 .../discourse/app/components/group-member.js  |  10 +-
 .../components/group-smtp-email-settings.js   |   3 +-
 .../discourse/app/components/mobile-nav.js    |  41 +++---
 .../app/components/navigation-bar.js          |  43 +++---
 .../app/components/reviewable-item.js         |  47 ++++---
 .../app/components/reviewable-post-edits.js   |  25 ++--
 .../app/components/reviewable-queued-post.js  |   9 +-
 .../app/components/search-result-entry.js     |   1 +
 .../app/components/second-factor-form.js      |  21 +--
 .../app/components/security-key-form.js       |  13 +-
 .../discourse/app/components/signup-cta.js    |  12 +-
 .../discourse/app/components/tag-info.js      |  71 +++++-----
 .../app/components/topic-list-item.js         |   2 +
 .../app/components/user-card-contents.js      |  16 ++-
 .../discourse/app/controllers/auth-token.js   |  11 +-
 .../app/controllers/avatar-selector.js        |  17 ++-
 .../discourse/app/controllers/composer.js     |  43 +++---
 .../app/controllers/discovery/categories.js   |  19 +--
 .../app/controllers/discovery/topics.js       |  21 +--
 .../app/controllers/full-page-search.js       |  31 +++--
 .../discourse/app/controllers/history.js      |  29 ++--
 .../discourse/app/controllers/login.js        | 111 +++++++++-------
 .../app/controllers/password-reset.js         |  13 +-
 .../app/controllers/preferences/account.js    |  28 ++--
 .../controllers/preferences/second-factor.js  |  40 +++---
 .../app/controllers/preferences/security.js   |  98 +++++++-------
 .../app/controllers/second-factor-add-totp.js |   9 +-
 .../app/controllers/second-factor-auth.js     |   3 +-
 .../discourse/app/controllers/tag-show.js     |   3 +-
 .../discourse/app/controllers/tags-index.js   |  37 +++---
 .../discourse/app/controllers/topic.js        |  87 ++++++------
 .../controllers/user-private-messages-tags.js |  34 ++---
 .../app/controllers/user-topics-list.js       |   4 +-
 .../discourse/app/controllers/user.js         |  16 ++-
 .../templates/components/categories-only.hbs  |   2 +-
 .../components/category-permission-row.hbs    |   2 +-
 .../templates/components/choose-message.hbs   |   2 +-
 .../components/edit-category-tab.hbs          |   2 +-
 .../components/emoji-group-buttons.hbs        |  18 +--
 .../app/templates/components/emoji-picker.hbs |   6 +-
 .../templates/components/flag-action-type.hbs |   4 +-
 .../components/group-card-contents.hbs        |   8 +-
 .../components/group-imap-email-settings.hbs  |   2 +-
 .../group-manage-email-settings.hbs           |   4 +-
 .../app/templates/components/group-member.hbs |   2 +-
 .../components/group-smtp-email-settings.hbs  |   2 +-
 .../templates/components/login-buttons.hbs    |   2 +-
 .../templates/components/reviewable-item.hbs  |   2 +-
 .../components/reviewable-post-edits.hbs      |   2 +-
 .../components/reviewable-queued-post.hbs     |   2 +-
 .../components/search-result-entry.hbs        |   2 +-
 .../components/second-factor-form.hbs         |   2 +-
 .../components/security-key-form.hbs          |   2 +-
 .../templates/components/selected-posts.hbs   |   6 +-
 .../app/templates/components/signup-cta.hbs   |   2 +-
 .../app/templates/components/tag-info.hbs     |   6 +-
 .../components/user-card-contents.hbs         |   6 +-
 .../discourse/app/templates/composer.hbs      |  10 +-
 .../templates/composer/dominating-topic.hbs   |   2 +-
 .../app/templates/composer/education.hbs      |   2 +-
 .../app/templates/composer/get-a-room.hbs     |   2 +-
 .../templates/composer/group-mentioned.hbs    |   2 +-
 .../app/templates/composer/similar-topics.hbs |   2 +-
 .../app/templates/discovery/categories.hbs    |   2 +-
 .../app/templates/discovery/topics.hbs        |   2 +-
 .../app/templates/full-page-search.hbs        |   2 +-
 .../mobile/components/categories-only.hbs     |   2 +-
 .../mobile/components/mobile-nav.hbs          |   2 +-
 .../mobile/components/navigation-bar.hbs      |   2 +-
 .../app/templates/mobile/discovery/topics.hbs |   2 +-
 .../app/templates/mobile/modal/login.hbs      |   4 +-
 .../app/templates/modal/auth-token.hbs        |   2 +-
 .../app/templates/modal/avatar-selector.hbs   |   2 +-
 .../discourse/app/templates/modal/history.hbs |   6 +-
 .../app/templates/modal/insert-hyperlink.hbs  |   2 +-
 .../discourse/app/templates/modal/login.hbs   |   4 +-
 .../modal/second-factor-add-totp.hbs          |   2 +-
 .../app/templates/password-reset.hbs          |   2 +-
 .../templates/preferences-second-factor.hbs   |   2 +-
 .../app/templates/preferences/account.hbs     |   2 +-
 .../app/templates/preferences/security.hbs    |   6 +-
 .../app/templates/second-factor-auth.hbs      |   2 +-
 .../discourse/app/templates/tag/show.hbs      |   2 +-
 .../discourse/app/templates/tags/index.hbs    |   4 +-
 .../discourse/app/templates/topic.hbs         |   6 +-
 .../templates/user-private-messages-tags.hbs  |   4 +-
 .../app/templates/user-topics-list.hbs        |   2 +-
 .../discourse/app/templates/user.hbs          |   2 +-
 .../plugin-outlet-connector-class-test.js     |   4 +-
 .../tests/acceptance/user-menu-test.js        |  19 ---
 .../fixtures/concerns/notification-types.js   |   1 +
 .../multi-select/selected-category.hbs        |   2 +-
 .../templates/components/selected-choice.hbs  |   2 +-
 .../addon/components/styling-preview.js       |   6 +-
 .../wizard/addon/components/wizard-step.js    |  14 +-
 .../templates/components/styling-preview.hbs  |   4 +-
 .../templates/components/wizard-step.hbs      |  10 +-
 lib/tasks/javascript.rake                     |   2 +-
 .../discourse-local-dates-create-form.js      |   8 +-
 .../discourse-local-dates-create-form.hbs     |   2 +-
 .../controllers/poll-ui-builder.js            |   6 +
 .../templates/modal/poll-ui-builder.hbs       |   6 +-
 135 files changed, 930 insertions(+), 731 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index e3fc07b48d..b5095385b2 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,6 +3,7 @@ module.exports = {
   extends: "discourse:recommended",
 
   rules: {
+    "no-action-modifiers": true,
     "no-capital-arguments": false, // TODO: we extensively use `args` argument name
     "no-curly-component-invocation": {
       allow: [
diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
index 993a3ed675..892a3208e8 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
@@ -1,4 +1,6 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   tagName: "",
 
@@ -10,12 +12,14 @@ export default Component.extend({
     this.set("editing", false);
   },
 
-  actions: {
-    edit() {
-      this.set("buffer", this.value);
-      this.toggleProperty("editing");
-    },
+  @action
+  edit(event) {
+    event?.preventDefault();
+    this.set("buffer", this.value);
+    this.toggleProperty("editing");
+  },
 
+  actions: {
     save() {
       // Action has to toggle 'editing' property.
       this.action(this.buffer);
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index 014055c149..de8f063579 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -3,6 +3,7 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { isDocumentRTL } from "discourse/lib/text-direction";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 
 export default Component.extend({
@@ -91,15 +92,26 @@ export default Component.extend({
     return this.theme.getError(target, fieldName);
   },
 
+  @action
+  toggleShowAdvanced(event) {
+    event?.preventDefault();
+    this.toggleProperty("showAdvanced");
+  },
+
+  @action
+  toggleAddField(event) {
+    event?.preventDefault();
+    this.toggleProperty("addingField");
+  },
+
+  @action
+  toggleMaximize(event) {
+    event?.preventDefault();
+    this.toggleProperty("maximized");
+    next(() => this.appEvents.trigger("ace:resize"));
+  },
+
   actions: {
-    toggleShowAdvanced() {
-      this.toggleProperty("showAdvanced");
-    },
-
-    toggleAddField() {
-      this.toggleProperty("addingField");
-    },
-
     cancelAddField() {
       this.set("addingField", false);
     },
@@ -114,11 +126,6 @@ export default Component.extend({
       this.fieldAdded(this.currentTargetName, name);
     },
 
-    toggleMaximize() {
-      this.toggleProperty("maximized");
-      next(() => this.appEvents.trigger("ace:resize"));
-    },
-
     onlyOverriddenChanged(value) {
       this.onlyOverriddenChanged(value);
     },
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js
index 222e04b9ab..02a5240564 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js
@@ -1,6 +1,6 @@
 import AdminUser from "admin/models/admin-user";
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import copyText from "discourse/lib/copy-text";
@@ -21,6 +21,12 @@ export default Component.extend({
     return Math.max(visible, total);
   },
 
+  @action
+  hide(event) {
+    event?.preventDefault();
+    this.set("show", false);
+  },
+
   actions: {
     lookup() {
       this.set("show", true);
@@ -55,10 +61,6 @@ export default Component.extend({
       }
     },
 
-    hide() {
-      this.set("show", false);
-    },
-
     copy() {
       let text = `IP: ${this.ip}\n`;
       const location = this.location;
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js
index e2237e249b..29158c4496 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js
@@ -3,6 +3,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { escape } from "pretty-text/sanitizer";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { action } from "@ember/object";
 
 const MAX_COMPONENTS = 4;
 
@@ -59,9 +60,9 @@ export default Component.extend({
     return childrenCount - MAX_COMPONENTS;
   },
 
-  actions: {
-    toggleChildrenExpanded() {
-      this.toggleProperty("childrenExpanded");
-    },
+  @action
+  toggleChildrenExpanded(event) {
+    event?.preventDefault();
+    this.toggleProperty("childrenExpanded");
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
index 2b38081826..5b098387ef 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
@@ -133,6 +133,12 @@ export default class AdminBadgesShowController extends Controller.extend(
     this.buffered.set("image_url", null);
   }
 
+  @action
+  showPreview(badge, explain, event) {
+    event?.preventDefault();
+    this.send("preview", badge, explain);
+  }
+
   @action
   save() {
     if (!this.saving) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
index 1500549564..c7a8ec98a6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
@@ -2,8 +2,15 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
+  @action
+  handleShowIncomingEmail(id, event) {
+    event?.preventDefault();
+    this.send("showIncomingEmail", id);
+  },
+
   @observes("filter.{status,user,address,type}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
index 50d74d35d8..84f85eea6d 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
@@ -1,7 +1,7 @@
 import { empty, notEmpty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 
@@ -14,6 +14,12 @@ export default Controller.extend({
   showSendEmailForm: notEmpty("model.html_content"),
   htmlEmpty: empty("model.html_content"),
 
+  @action
+  toggleShowHtml(event) {
+    event?.preventDefault();
+    this.toggleProperty("showHtml");
+  },
+
   actions: {
     updateUsername(selected) {
       this.set("username", get(selected, "firstObject"));
@@ -39,10 +45,6 @@ export default Controller.extend({
       });
     },
 
-    toggleShowHtml() {
-      this.toggleProperty("showHtml");
-    },
-
     sendEmail() {
       this.set("sendingEmail", true);
       this.set("sentEmail", false);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
index 89c67f3cf9..6e4ce78656 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
@@ -3,6 +3,7 @@ import { INPUT_DELAY } from "discourse-common/config/environment";
 import IncomingEmail from "admin/models/incoming-email";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
@@ -10,6 +11,12 @@ export default AdminEmailLogsController.extend({
     discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
   },
 
+  @action
+  handleShowIncomingEmail(id, event) {
+    event?.preventDefault();
+    this.send("showIncomingEmail", id);
+  },
+
   actions: {
     loadMore() {
       this.loadLogs(IncomingEmail, true);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
index 0e8b43f9c1..bc11ec51f4 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
@@ -6,6 +6,7 @@ import discourseDebounce from "discourse-common/lib/debounce";
 import { exportEntity } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 import { outputExportResult } from "discourse/lib/export-result";
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
@@ -26,6 +27,15 @@ export default Controller.extend({
     discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
   },
 
+  @action
+  edit(record, event) {
+    event?.preventDefault();
+    if (!record.get("editing")) {
+      this.set("savedIpAddress", record.get("ip_address"));
+    }
+    record.set("editing", true);
+  },
+
   actions: {
     allow(record) {
       record.set("action_name", "do_nothing");
@@ -37,13 +47,6 @@ export default Controller.extend({
       record.save();
     },
 
-    edit(record) {
-      if (!record.get("editing")) {
-        this.set("savedIpAddress", record.get("ip_address"));
-      }
-      record.set("editing", true);
-    },
-
     cancel(record) {
       const savedIpAddress = this.savedIpAddress;
       if (savedIpAddress && record.get("editing")) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index 670d48c17b..a8a297d47c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -31,11 +31,13 @@ export default Controller.extend({
         this.set(
           "userHistoryActions",
           result.extras.user_history_actions
-            .map((action) => ({
-              id: action.id,
-              action_id: action.action_id,
-              name: I18n.t("admin.logs.staff_actions.actions." + action.id),
-              name_raw: action.id,
+            .map((historyAction) => ({
+              id: historyAction.id,
+              action_id: historyAction.action_id,
+              name: I18n.t(
+                "admin.logs.staff_actions.actions." + historyAction.id
+              ),
+              name_raw: historyAction.id,
             }))
             .sort((a, b) => a.name.localeCompare(b.name))
         );
@@ -75,61 +77,74 @@ export default Controller.extend({
     this.scheduleRefresh();
   },
 
-  actions: {
-    filterActionIdChanged(filterActionId) {
-      if (filterActionId) {
-        this.changeFilters({
-          action_name: filterActionId,
-          action_id: this.userHistoryActions.findBy("id", filterActionId)
-            .action_id,
-        });
-      }
-    },
-
-    clearFilter(key) {
-      if (key === "actionFilter") {
-        this.set("filterActionId", null);
-        this.changeFilters({
-          action_name: null,
-          action_id: null,
-          custom_type: null,
-        });
-      } else {
-        this.changeFilters({ [key]: null });
-      }
-    },
-
-    clearAllFilters() {
-      this.set("filterActionId", null);
-      this.resetFilters();
-    },
-
-    filterByAction(logItem) {
+  @action
+  filterActionIdChanged(filterActionId) {
+    if (filterActionId) {
       this.changeFilters({
-        action_name: logItem.get("action_name"),
-        action_id: logItem.get("action"),
-        custom_type: logItem.get("custom_type"),
+        action_name: filterActionId,
+        action_id: this.userHistoryActions.findBy("id", filterActionId)
+          .action_id,
       });
-    },
+    }
+  },
 
-    filterByStaffUser(acting_user) {
-      this.changeFilters({ acting_user: acting_user.username });
-    },
+  @action
+  clearFilter(key, event) {
+    event?.preventDefault();
+    if (key === "actionFilter") {
+      this.set("filterActionId", null);
+      this.changeFilters({
+        action_name: null,
+        action_id: null,
+        custom_type: null,
+      });
+    } else {
+      this.changeFilters({ [key]: null });
+    }
+  },
 
-    filterByTargetUser(target_user) {
-      this.changeFilters({ target_user: target_user.username });
-    },
+  @action
+  clearAllFilters(event) {
+    event?.preventDefault();
+    this.set("filterActionId", null);
+    this.resetFilters();
+  },
 
-    filterBySubject(subject) {
-      this.changeFilters({ subject });
-    },
+  @action
+  filterByAction(logItem, event) {
+    event?.preventDefault();
+    this.changeFilters({
+      action_name: logItem.get("action_name"),
+      action_id: logItem.get("action"),
+      custom_type: logItem.get("custom_type"),
+    });
+  },
 
-    exportStaffActionLogs() {
-      exportEntity("staff_action").then(outputExportResult);
-    },
+  @action
+  filterByStaffUser(acting_user, event) {
+    event?.preventDefault();
+    this.changeFilters({ acting_user: acting_user.username });
+  },
 
-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  filterByTargetUser(target_user, event) {
+    event?.preventDefault();
+    this.changeFilters({ target_user: target_user.username });
+  },
+
+  @action
+  filterBySubject(subject, event) {
+    event?.preventDefault();
+    this.changeFilters({ subject });
+  },
+
+  @action
+  exportStaffActionLogs() {
+    exportEntity("staff_action").then(outputExportResult);
+  },
+
+  @action
+  loadMore() {
+    this.model.loadMore();
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
index 71990f47a3..84b7650ff1 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
@@ -1,5 +1,6 @@
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -43,6 +44,23 @@ export default Controller.extend({
     }
   },
 
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const webHookId = this.get("model.extras.web_hook_id");
+
+    ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
+      type: "GET",
+      data: { ids: this.incomingEventIds },
+    }).then((data) => {
+      const objects = data.map((webHookEvent) =>
+        this.store.createRecord("web-hook-event", webHookEvent)
+      );
+      this.model.unshiftObjects(objects);
+      this.set("incomingEventIds", []);
+    });
+  },
+
   actions: {
     loadMore() {
       this.model.loadMore();
@@ -61,20 +79,5 @@ export default Controller.extend({
         popupAjaxError(error);
       });
     },
-
-    showInserted() {
-      const webHookId = this.get("model.extras.web_hook_id");
-
-      ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
-        type: "GET",
-        data: { ids: this.incomingEventIds },
-      }).then((data) => {
-        const objects = data.map((event) =>
-          this.store.createRecord("web-hook-event", event)
-        );
-        this.model.unshiftObjects(objects);
-        this.set("incomingEventIds", []);
-      });
-    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
index 7ab4cb6984..8a60037a5b 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
@@ -1,5 +1,6 @@
 import { observes, on } from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
@@ -10,15 +11,17 @@ export default Controller.extend(ModalFunctionality, {
     this.set("images", value && value.length ? value.split("|") : []);
   },
 
+  @action
+  remove(url, event) {
+    event?.preventDefault();
+    this.images.removeObject(url);
+  },
+
   actions: {
     uploadDone({ url }) {
       this.images.addObject(url);
     },
 
-    remove(url) {
-      this.images.removeObject(url);
-    },
-
     close() {
       this.save(this.images.join("|"));
       this.send("closeModal");
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index 31b16af4cc..82492beecb 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -88,9 +88,9 @@
       </div>
 
       {{#if this.hasQuery}}
-        <a href {{action "preview" this.buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
+        <a href {{on "click" (fn this.showPreview this.buffered "false")}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{action "preview" this.buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
+        <a href {{on "click" (fn this.showPreview this.buffered "true")}}>{{i18n "admin.badges.preview.plan_text"}}</a>
         {{#if this.preview_loading}}
           {{i18n "loading"}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
index d62cfdbd78..998174f20a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
@@ -3,7 +3,7 @@
   {{#if this.editing}}
     <TextField @value={{this.buffer}} @autofocus="autofocus" @autocomplete="off" />
   {{else}}
-    <a href {{action "edit"}} class="inline-editable-field">
+    <a href {{on "click" this.edit}} class="inline-editable-field">
       <span>{{this.value}}</span>
     </a>
   {{/if}}
@@ -11,7 +11,7 @@
 <div class="controls">
   {{#if this.editing}}
     <DButton @class="btn-default" @action={{action "save"}} @label="admin.user_fields.save" />
-    <a href {{action "edit"}}>{{i18n "cancel"}}</a>
+    <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
   {{else}}
     <DButton @class="btn-default" @action={{action "edit"}} @icon="pencil-alt" />
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
index ec8ed70f30..a8c33e1da2 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
@@ -13,7 +13,7 @@
 
       {{#if this.allowAdvanced}}
         <li>
-          <a {{action "toggleShowAdvanced"}}
+          <a {{on "click" this.toggleShowAdvanced}}
             href
             title={{i18n (concat "admin.customize.theme." (if this.showAdvanced "hide_advanced" "show_advanced"))}}
             class="no-text">
@@ -52,7 +52,7 @@
             <DButton @class="ok" @action={{action "addField" this.newFieldName}} @icon="check" />
             <DButton @class="cancel" @action={{action "cancelAddField"}} @icon="times" />
           {{else}}
-            <a href {{action "toggleAddField" this.currentTargetName}} class="no-text">
+            <a href {{on "click" this.toggleAddField}} class="no-text">
               {{d-icon "plus"}}
             </a>
           {{/if}}
@@ -61,7 +61,7 @@
 
       <li class="spacer"></li>
       <li>
-        <a href {{action "toggleMaximize"}} class="no-text">
+        <a href {{on "click" this.toggleMaximize}} class="no-text">
           {{d-icon this.maximizeIcon}}
         </a>
       </li>
diff --git a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
index f63ab16730..31ec7f35a7 100644
--- a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 {{#if this.show}}
   <div class="location-box">
-    <a href class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
+    <a href class="close pull-right" {{on "click" this.hide}}>{{d-icon "times"}}</a>
     {{#if this.copied}}
       <DButton @class="btn-hover pull-right" @icon="copy" @label="ip_lookup.copied" />
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
index 1710a14454..21678c1a43 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
@@ -31,7 +31,7 @@
       <span class="components">{{html-safe this.childrenString}}</span>
 
       {{#if this.displayHasMore}}
-        <a href {{action "toggleChildrenExpanded"}} class="others-count">
+        <a href {{on "click" this.toggleChildrenExpanded}} class="others-count">
           {{#if this.childrenExpanded}}
             {{i18n "admin.customize.theme.collapse"}}
           {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
index cf6ceb81bc..6a47751d00 100644
--- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
@@ -30,7 +30,7 @@
           <td class="email-address"><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           <td>
             {{#if l.has_bounce_key}}
-              <a href {{action "showIncomingEmail" l.id}}>
+              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}}>
                 {{l.email_type}}
               </a>
             {{else}}
@@ -39,7 +39,7 @@
           </td>
           <td class="email-details">
             {{#if l.has_bounce_key}}
-              <a href {{action "showIncomingEmail" l.id}} title={{i18n "admin.email.details_title"}}>
+              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}} title={{i18n "admin.email.details_title"}}>
                 {{d-icon "info-circle"}}
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index d2ee4cad4d..b00332840d 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -15,11 +15,11 @@
         {{#if this.showHtml}}
           <span>{{i18n "admin.email.html"}}</span>
           |
-          <a href {{action "toggleShowHtml"}}>
+          <a href {{on "click" this.toggleShowHtml}}>
             {{i18n "admin.email.text"}}
           </a>
         {{else}}
-          <a href {{action "toggleShowHtml"}}>{{i18n "admin.email.html"}}</a> |
+          <a href {{on "click" this.toggleShowHtml}}>{{i18n "admin.email.html"}}</a> |
           <span>{{i18n "admin.email.text"}}</span>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
index 21dcbba21d..19033f5f6f 100644
--- a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
@@ -48,10 +48,10 @@
           </td>
           <td>{{email.subject}}</td>
           <td class="error">
-            <a href {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
+            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}}>{{email.error}}</a>
           </td>
           <td class="email-details">
-            <a href {{action "showIncomingEmail" email.id}} title={{i18n "admin.email.details_title"}}>
+            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}} title={{i18n "admin.email.details_title"}}>
               {{d-icon "info-circle"}}
             </a>
           </td>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index 63489dcdee..ab20b2316b 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -27,7 +27,7 @@
               {{#if item.editing}}
                 <TextField @value={{item.ip_address}} @autofocus="autofocus" />
               {{else}}
-                <a href {{action "edit" item}} class="inline-editable-field">
+                <a href {{on "click" (fn this.edit item)}} class="inline-editable-field">
                   {{#if item.isRange}}
                     <strong>{{item.ip_address}}</strong>
                   {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index bcee25b439..d2e46867c9 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -1,29 +1,29 @@
 <div class="staff-action-logs-controls">
   {{#if this.filtersExists}}
     <div class="staff-action-logs-filters">
-      <a href {{action "clearAllFilters"}} class="clear-filters filter btn">
+      <a href {{on "click" this.clearAllFilters}} class="clear-filters filter btn">
         <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
       {{#if this.actionFilter}}
-        <a href {{action "clearFilter" "actionFilter"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "actionFilter")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.action"}}</span>: {{this.actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.acting_user}}
-        <a href {{action "clearFilter" "acting_user"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "acting_user")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{this.filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.target_user}}
-        <a href {{action "clearFilter" "target_user"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "target_user")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{this.filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.subject}}
-        <a href {{action "clearFilter" "subject"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "subject")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{this.filters.subject}}
           {{d-icon "times-circle"}}
         </a>
@@ -71,16 +71,16 @@
                 </div>
               </td>
               <td class="col value action">
-                <a href {{action "filterByAction" item}}>{{item.actionName}}</a>
+                <a href {{on "click" (fn this.filterByAction item)}}>{{item.actionName}}</a>
               </td>
               <td class="col value subject">
                 <div class="subject">
                   {{#if item.target_user}}
                     <LinkTo @route="adminUser" @model={{item.target_user}}>{{avatar item.target_user imageSize="tiny"}}</LinkTo>
-                    <a href {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
+                    <a href {{on "click" (fn this.filterByTargetUser item.target_user)}}>{{item.target_user.username}}</a>
                   {{/if}}
                   {{#if item.subject}}
-                    <a href {{action "filterBySubject" item.subject}} title={{item.subject}}>{{item.subject}}</a>
+                    <a href {{on "click" (fn this.filterBySubject item.subject)}} title={{item.subject}}>{{item.subject}}</a>
                   {{/if}}
                 </div>
               </td>
@@ -89,10 +89,10 @@
                 <div>
                   {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
-                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{on "click" (fn this.showCustomDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
-                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{on "click" (fn this.showDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
               </td>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
index a7aefa7371..aca6fef6f4 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
@@ -1,7 +1,7 @@
 <DModalBody @class="uploaded-image-list">
   <div class="selectable-avatars">
     {{#each this.images as |image|}}
-      <a href class="selectable-avatar" {{action "remove" image}}>
+      <a href class="selectable-avatar" {{on "click" (fn this.remove image)}}>
         {{bound-avatar-template image "huge"}}
       </a>
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
index 2b5c768def..c9791f0fc4 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
@@ -21,7 +21,7 @@
           <div class="clearfix"></div>
         </div>
         {{#if this.hasIncoming}}
-          <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
+          <a href tabindex="0" {{on "click" this.showInserted}} class="alert alert-info clickable">
             <CountI18n @key="admin.web_hooks.events.incoming" @count={{this.incomingCount}} />
           </a>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js
index 002ddf82e3..d480f46455 100644
--- a/app/assets/javascripts/discourse/app/components/categories-only.js
+++ b/app/assets/javascripts/discourse/app/components/categories-only.js
@@ -50,7 +50,8 @@ export default Component.extend({
   },
 
   @action
-  toggleShowMuted() {
+  toggleShowMuted(event) {
+    event?.preventDefault();
     this.toggleProperty("showMuted");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.js b/app/assets/javascripts/discourse/app/components/category-permission-row.js
index 2e41aa6e63..46eb3690f9 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.js
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, equal } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
@@ -92,11 +93,13 @@ export default Component.extend({
     this.category.updatePermission(this.group_name, type);
   },
 
-  actions: {
-    removeRow() {
-      this.category.removePermission(this.group_name);
-    },
+  @action
+  removeRow(event) {
+    event?.preventDefault();
+    this.category.removePermission(this.group_name);
+  },
 
+  actions: {
     setPermissionReply() {
       if (this.type <= PermissionType.CREATE_POST) {
         this.updatePermission(PermissionType.READONLY);
diff --git a/app/assets/javascripts/discourse/app/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
index 09d9a9123c..15f0424f60 100644
--- a/app/assets/javascripts/discourse/app/components/choose-message.js
+++ b/app/assets/javascripts/discourse/app/components/choose-message.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
@@ -63,12 +63,11 @@ export default Component.extend({
     );
   },
 
-  actions: {
-    chooseMessage(message) {
-      const messageId = get(message, "id");
-      this.set("selectedTopicId", messageId);
-      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
-      return false;
-    },
+  @action
+  chooseMessage(message, event) {
+    event?.preventDefault();
+    const messageId = get(message, "id");
+    this.set("selectedTopicId", messageId);
+    next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index 40832b5df1..275d1c534c 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,5 +1,5 @@
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import LinkLookup from "discourse/lib/link-lookup";
 import { not } from "@ember/object/computed";
@@ -54,11 +54,13 @@ export default Component.extend({
     this.set("messageCount", messages.get("length"));
   },
 
-  actions: {
-    closeMessage(message) {
-      this._removeMessage(message);
-    },
+  @action
+  closeMessage(message, event) {
+    event?.preventDefault();
+    this._removeMessage(message);
+  },
 
+  actions: {
     hideMessage(message) {
       this._removeMessage(message);
       // kind of hacky but the visibility depends on this
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
index e96720db36..5619e8c753 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -2,6 +2,7 @@ import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 import { empty } from "@ember/object/computed";
 import getURL from "discourse-common/lib/get-url";
 import { propertyEqual } from "discourse/lib/computed";
@@ -49,13 +50,12 @@ export default Component.extend({
     return getURL(`/c/${slugPart}/edit/${this.tab}`);
   },
 
-  actions: {
-    select() {
-      this.set("selectedTab", this.tab);
-
-      if (!this.newCategory) {
-        DiscourseURL.routeTo(this.fullSlug);
-      }
-    },
+  @action
+  select(event) {
+    event?.preventDefault();
+    this.set("selectedTab", this.tab);
+    if (!this.newCategory) {
+      DiscourseURL.routeTo(this.fullSlug);
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index 3e0646f893..8a5dec83a6 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -240,7 +240,8 @@ export default Component.extend({
   },
 
   @action
-  onCategorySelection(sectionName) {
+  onCategorySelection(sectionName, event) {
+    event?.preventDefault();
     const section = document.querySelector(
       `.emoji-picker-emoji-area .section[data-section="${sectionName}"]`
     );
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index cb073a6733..8c7e5d93c5 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, gt } from "@ember/object/computed";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -70,11 +71,22 @@ export default Component.extend(CardContentsBase, CleansUp, {
     this._close();
   },
 
-  actions: {
-    close() {
-      this._close();
-    },
+  @action
+  close(event) {
+    event?.preventDefault();
+    this._close();
+  },
 
+  @action
+  handleShowGroup(group, event) {
+    event?.preventDefault();
+    // Invokes `showGroup` argument. Convert to `this.args.showGroup` when
+    // refactoring this to a glimmer component.
+    this.showGroup(group);
+    this._close();
+  },
+
+  actions: {
     cancelFilter() {
       const postStream = this.postStream;
       postStream.cancelFilter();
@@ -90,8 +102,7 @@ export default Component.extend(CardContentsBase, CleansUp, {
     },
 
     showGroup(group) {
-      this.showGroup(group);
-      this._close();
+      this.handleShowGroup(group);
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
index 190a9fb2f9..a437f42d44 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
@@ -53,7 +53,8 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider) {
+  prefillSettings(provider, event) {
+    event?.preventDefault();
     this.form.setProperties(emailProviderDefaultSettings(provider, "imap"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/group-member.js b/app/assets/javascripts/discourse/app/components/group-member.js
index 64b2570dee..08d1097b42 100644
--- a/app/assets/javascripts/discourse/app/components/group-member.js
+++ b/app/assets/javascripts/discourse/app/components/group-member.js
@@ -1,10 +1,12 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   classNames: ["item"],
 
-  actions: {
-    remove() {
-      this.removeAction(this.member);
-    },
+  @action
+  remove(event) {
+    event?.preventDefault();
+    this.removeAction(this.member);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
index 5456c75a79..d4b4bcb9de 100644
--- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
@@ -43,7 +43,8 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider) {
+  prefillSettings(provider, event) {
+    event?.preventDefault();
     this.form.setProperties(emailProviderDefaultSettings(provider, "smtp"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js
index bdbb2cc85a..f0ea3e6138 100644
--- a/app/assets/javascripts/discourse/app/components/mobile-nav.js
+++ b/app/assets/javascripts/discourse/app/components/mobile-nav.js
@@ -1,5 +1,6 @@
 import { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import deprecated from "discourse-common/lib/deprecated";
@@ -56,27 +57,27 @@ export default Component.extend({
     this.router.off("routeDidChange", this, this.currentRouteChanged);
   },
 
-  actions: {
-    toggleExpanded() {
-      this.toggleProperty("expanded");
+  @action
+  toggleExpanded(event) {
+    event?.preventDefault();
+    this.toggleProperty("expanded");
 
-      next(() => {
-        if (this.expanded) {
-          $(window)
-            .off("click.mobile-nav")
-            .on("click.mobile-nav", (e) => {
-              if (!this.element || this.isDestroying || this.isDestroyed) {
-                return;
-              }
+    next(() => {
+      if (this.expanded) {
+        $(window)
+          .off("click.mobile-nav")
+          .on("click.mobile-nav", (e) => {
+            if (!this.element || this.isDestroying || this.isDestroyed) {
+              return;
+            }
 
-              const expander = this.element.querySelector(".expander");
-              if (expander && e.target !== expander) {
-                this.set("expanded", false);
-                $(window).off("click.mobile-nav");
-              }
-            });
-        }
-      });
-    },
+            const expander = this.element.querySelector(".expander");
+            if (expander && e.target !== expander) {
+              this.set("expanded", false);
+              $(window).off("click.mobile-nav");
+            }
+          });
+      }
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index ab9a5b9c71..5ede7b2bf4 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -1,5 +1,6 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import DiscourseURL from "discourse/lib/url";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import { next } from "@ember/runloop";
@@ -61,33 +62,33 @@ export default Component.extend(FilterModeMixin, {
     DiscourseURL.appEvents.off("dom:clean", this, this.ensureDropClosed);
   },
 
-  actions: {
-    toggleDrop() {
-      this.set("expanded", !this.expanded);
+  @action
+  toggleDrop(event) {
+    event?.preventDefault();
+    this.set("expanded", !this.expanded);
 
-      if (this.expanded) {
-        DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
+    if (this.expanded) {
+      DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        next(() => {
-          if (!this.expanded) {
-            return;
-          }
+      next(() => {
+        if (!this.expanded) {
+          return;
+        }
 
-          $(this.element.querySelector(".drop a")).on("click", () => {
-            this.element.querySelector(".drop").style.display = "none";
+        $(this.element.querySelector(".drop a")).on("click", () => {
+          this.element.querySelector(".drop").style.display = "none";
 
-            next(() => {
-              this.ensureDropClosed();
-            });
-            return true;
-          });
-
-          $(window).on("click.navigation-bar", () => {
+          next(() => {
             this.ensureDropClosed();
-            return true;
           });
+          return true;
         });
-      }
-    },
+
+        $(window).on("click.navigation-bar", () => {
+          this.ensureDropClosed();
+          return true;
+        });
+      });
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index ff67e672a8..73c90d665a 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -7,7 +7,7 @@ import { classify, dasherize } from "@ember/string";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { set } from "@ember/object";
+import { action, set } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 let _components = {};
@@ -121,7 +121,7 @@ export default Component.extend({
   },
 
   @bind
-  _performConfirmed(action) {
+  _performConfirmed(performableAction) {
     let reviewable = this.reviewable;
 
     let performAction = () => {
@@ -140,7 +140,7 @@ export default Component.extend({
       });
 
       return ajax(
-        `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
+        `/review/${reviewable.id}/perform/${performableAction.id}?version=${version}`,
         {
           type: "PUT",
           data,
@@ -173,13 +173,16 @@ export default Component.extend({
         .finally(() => this.set("updating", false));
     };
 
-    if (action.client_action) {
-      let actionMethod = this[`client${classify(action.client_action)}`];
+    if (performableAction.client_action) {
+      let actionMethod =
+        this[`client${classify(performableAction.client_action)}`];
       if (actionMethod) {
         return actionMethod.call(this, reviewable, performAction);
       } else {
         // eslint-disable-next-line no-console
-        console.error(`No handler for ${action.client_action} found`);
+        console.error(
+          `No handler for ${performableAction.client_action} found`
+        );
         return;
       }
     } else {
@@ -209,14 +212,16 @@ export default Component.extend({
     }
   },
 
-  actions: {
-    explainReviewable(reviewable) {
-      showModal("explain-reviewable", {
-        title: "review.explain.title",
-        model: reviewable,
-      });
-    },
+  @action
+  explainReviewable(reviewable, event) {
+    event?.preventDefault();
+    showModal("explain-reviewable", {
+      title: "review.explain.title",
+      model: reviewable,
+    });
+  },
 
+  actions: {
     edit() {
       this.set("editing", true);
       this.set("_updates", { payload: {} });
@@ -259,18 +264,18 @@ export default Component.extend({
       set(this._updates, fieldId, event.target.value);
     },
 
-    perform(action) {
+    perform(performableAction) {
       if (this.updating) {
         return;
       }
 
-      let msg = action.get("confirm_message");
-      let requireRejectReason = action.get("require_reject_reason");
-      let customModal = action.get("custom_modal");
+      let msg = performableAction.get("confirm_message");
+      let requireRejectReason = performableAction.get("require_reject_reason");
+      let customModal = performableAction.get("custom_modal");
       if (msg) {
         bootbox.confirm(msg, (answer) => {
           if (answer) {
-            return this._performConfirmed(action);
+            return this._performConfirmed(performableAction);
           }
         });
       } else if (requireRejectReason) {
@@ -279,7 +284,7 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action,
+          action: performableAction,
         });
       } else if (customModal) {
         showModal(customModal, {
@@ -287,10 +292,10 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action,
+          action: performableAction,
         });
       } else {
-        return this._performConfirmed(action);
+        return this._performConfirmed(performableAction);
       }
     },
   },
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
index 84c27f152f..75b8692a49 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import { longDate } from "discourse/lib/formatter";
@@ -18,18 +19,18 @@ export default Component.extend({
     return longDate(updatedAt);
   },
 
-  actions: {
-    showEditHistory() {
-      let postId = this.get("reviewable.post_id");
-      this.store.find("post", postId).then((post) => {
-        let historyController = showModal("history", {
-          model: post,
-          modalClass: "history-modal",
-        });
-        historyController.refresh(postId, "latest");
-        historyController.set("post", post);
-        historyController.set("topicController", null);
+  @action
+  showEditHistory(event) {
+    event?.preventDefault();
+    let postId = this.get("reviewable.post_id");
+    this.store.find("post", postId).then((post) => {
+      let historyController = showModal("history", {
+        model: post,
+        modalClass: "history-modal",
       });
-    },
+      historyController.refresh(postId, "latest");
+      historyController.set("post", post);
+      historyController.set("topicController", null);
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
index e40ab39ef7..d06ddf3c1c 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
@@ -1,10 +1,11 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
-  actions: {
-    showRawEmail() {
-      showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
-    },
+  @action
+  showRawEmail(event) {
+    event?.preventDefault();
+    showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.js b/app/assets/javascripts/discourse/app/components/search-result-entry.js
index 9312174ed1..deeaee7825 100644
--- a/app/assets/javascripts/discourse/app/components/search-result-entry.js
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.js
@@ -11,6 +11,7 @@ export default Component.extend({
 
   @action
   logClick(topicId) {
+    // Important: Don't prevent default handling of clicks
     if (this.searchLogId && topicId) {
       logSearchLinkClick({
         searchLogId: this.searchLogId,
diff --git a/app/assets/javascripts/discourse/app/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js
index 3f0c40b381..e208a5f314 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-form.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-form.js
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -48,15 +49,15 @@ export default Component.extend({
     );
   },
 
-  actions: {
-    toggleSecondFactorMethod() {
-      const secondFactorMethod = this.secondFactorMethod;
-      this.set("secondFactorToken", "");
-      if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
-        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
-      } else {
-        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
-      }
-    },
+  @action
+  toggleSecondFactorMethod(event) {
+    event?.preventDefault();
+    const secondFactorMethod = this.secondFactorMethod;
+    this.set("secondFactorToken", "");
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
+      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
+    } else {
+      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/security-key-form.js b/app/assets/javascripts/discourse/app/components/security-key-form.js
index bd6d03f9f4..dcc0725113 100644
--- a/app/assets/javascripts/discourse/app/components/security-key-form.js
+++ b/app/assets/javascripts/discourse/app/components/security-key-form.js
@@ -1,12 +1,13 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
 export default Component.extend({
-  actions: {
-    useAnotherMethod() {
-      this.set("showSecurityKey", false);
-      this.set("showSecondFactor", true);
-      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
-    },
+  @action
+  useAnotherMethod(event) {
+    event?.preventDefault();
+    this.set("showSecurityKey", false);
+    this.set("showSecondFactor", true);
+    this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js
index 5ea99dffe9..a4d80fd611 100644
--- a/app/assets/javascripts/discourse/app/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/app/components/signup-cta.js
@@ -1,15 +1,19 @@
 import Component from "@ember/component";
 import discourseLater from "discourse-common/lib/later";
+import { action } from "@ember/object";
 import { on } from "@ember/object/evented";
 
 export default Component.extend({
   action: "showCreateAccount",
 
+  @action
+  neverShow(event) {
+    event?.preventDefault();
+    this.keyValueStore.setItem("anon-cta-never", "t");
+    this.session.set("showSignupCta", false);
+  },
+
   actions: {
-    neverShow() {
-      this.keyValueStore.setItem("anon-cta-never", "t");
-      this.session.set("showSignupCta", false);
-    },
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", Date.now());
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 6cb2a35dba..21da9a92f1 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -7,6 +7,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
 
 export default Component.extend({
   dialog: service(),
@@ -76,19 +77,49 @@ export default Component.extend({
       .catch(popupAjaxError);
   },
 
+  @action
+  edit(event) {
+    event?.preventDefault();
+    this.setProperties({
+      editing: true,
+      newTagName: this.tag.id,
+      newTagDescription: this.tagInfo.description,
+    });
+  },
+
+  @action
+  unlinkSynonym(tag, event) {
+    event?.preventDefault();
+    ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
+      type: "DELETE",
+    })
+      .then(() => this.tagInfo.synonyms.removeObject(tag))
+      .catch(popupAjaxError);
+  },
+
+  @action
+  deleteSynonym(tag, event) {
+    event?.preventDefault();
+    bootbox.confirm(
+      I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
+      (result) => {
+        if (!result) {
+          return;
+        }
+
+        tag
+          .destroyRecord()
+          .then(() => this.tagInfo.synonyms.removeObject(tag))
+          .catch(popupAjaxError);
+      }
+    );
+  },
+
   actions: {
     toggleEditControls() {
       this.toggleProperty("showEditControls");
     },
 
-    edit() {
-      this.setProperties({
-        editing: true,
-        newTagName: this.tag.id,
-        newTagDescription: this.tagInfo.description,
-      });
-    },
-
     cancelEditing() {
       this.set("editing", false);
     },
@@ -114,30 +145,6 @@ export default Component.extend({
       this.deleteAction(this.tagInfo);
     },
 
-    unlinkSynonym(tag) {
-      ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
-        type: "DELETE",
-      })
-        .then(() => this.tagInfo.synonyms.removeObject(tag))
-        .catch(popupAjaxError);
-    },
-
-    deleteSynonym(tag) {
-      bootbox.confirm(
-        I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
-        (result) => {
-          if (!result) {
-            return;
-          }
-
-          tag
-            .destroyRecord()
-            .then(() => this.tagInfo.synonyms.removeObject(tag))
-            .catch(popupAjaxError);
-        }
-      );
-    },
-
     addSynonyms() {
       bootbox.confirm(
         I18n.t("tagging.add_synonyms_explanation", {
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 972e824173..2d6ce3e18f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -251,6 +251,7 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
+      e.preventDefault();
       return this.navigateToTopic(topic, e.target.getAttribute("href"));
     }
 
@@ -264,6 +265,7 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
+      e.preventDefault();
       return this.navigateToTopic(topic, topic.lastUnreadUrl);
     }
 
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 930f77a8c1..f114a1abf5 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,4 +1,4 @@
-import EmberObject, { set } from "@ember/object";
+import EmberObject, { action, set } from "@ember/object";
 import { alias, and, gt, gte, not, or } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -220,6 +220,15 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     this._close();
   },
 
+  @action
+  handleShowUser(user, event) {
+    event?.preventDefault();
+    // Invokes `showUser` argument. Convert to `this.args.showUser` when
+    // refactoring this to a glimmer component.
+    this.showUser(user);
+    this._close();
+  },
+
   actions: {
     close() {
       this._close();
@@ -247,9 +256,8 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
       this._close();
     },
 
-    showUser(username) {
-      this.showUser(username);
-      this._close();
+    showUser(user) {
+      this.handleShowUser(user);
     },
 
     checkEmail(user) {
diff --git a/app/assets/javascripts/discourse/app/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
index 2d8c91157a..52ddce5f4d 100644
--- a/app/assets/javascripts/discourse/app/controllers/auth-token.js
+++ b/app/assets/javascripts/discourse/app/controllers/auth-token.js
@@ -1,6 +1,7 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { userPath } from "discourse/lib/url";
 
@@ -17,11 +18,13 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
-  actions: {
-    toggleExpanded() {
-      this.set("expanded", !this.expanded);
-    },
+  @action
+  toggleExpanded(event) {
+    event?.preventDefault();
+    this.set("expanded", !this.expanded);
+  },
 
+  actions: {
     highlightSecure() {
       this.send("closeModal");
 
diff --git a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
index 8373b7a106..d63f464c2a 100644
--- a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
@@ -132,6 +133,15 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @action
+  selectAvatar(url, event) {
+    event?.preventDefault();
+    this.user
+      .selectAvatar(url)
+      .then(() => window.location.reload())
+      .catch(popupAjaxError);
+  },
+
   actions: {
     uploadComplete() {
       this.set("selected", "custom");
@@ -159,13 +169,6 @@ export default Controller.extend(ModalFunctionality, {
         .finally(() => this.set("gravatarRefreshDisabled", false));
     },
 
-    selectAvatar(url) {
-      this.user
-        .selectAvatar(url)
-        .then(() => window.location.reload())
-        .catch(popupAjaxError);
-    },
-
     saveAvatarSelection() {
       const selectedUploadId = this.selectedUploadId;
       const type = this.selected;
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 3463f6f1d7..61a986d64f 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -508,11 +508,32 @@ export default Controller.extend({
     this.set("model.showFullScreenExitPrompt", false);
   },
 
-  actions: {
-    togglePreview() {
-      this.toggleProperty("showPreview");
-    },
+  @action
+  async cancel(event) {
+    event?.preventDefault();
+    await this.cancelComposer();
+  },
 
+  @action
+  cancelUpload(event) {
+    event?.preventDefault();
+    this.set("model.uploadCancelled", true);
+  },
+
+  @action
+  togglePreview(event) {
+    event?.preventDefault();
+    this.toggleProperty("showPreview");
+  },
+
+  @action
+  viewNewReply(event) {
+    event?.preventDefault();
+    DiscourseURL.routeTo(this.get("model.createdPost.url"));
+    this.close();
+  },
+
+  actions: {
     closeComposer() {
       this.close();
     },
@@ -543,10 +564,6 @@ export default Controller.extend({
       });
     },
 
-    cancelUpload() {
-      this.set("model.uploadCancelled", true);
-    },
-
     onPopupMenuAction(menuAction) {
       this.send(menuAction);
     },
@@ -707,10 +724,6 @@ export default Controller.extend({
       this.set("model.loading", false);
     },
 
-    async cancel() {
-      await this.cancelComposer();
-    },
-
     save(ignore, event) {
       this.save(false, {
         jump:
@@ -1275,12 +1288,6 @@ export default Controller.extend({
     }
   },
 
-  viewNewReply() {
-    DiscourseURL.routeTo(this.get("model.createdPost.url"));
-    this.close();
-    return false;
-  },
-
   async destroyDraft(draftSequence = null) {
     const key = this.get("model.draftKey");
     if (!key) {
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
index c46f41c1c8..1e07f67cb9 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
@@ -1,5 +1,6 @@
 import DiscoveryController from "discourse/controllers/discovery";
 import { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
 import { dasherize } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
@@ -50,17 +51,19 @@ export default DiscoveryController.extend({
         : style;
     return dasherize(componentName);
   },
+
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const tracker = this.topicTrackingState;
+    // Move inserted into topics
+    this.model.loadBefore(tracker.get("newIncoming"), true);
+    tracker.resetTracking();
+  },
+
   actions: {
     refresh() {
       this.send("triggerRefresh");
     },
-    showInserted() {
-      const tracker = this.topicTrackingState;
-
-      // Move inserted into topics
-      this.model.loadBefore(tracker.get("newIncoming"), true);
-      tracker.resetTracking();
-      return false;
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index a0037f4da5..3e90fd42a8 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -63,6 +63,17 @@ const controllerOpts = {
     return this._isFilterPage(filter, "new") && topicsLength > 0;
   },
 
+  // Show newly inserted topics
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const tracker = this.topicTrackingState;
+
+    // Move inserted into topics
+    this.model.loadBefore(tracker.get("newIncoming"), true);
+    tracker.resetTracking();
+  },
+
   actions: {
     changeSort() {
       deprecated(
@@ -72,16 +83,6 @@ const controllerOpts = {
       return routeAction("changeSort", this.router._router, ...arguments)();
     },
 
-    // Show newly inserted topics
-    showInserted() {
-      const tracker = this.topicTrackingState;
-
-      // Move inserted into topics
-      this.model.loadBefore(tracker.get("newIncoming"), true);
-      tracker.resetTracking();
-      return false;
-    },
-
     refresh(options = { skipResettingParams: [] }) {
       const filter = this.get("model.filter");
       this.send("resetParams", options.skipResettingParams);
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index e082ca9d29..a7cf017c6a 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -14,6 +14,7 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { escapeExpression } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
+import { action } from "@ember/object";
 import { gt, or } from "@ember/object/computed";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTransient } from "discourse/lib/page-tracker";
@@ -391,22 +392,24 @@ export default Controller.extend({
     }
   },
 
-  actions: {
-    createTopic(searchTerm) {
-      let topicCategory;
-      if (searchTerm.includes("category:")) {
-        const match = searchTerm.match(/category:(\S*)/);
-        if (match && match[1]) {
-          topicCategory = match[1];
-        }
+  @action
+  createTopic(searchTerm, event) {
+    event?.preventDefault();
+    let topicCategory;
+    if (searchTerm.includes("category:")) {
+      const match = searchTerm.match(/category:(\S*)/);
+      if (match && match[1]) {
+        topicCategory = match[1];
       }
-      this.composer.open({
-        action: Composer.CREATE_TOPIC,
-        draftKey: Composer.NEW_TOPIC_KEY,
-        topicCategory,
-      });
-    },
+    }
+    this.composer.open({
+      action: Composer.CREATE_TOPIC,
+      draftKey: Composer.NEW_TOPIC_KEY,
+      topicCategory,
+    });
+  },
 
+  actions: {
     selectAll() {
       this.selected.addObjects(this.get("model.posts").mapBy("topic"));
 
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 2540c78b54..00e64f86da 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, equal, gt, not, or } from "@ember/object/computed";
 import discourseComputed, {
   observes,
@@ -313,6 +314,24 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  @action
+  displayInline(event) {
+    event?.preventDefault();
+    this.set("viewMode", "inline");
+  },
+
+  @action
+  displaySideBySide(event) {
+    event?.preventDefault();
+    this.set("viewMode", "side_by_side");
+  },
+
+  @action
+  displaySideBySideMarkdown(event) {
+    event?.preventDefault();
+    this.set("viewMode", "side_by_side_markdown");
+  },
+
   actions: {
     loadFirstVersion() {
       this.refresh(this.get("model.post_id"), this.get("model.first_revision"));
@@ -345,15 +364,5 @@ export default Controller.extend(ModalFunctionality, {
     revertToVersion() {
       this.revert(this.post, this.get("model.current_revision"));
     },
-
-    displayInline() {
-      this.set("viewMode", "inline");
-    },
-    displaySideBySide() {
-      this.set("viewMode", "side_by_side");
-    },
-    displaySideBySideMarkdown() {
-      this.set("viewMode", "side_by_side_markdown");
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 1a5a4ecc7f..401c85f354 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -3,7 +3,7 @@ import { alias, not, or, readOnly } from "@ember/object/computed";
 import { areCookiesEnabled, escapeExpression } from "discourse/lib/utilities";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { next, schedule } from "@ember/runloop";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -133,7 +133,66 @@ export default Controller.extend(ModalFunctionality, {
     return canLoginLocalWithEmail;
   },
 
+  @action
+  emailLogin(event) {
+    event?.preventDefault();
+
+    if (this.processingEmailLink) {
+      return;
+    }
+
+    if (isEmpty(this.loginName)) {
+      this.flash(I18n.t("login.blank_username"), "info");
+      return;
+    }
+
+    this.set("processingEmailLink", true);
+
+    ajax("/u/email-login", {
+      data: { login: this.loginName.trim() },
+      type: "POST",
+    })
+      .then((data) => {
+        const loginName = escapeExpression(this.loginName);
+        const isEmail = loginName.match(/@/);
+        let key = `email_login.complete_${isEmail ? "email" : "username"}`;
+        if (data.user_found === false) {
+          this.flash(
+            I18n.t(`${key}_not_found`, {
+              email: loginName,
+              username: loginName,
+            }),
+            "error"
+          );
+        } else {
+          let postfix = data.hide_taken ? "" : "_found";
+          this.flash(
+            I18n.t(`${key}${postfix}`, {
+              email: loginName,
+              username: loginName,
+            })
+          );
+        }
+      })
+      .catch((e) => this.flash(extractError(e), "error"))
+      .finally(() => this.set("processingEmailLink", false));
+  },
+
+  @action
+  handleForgotPassword(event) {
+    event?.preventDefault();
+    const forgotPasswordController = this.forgotPassword;
+    if (forgotPasswordController) {
+      forgotPasswordController.set("accountEmailOrUsername", this.loginName);
+    }
+    this.send("showForgotPassword");
+  },
+
   actions: {
+    forgotPassword() {
+      this.handleForgotPassword();
+    },
+
     login() {
       if (this.loginDisabled) {
         return;
@@ -297,56 +356,6 @@ export default Controller.extend(ModalFunctionality, {
       this.send("showCreateAccount");
     },
 
-    forgotPassword() {
-      const forgotPasswordController = this.forgotPassword;
-      if (forgotPasswordController) {
-        forgotPasswordController.set("accountEmailOrUsername", this.loginName);
-      }
-      this.send("showForgotPassword");
-    },
-
-    emailLogin() {
-      if (this.processingEmailLink) {
-        return;
-      }
-
-      if (isEmpty(this.loginName)) {
-        this.flash(I18n.t("login.blank_username"), "info");
-        return;
-      }
-
-      this.set("processingEmailLink", true);
-
-      ajax("/u/email-login", {
-        data: { login: this.loginName.trim() },
-        type: "POST",
-      })
-        .then((data) => {
-          const loginName = escapeExpression(this.loginName);
-          const isEmail = loginName.match(/@/);
-          let key = `email_login.complete_${isEmail ? "email" : "username"}`;
-          if (data.user_found === false) {
-            this.flash(
-              I18n.t(`${key}_not_found`, {
-                email: loginName,
-                username: loginName,
-              }),
-              "error"
-            );
-          } else {
-            let postfix = data.hide_taken ? "" : "_found";
-            this.flash(
-              I18n.t(`${key}${postfix}`, {
-                email: loginName,
-                username: loginName,
-              })
-            );
-          }
-        })
-        .catch((e) => this.flash(extractError(e), "error"))
-        .finally(() => this.set("processingEmailLink", false));
-    },
-
     authenticateSecurityKey() {
       getWebauthnCredential(
         this.securityKeyChallenge,
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index bae85083a8..0787a28271 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,4 +1,5 @@
 import DiscourseURL, { userPath } from "discourse/lib/url";
+import { action } from "@ember/object";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -46,6 +47,13 @@ export default Controller.extend(PasswordValidation, {
 
   lockImageUrl: getURL("/images/lock.svg"),
 
+  @action
+  done(event) {
+    event?.preventDefault();
+    this.set("redirected", true);
+    DiscourseURL.redirectTo(this.redirectTo || "/");
+  },
+
   actions: {
     submit() {
       ajax({
@@ -126,10 +134,5 @@ export default Controller.extend(PasswordValidation, {
         }
       );
     },
-
-    done() {
-      this.set("redirected", true);
-      DiscourseURL.redirectTo(this.redirectTo || "/");
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 6c3051d452..94ba197cfd 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -2,7 +2,7 @@ import { gt, not, or } from "@ember/object/computed";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
@@ -132,6 +132,20 @@ export default Controller.extend(CanCheckEmails, {
     return findAll().length > 0;
   },
 
+  @action
+  resendConfirmationEmail(email, event) {
+    event?.preventDefault();
+    email.set("resending", true);
+    this.model
+      .addEmail(email.email)
+      .then(() => {
+        email.set("resent", true);
+      })
+      .finally(() => {
+        email.set("resending", false);
+      });
+  },
+
   actions: {
     save() {
       this.set("saved", false);
@@ -157,18 +171,6 @@ export default Controller.extend(CanCheckEmails, {
       this.model.destroyEmail(email);
     },
 
-    resendConfirmationEmail(email) {
-      email.set("resending", true);
-      this.model
-        .addEmail(email.email)
-        .then(() => {
-          email.set("resent", true);
-        })
-        .finally(() => {
-          email.set("resending", false);
-        });
-    },
-
     delete() {
       this.dialog.alert({
         message: I18n.t("user.delete_account_confirm"),
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index 946903a568..fc5293054a 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -3,6 +3,7 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -91,6 +92,27 @@ export default Controller.extend(CanCheckEmails, {
     this.set("dirty", true);
   },
 
+  @action
+  resetPassword(event) {
+    event?.preventDefault();
+
+    this.setProperties({
+      resetPasswordLoading: true,
+      resetPasswordProgress: "",
+    });
+
+    return this.model
+      .changePassword()
+      .then(() => {
+        this.set(
+          "resetPasswordProgress",
+          I18n.t("user.change_password.success")
+        );
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("resetPasswordLoading", false));
+  },
+
   actions: {
     confirmPassword() {
       if (!this.password) {
@@ -101,24 +123,6 @@ export default Controller.extend(CanCheckEmails, {
       this.set("password", null);
     },
 
-    resetPassword() {
-      this.setProperties({
-        resetPasswordLoading: true,
-        resetPasswordProgress: "",
-      });
-
-      return this.model
-        .changePassword()
-        .then(() => {
-          this.set(
-            "resetPasswordProgress",
-            I18n.t("user.change_password.success")
-          );
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("resetPasswordLoading", false));
-    },
-
     disableAllSecondFactors() {
       if (this.loading) {
         return;
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/security.js b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
index c1e7dc52c0..800d597c65 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/security.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -51,6 +52,56 @@ export default Controller.extend(CanCheckEmails, {
     DEFAULT_AUTH_TOKENS_COUNT
   ),
 
+  @action
+  changePassword(event) {
+    event?.preventDefault();
+    if (!this.passwordProgress) {
+      this.set("passwordProgress", I18n.t("user.change_password.in_progress"));
+      return this.model
+        .changePassword()
+        .then(() => {
+          // password changed
+          this.setProperties({
+            changePasswordProgress: false,
+            passwordProgress: I18n.t("user.change_password.success"),
+          });
+        })
+        .catch(() => {
+          // password failed to change
+          this.setProperties({
+            changePasswordProgress: false,
+            passwordProgress: I18n.t("user.change_password.error"),
+          });
+        });
+    }
+  },
+
+  @action
+  toggleShowAllAuthTokens(event) {
+    event?.preventDefault();
+    this.toggleProperty("showAllAuthTokens");
+  },
+
+  @action
+  revokeAuthToken(token, event) {
+    event?.preventDefault();
+    ajax(
+      userPath(
+        `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+      ),
+      {
+        type: "POST",
+        data: token ? { token_id: token.id } : {},
+      }
+    )
+      .then(() => {
+        if (!token) {
+          logout();
+        } // All sessions revoked
+      })
+      .catch(popupAjaxError);
+  },
+
   actions: {
     save() {
       this.set("saved", false);
@@ -60,53 +111,6 @@ export default Controller.extend(CanCheckEmails, {
         .catch(popupAjaxError);
     },
 
-    changePassword() {
-      if (!this.passwordProgress) {
-        this.set(
-          "passwordProgress",
-          I18n.t("user.change_password.in_progress")
-        );
-        return this.model
-          .changePassword()
-          .then(() => {
-            // password changed
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.success"),
-            });
-          })
-          .catch(() => {
-            // password failed to change
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.error"),
-            });
-          });
-      }
-    },
-
-    toggleShowAllAuthTokens() {
-      this.toggleProperty("showAllAuthTokens");
-    },
-
-    revokeAuthToken(token) {
-      ajax(
-        userPath(
-          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
-        ),
-        {
-          type: "POST",
-          data: token ? { token_id: token.id } : {},
-        }
-      )
-        .then(() => {
-          if (!token) {
-            logout();
-          } // All sessions revoked
-        })
-        .catch(popupAjaxError);
-    },
-
     showToken(token) {
       showModal("auth-token", { model: token });
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
index bdc1f3511d..2ed9127535 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -40,9 +41,15 @@ export default Controller.extend(ModalFunctionality, {
       .finally(() => this.set("loading", false));
   },
 
+  @action
+  enableShowSecondFactorKey(event) {
+    event?.preventDefault();
+    this.set("showSecondFactorKey", true);
+  },
+
   actions: {
     showSecondFactorKey() {
-      this.set("showSecondFactorKey", true);
+      this.enableShowSecondFactorKey();
     },
 
     enableSecondFactor() {
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
index 8e88afdf95..f4199f9ee9 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
@@ -212,7 +212,8 @@ export default Controller.extend({
   },
 
   @action
-  useAnotherMethod(newMethod) {
+  useAnotherMethod(newMethod, event) {
+    event?.preventDefault();
     this.set("userSelectedMethod", newMethod);
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index 619c5e860d..2f9c493516 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -110,7 +110,8 @@ export default DiscoverySortableController.extend(
     },
 
     @action
-    showInserted() {
+    showInserted(event) {
+      event?.preventDefault();
       const tracker = this.topicTrackingState;
       this.list.loadBefore(tracker.newIncoming, true);
       tracker.resetTracking();
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index ec56d24003..eff2f1d30b 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -41,23 +42,27 @@ export default Controller.extend({
     };
   },
 
+  @action
+  sortByCount(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["totalCount:desc", "id"],
+      sortedByCount: true,
+      sortedByName: false,
+    });
+  },
+
+  @action
+  sortById(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["id"],
+      sortedByCount: false,
+      sortedByName: true,
+    });
+  },
+
   actions: {
-    sortByCount() {
-      this.setProperties({
-        sortProperties: ["totalCount:desc", "id"],
-        sortedByCount: true,
-        sortedByName: false,
-      });
-    },
-
-    sortById() {
-      this.setProperties({
-        sortProperties: ["id"],
-        sortedByCount: false,
-        sortedByName: true,
-      });
-    },
-
     showUploader() {
       showModal("tag-upload");
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index aace5530cb..913362255e 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -313,6 +313,55 @@ export default Controller.extend(bufferedProperty("model"), {
       });
   },
 
+  @action
+  editTopic(event) {
+    event?.preventDefault();
+    if (this.get("model.details.can_edit")) {
+      this.set("editingTopic", true);
+    }
+  },
+
+  @action
+  jumpTop(event) {
+    event?.preventDefault();
+    DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
+      skipIfOnScreen: false,
+      keepFilter: true,
+    });
+  },
+
+  @action
+  removeFeaturedLink(event) {
+    event?.preventDefault();
+    this.set("buffered.featured_link", null);
+  },
+
+  @action
+  selectAll(event) {
+    event?.preventDefault();
+    const smallActionsPostIds = this._smallActionPostIds();
+    this.set("selectedPostIds", [
+      ...this.get("model.postStream.stream").filter(
+        (postId) => !smallActionsPostIds.has(postId)
+      ),
+    ]);
+    this._forceRefreshPostStream();
+  },
+
+  @action
+  deselectAll(event) {
+    event?.preventDefault();
+    this.set("selectedPostIds", []);
+    this._forceRefreshPostStream();
+  },
+
+  @action
+  toggleMultiSelect(event) {
+    event?.preventDefault();
+    this.toggleProperty("multiSelect");
+    this._forceRefreshPostStream();
+  },
+
   actions: {
     topicCategoryChanged(categoryId) {
       this.set("buffered.category_id", categoryId);
@@ -822,13 +871,6 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostNumber(postNumber);
     },
 
-    jumpTop() {
-      DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
-        skipIfOnScreen: false,
-        keepFilter: true,
-      });
-    },
-
     jumpBottom() {
       // When a topic only has one lengthy post
       const jumpEnd = this.model.highest_post_number === 1 ? true : false;
@@ -859,26 +901,6 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostId(postId);
     },
 
-    toggleMultiSelect() {
-      this.toggleProperty("multiSelect");
-      this._forceRefreshPostStream();
-    },
-
-    selectAll() {
-      const smallActionsPostIds = this._smallActionPostIds();
-      this.set("selectedPostIds", [
-        ...this.get("model.postStream.stream").filter(
-          (postId) => !smallActionsPostIds.has(postId)
-        ),
-      ]);
-      this._forceRefreshPostStream();
-    },
-
-    deselectAll() {
-      this.set("selectedPostIds", []);
-      this._forceRefreshPostStream();
-    },
-
     togglePostSelection(post) {
       const selected = this.selectedPostIds;
       selected.includes(post.id)
@@ -973,13 +995,6 @@ export default Controller.extend(bufferedProperty("model"), {
         .then(() => this.updateQueryParams);
     },
 
-    editTopic() {
-      if (this.get("model.details.can_edit")) {
-        this.set("editingTopic", true);
-      }
-      return false;
-    },
-
     cancelEditingTopic() {
       this.set("editingTopic", false);
       this.rollbackBuffer();
@@ -1159,10 +1174,6 @@ export default Controller.extend(bufferedProperty("model"), {
         .catch(popupAjaxError);
     },
 
-    removeFeaturedLink() {
-      this.set("buffered.featured_link", null);
-    },
-
     resetBumpDate() {
       this.model.resetBumpDate();
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
index 9d4f536866..b73149358f 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
@@ -1,25 +1,29 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
+
 export default Controller.extend({
   sortProperties: ["count:desc", "id"],
   tagsForUser: null,
   sortedByCount: true,
   sortedByName: false,
 
-  actions: {
-    sortByCount() {
-      this.setProperties({
-        sortProperties: ["count:desc", "id"],
-        sortedByCount: true,
-        sortedByName: false,
-      });
-    },
+  @action
+  sortByCount(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["count:desc", "id"],
+      sortedByCount: true,
+      sortedByName: false,
+    });
+  },
 
-    sortById() {
-      this.setProperties({
-        sortProperties: ["id"],
-        sortedByCount: false,
-        sortedByName: true,
-      });
-    },
+  @action
+  sortById(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["id"],
+      sortedByCount: false,
+      sortedByName: true,
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
index 021502f615..a40ab97f4e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
@@ -81,10 +81,10 @@ export default Controller.extend(BulkTopicSelection, {
   },
 
   @action
-  showInserted() {
+  showInserted(event) {
+    event?.preventDefault();
     this.model.loadBefore(this.pmTopicTrackingState.newIncoming);
     this.pmTopicTrackingState.resetIncomingTracking();
-    return false;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 4c8ba40cbc..8f2d24beb1 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -211,6 +211,15 @@ export default Controller.extend(CanCheckEmails, {
     }
   },
 
+  @action
+  showSuspensions(event) {
+    event?.preventDefault();
+    this.adminTools.showActionLogs(this, {
+      target_user: this.get("model.username"),
+      action_name: "suspend_user",
+    });
+  },
+
   actions: {
     collapseProfile() {
       this.set("forceExpand", false);
@@ -220,13 +229,6 @@ export default Controller.extend(CanCheckEmails, {
       this.set("forceExpand", true);
     },
 
-    showSuspensions() {
-      this.adminTools.showActionLogs(this, {
-        target_user: this.get("model.username"),
-        action_name: "suspend_user",
-      });
-    },
-
     adminDelete() {
       const userId = this.get("model.id");
       const location = document.location.pathname;
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
index 338e4b1cf5..6f3be0d4a9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
@@ -20,7 +20,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
+      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
index 16e062fda2..4acbfc6298 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
@@ -1,6 +1,6 @@
 <span class="group-name">
   <span class="group-name-label">{{this.group_name}}</span>
-  <a class="remove-permission" href {{action "removeRow"}}>
+  <a class="remove-permission" href {{on "click" this.removeRow}}>
     {{d-icon "far-trash-alt"}}
   </a>
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
index ce6c36f17d..c7d07e87f2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
@@ -11,7 +11,7 @@
     {{#each this.messages as |m|}}
       <div class="controls existing-message">
         <label class="radio">
-          <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
+          <input id="choose-message-{{m.id}}" {{on "click" (fn this.chooseMessage m)}} type="radio" name="choose_message_id">
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
index 836736abf7..f59b10dd5b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class={{if this.active "active"}}>{{this.title}}</a>
+<a href {{on "click" this.select}} class={{if this.active "active"}}>{{this.title}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
index f7e48e3951..d0eac567ac 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
@@ -1,30 +1,30 @@
 {{!-- DO NOT EDIT THIS FILE!!! --}}
 {{!-- Update it by running `rake javascript:update_constants` --}}
 
-<button type="button" data-section="smileys_&_emotion" {{action this.onCategorySelection "smileys_&_emotion"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="smileys_&_emotion" {{on "click" (fn this.onCategorySelection "smileys_&_emotion")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":grinning:"}}
 </button>
-<button type="button" data-section="people_&_body" {{action this.onCategorySelection "people_&_body"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="people_&_body" {{on "click" (fn this.onCategorySelection "people_&_body")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":wave:"}}
 </button>
-<button type="button" data-section="animals_&_nature" {{action this.onCategorySelection "animals_&_nature"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="animals_&_nature" {{on "click" (fn this.onCategorySelection "animals_&_nature")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":evergreen_tree:"}}
 </button>
-<button type="button" data-section="food_&_drink" {{action this.onCategorySelection "food_&_drink"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="food_&_drink" {{on "click" (fn this.onCategorySelection "food_&_drink")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":hamburger:"}}
 </button>
-<button type="button" data-section="travel_&_places" {{action this.onCategorySelection "travel_&_places"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="travel_&_places" {{on "click" (fn this.onCategorySelection "travel_&_places")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":airplane:"}}
 </button>
-<button type="button" data-section="activities" {{action this.onCategorySelection "activities"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="activities" {{on "click" (fn this.onCategorySelection "activities")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":soccer:"}}
 </button>
-<button type="button" data-section="objects" {{action this.onCategorySelection "objects"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="objects" {{on "click" (fn this.onCategorySelection "objects")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":eyeglasses:"}}
 </button>
-<button type="button" data-section="symbols" {{action this.onCategorySelection "symbols"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="symbols" {{on "click" (fn this.onCategorySelection "symbols")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":white_check_mark:"}}
 </button>
-<button type="button" data-section="flags" {{action this.onCategorySelection "flags"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="flags" {{on "click" (fn this.onCategorySelection "flags")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":checkered_flag:"}}
 </button>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index d35c0e5e2f..cba02e4d65 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -4,15 +4,15 @@
     {{!-- template-lint-enable no-invalid-interactive no-down-event-binding --}}
     <div class="emoji-picker-category-buttons">
       {{#if this.recentEmojis.length}}
-        <button type="button" data-section="recent" {{action "onCategorySelection" "recent"}} class="btn btn-default category-button emoji">
+        <button type="button" data-section="recent" {{on "click" (fn this.onCategorySelection "recent")}} class="btn btn-default category-button emoji">
           {{replace-emoji ":star:"}}
         </button>
       {{/if}}
 
-      <EmojiGroupButtons @onCategorySelection={{action "onCategorySelection"}} @tagName="" />
+      <EmojiGroupButtons @onCategorySelection={{this.onCategorySelection}} @tagName="" />
 
       {{#each-in this.customEmojis as |group emojis|}}
-        <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
+        <button type="button" data-section={{concat "custom-" group}} {{on "click" (fn this.onCategorySelection (concat "custom-" group))}} class="btn btn-default category-button emoji">
           {{replace-emoji (concat ":" emojis.firstObject.code ":")}}
         </button>
       {{/each-in}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
index ba18d20f35..6e41deadef 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
@@ -2,7 +2,7 @@
   <h3>{{this.formattedName}}</h3>
   <div class="controls">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
 
       <div class="flag-action-type-details">
         <span class="description">{{html-safe this.flag.description}}</span>
@@ -19,7 +19,7 @@
 {{else}}
   <div class="controls {{this.flag.name_key}}">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
       <div class="flag-action-type-details">
         <strong>{{this.formattedName}}</strong>
         {{#if this.showDescription}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
index a47f02deca..f93472eaeb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
@@ -13,14 +13,14 @@
     {{else}}
       <div class="card-row first-row">
         <div class="group-card-avatar">
-          <a href={{this.groupPath}} {{action "showGroup" this.group}} class="card-huge-avatar">
+          <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="card-huge-avatar">
             <AvatarFlair @flairName={{this.group.name}} @flairUrl={{this.group.flair_url}} @flairBgColor={{this.group.flair_bg_color}} @flairColor={{this.group.flair_color}} />
           </a>
         </div>
         <div class="names">
           <span>
             <h1 class={{this.group.name}}>
-              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="group-page-link">{{this.group.name}}</a>
+              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="group-page-link">{{this.group.name}}</a>
             </h1>
             {{#if this.group.full_name}}
               <h2 class="full-name">{{this.group.full_name}}</h2>
@@ -53,10 +53,10 @@
         <div class="card-row third-row">
           <div class="members metadata">
             {{#each this.group.members as |user|}}
-              <a {{action "close"}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+              <a {{on "click" this.close}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
             {{/each}}
             {{#if this.showMoreMembers}}
-              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="more-members-link">
+              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="more-members-link">
                 <span class="more-members-count">+{{this.moreMembersCount}} {{i18n "more"}}</span>
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
index 0033afdf8a..e86851cb2c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
@@ -34,7 +34,7 @@
 
   <div class="control-group">
     <div class="group-imap-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index 709ab0615e..7c59effdfd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" (action "smtpEnabledChange")}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" (action "imapEnabledChange")}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
index 78f084e8ff..703a39658a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
@@ -3,7 +3,7 @@
 </a>
 <span>{{this.member.username}}</span>
 {{#unless this.automatic}}
-  <a href {{action "remove"}} class="remove">
+  <a href {{on "click" this.remove}} class="remove">
     {{d-icon "times"}}
   </a>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
index 4263b72514..68623cda2b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
@@ -40,7 +40,7 @@
 
   <div class="control-group">
     <div class="group-smtp-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
index ab36ebbfa0..b7a0ffeba7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each this.buttons as |b|}}
-  <button type="button" class="btn btn-social {{b.name}}" {{action this.externalLogin b}} aria-label={{b.screenReaderTitle}} tabindex="3">
+  <button type="button" class="btn btn-social {{b.name}}" {{on "click" (action this.externalLogin b)}} aria-label={{b.screenReaderTitle}} tabindex="3">
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index f98826d61b..d5bfb00f08 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -10,7 +10,7 @@
     <span class="status">
       {{reviewable-status this.reviewable.status}}
     </span>
-    <a href {{action "explainReviewable" this.reviewable}} title={{i18n "review.explain.why"}} class="explain">
+    <a href {{on "click" (fn this.explainReviewable this.reviewable)}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
index 16df22dbb5..349953e988 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
@@ -1,5 +1,5 @@
 {{#if this.hasEdits}}
-  <a href {{action "showEditHistory"}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
+  <a href {{on "click" this.showEditHistory}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
     {{d-icon "pencil-alt"}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
index 5c18aab0cd..39b8e7dd3a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
@@ -6,7 +6,7 @@
   {{category-badge this.reviewable.category}}
   <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
   {{#if this.reviewable.payload.via_email}}
-    <a href {{action "showRawEmail"}} class="show-raw-email">
+    <a href {{on "click" this.showRawEmail}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
index 25a563daa0..6e49ebe210 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
@@ -10,7 +10,7 @@
       <TrackSelected @selectedList={{this.selected}} @selectedId={{this.post.topic}} @class="bulk-select" />
     {{/if}}
 
-    <a href={{this.post.url}} {{action "logClick" this.post.topic_id}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
+    <a href={{this.post.url}} {{on "click" (fn this.logClick this.post.topic_id)}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
       {{raw "topic-status" topic=this.post.topic showPrivateMessageIcon=true}}
       <span class="topic-title">
         {{#if this.post.useTopicTitleHeadline}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
index b5f1fbfbe2..714d1b4e92 100644
--- a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
@@ -7,7 +7,7 @@
   {{yield}}
   {{#if this.showToggleMethodLink}}
     <p>
-      <a href="" class="toggle-second-factor-method" {{action "toggleSecondFactorMethod"}}>{{ i18n this.linkText }}</a>
+      <a href class="toggle-second-factor-method" {{on "click" this.toggleSecondFactorMethod}}>{{ i18n this.linkText }}</a>
     </p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
index f0f70b3c6c..f321e2ca05 100644
--- a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
@@ -2,7 +2,7 @@
   <DButton @action={{this.action}} @icon="key" @id="security-key-authenticate-button" @label="login.security_key_authenticate" @type="button" @class="btn btn-large btn-primary" />
   <p>
     {{#if this.otherMethodAllowed}}
-      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
+      <a href class="toggle-second-factor-method" {{on "click" this.useAnotherMethod}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
index 09afc7c50a..206ff4ae21 100644
--- a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
@@ -4,7 +4,7 @@
 
 {{#if this.canSelectAll}}
   <p>
-    <a class="select-all" href {{action this.selectAll}}>
+    <a class="select-all" href {{on "click" this.selectAll}}>
       {{i18n "topic.multi_select.select_all"}}
     </a>
   </p>
@@ -12,7 +12,7 @@
 
 {{#if this.canDeselectAll}}
   <p>
-    <a href {{action this.deselectAll}}>
+    <a href {{on "click" this.deselectAll}}>
       {{i18n "topic.multi_select.deselect_all"}}
     </a>
   </p>
@@ -35,7 +35,7 @@
 {{/if}}
 
 <p class="cancel">
-  <a href {{action this.toggleMultiSelect}}>
+  <a href {{on "click" this.toggleMultiSelect}}>
     {{i18n "topic.multi_select.cancel"}}
   </a>
 </p>
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
index cf640feb23..f6d4148d83 100644
--- a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
@@ -10,7 +10,7 @@
     <div class="buttons">
       <DButton @action={{route-action "showCreateAccount"}} @label="signup_cta.sign_up" @icon="user" @class="btn-primary" />
       <DButton @action={{action "hideForSession"}} @label="signup_cta.hide_session" @class="no-icon" />
-      <a href {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
+      <a href {{on "click" this.neverShow}}>{{i18n "signup_cta.hide_forever"}}</a>
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index 4e1c273767..b85e1bfa28 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -17,7 +17,7 @@
         <div class="tag-name-wrapper">
           {{discourse-tag this.tagInfo.name tagName="div"}}
           {{#if this.canAdminTag}}
-            <a href {{action "edit"}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
+            <a href {{on "click" this.edit}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
           {{/if}}
         </div>
         <div class="tag-description-wrapper">
@@ -56,10 +56,10 @@
             <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
               {{#if this.editSynonymsMode}}
-                <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
+                <a href {{on "click" (fn this.unlinkSynonym tag)}} class="unlink-synonym">
                   {{d-icon "unlink" title="tagging.remove_synonym"}}
                 </a>
-                <a href {{action "deleteSynonym" tag}} class="delete-synonym">
+                <a href {{on "click" (fn this.deleteSynonym tag)}} class="delete-synonym">
                   {{d-icon "far-trash-alt" title="tagging.delete_tag"}}
                 </a>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index f2614399f2..eb422a5e39 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -26,7 +26,7 @@
           {{#if this.user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar this.user "huge"}}</span>
           {{else}}
-            <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
+            <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
 
           <UserAvatarFlair @user={{this.user}} />
@@ -40,7 +40,7 @@
                 {{if this.nameFirst this.user.name (format-username this.user.username)}}
               </span>
             {{else}}
-              <a href={{this.user.path}} {{action "showUser" this.user}} class="user-profile-link">
+              <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="user-profile-link">
                 <span id="discourse-user-card-title" class="name-username-wrapper">
                   {{if this.nameFirst this.user.name (format-username this.user.username)}}
                 </span>
@@ -48,7 +48,7 @@
               </a>
             {{/if}}
           </h1>
-          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(action "showUser" this.user)}} />
+          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(fn this.handleShowUser this.user)}} />
           {{#if this.nameFirst}}
             <h2 class="username">{{this.user.username}}</h2>
           {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 132e37cff6..64967f9982 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -101,7 +101,7 @@
             <ComposerSaveButton @action={{action "save"}} @icon={{this.saveIcon}} @label={{this.saveLabel}} @forwardEvent={{true}} @disableSubmit={{this.disableSubmit}} />
 
             {{#if this.site.mobileView}}
-              <a href {{action "cancel"}} title={{i18n "cancel"}} class="cancel">
+              <a href {{on "click" this.cancel}} title={{i18n "cancel"}} class="cancel">
                 {{#if this.canEdit}}
                   {{d-icon "times"}}
                 {{else}}
@@ -109,7 +109,7 @@
                 {{/if}}
               </a>
             {{else}}
-              <a href {{action "cancel"}} class="cancel" >{{i18n "close"}}</a>
+              <a href {{on "click" this.cancel}} class="cancel" >{{i18n "close"}}</a>
             {{/if}}
 
             {{#if this.site.mobileView}}
@@ -133,7 +133,7 @@
                 {{/if}}
 
                 {{#if this.isCancellable}}
-                  <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
+                  <a href id="cancel-file-upload" {{on "click" this.cancelUpload}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
@@ -165,7 +165,7 @@
               </a>
             {{/if}}
 
-            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{action "togglePreview"}} aria-label={{i18n "preview"}}>
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{on "click" this.togglePreview}} aria-label={{i18n "preview"}}>
               {{d-icon "desktop"}}
             </a>
 
@@ -180,7 +180,7 @@
     {{else}}
       <div class="saving-text">
         {{#if this.model.createdPost}}
-          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
+          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{on "click" this.viewNewReply}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
           {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
index 248e6c05a4..6edf2f0dc3 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
index 1c83813b00..b1d56bdaff 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
index 308dbeefc9..f5ab696290 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
index 49a28605b6..7547ea9aa9 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 510da64e49..4b7b4be309 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 4187cda09d..51734fa801 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -3,7 +3,7 @@
 <DiscoveryCategories @refresh={{action "refresh"}}>
   {{#if (and this.topicTrackingState.hasIncoming this.isCategoriesRoute)}}
     <div class="show-more {{if this.hasTopics "has-topics"}}">
-      <div role="button" class="alert alert-info clickable" {{action "showInserted"}}>
+      <div role="button" class="alert alert-info clickable" {{on "click" this.showInserted}}>
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 7deb8d1edc..3b6018bae9 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -20,7 +20,7 @@
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
       <div class="show-more {{if this.hasTopics "has-topics"}}">
-        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index de59e86dae..23926dd460 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -101,7 +101,7 @@
                     <div class="no-results-suggestion">
                       {{i18n "search.cant_find"}}
                       {{#if this.canCreateTopic}}
-                        <a href {{action "createTopic" this.searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                        <a href {{on "click" (fn this.createTopic this.searchTerm)}}>{{i18n "search.start_new_topic"}}</a>
                         {{#unless this.siteSettings.login_required}}
                           {{i18n "search.or_search_google"}}
                         {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
index 53f0ee38c6..a5382ff98c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
@@ -9,7 +9,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
+      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
index b062e88d04..6c7e389d6c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
@@ -1,6 +1,6 @@
 {{#if this.selectedHtml}}
   <li>
-    <a href {{action "toggleExpanded"}} class="expander">
+    <a href {{on "click" this.toggleExpanded}} class="expander">
       <span class="selection">{{html-safe this.selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index 72e29f165f..06bddeb0fa 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -1,5 +1,5 @@
 <li class="navigation-toggle">
-  <a href {{action "toggleDrop"}} class="toggle-link">
+  <a href {{on "click" this.toggleDrop}} class="toggle-link">
     {{this.selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index c91dcd6405..1e6cf38bcc 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -7,7 +7,7 @@
     </div>
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
-      <a href {{action "showInserted"}} class="alert alert-info clickable">
+      <a href {{on "click" this.showInserted}} class="alert alert-info clickable">
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 8bd68ee20e..9ac8b5d77a 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -16,7 +16,7 @@
             <Input @value={{this.loginName}} class={{value-entered this.loginName}} @type="email" id="login-account-name" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" />
             <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
             {{#if this.showLoginWithEmailLink}}
-              <a href id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
+              <a href id="email-login-link" {{on "click" this.emailLogin}}>
                 {{i18n "email_login.login_link"}}
               </a>
             {{/if}}
@@ -24,7 +24,7 @@
           <div class="input-group">
             <Input @value={{this.loginPassword}} class={{value-entered this.loginPassword}} @type="password" id="login-account-password" maxlength="200" disabled={{this.showSecondFactor}} />
             <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-            <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+            <a href id="forgot-password-link" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
           </div>
         </div>
         <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @class={{this.secondFactorClass}} @backupEnabled={{this.backupEnabled}} @isLogin={{true}}>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
index 86310ecef2..c0cc595e83 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
@@ -17,7 +17,7 @@
     <div>
       <h3>
         {{i18n "user.auth_tokens.latest_post"}}
-        <a href {{action "toggleExpanded"}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
+        <a href {{on "click" this.toggleExpanded}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
       </h3>
 
       {{#if this.expanded}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index d8447cfc13..115a78dde5 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -2,7 +2,7 @@
   {{#if this.showSelectableAvatars}}
     <div class="selectable-avatars">
       {{#each this.selectableAvatars as |avatar|}}
-        <a href class="selectable-avatar" {{action "selectAvatar" avatar}}>
+        <a href class="selectable-avatar" {{on "click" (fn this.selectAvatar avatar)}}>
           {{bound-avatar-template avatar "huge"}}
         </a>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index 38f30da9dd..0f48b08226 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -30,19 +30,19 @@
       <div id="display-modes">
         <ul class="nav nav-pills">
           <li>
-            <a href class={{this.inlineClass}} {{action "displayInline"}} title={{i18n "post.revisions.displays.inline.title"}}>
+            <a href class={{this.inlineClass}} {{on "click" this.displayInline}} title={{i18n "post.revisions.displays.inline.title"}}>
               {{d-icon "far-square"}}
               {{i18n "post.revisions.displays.inline.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideClass}} {{action "displaySideBySide"}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
+            <a href class={{this.sideBySideClass}} {{on "click" this.displaySideBySide}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideMarkdownClass}} {{action "displaySideBySideMarkdown"}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
+            <a href class={{this.sideBySideMarkdownClass}} {{on "click" this.displaySideBySideMarkdown}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
             </a>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index 52250bd825..f93cea0807 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="composer.link_dialog_title" @class="insert-link">
-  <form id="insert-hyperlink-form" {{action "ok" on="submit"}}>
+  <form id="insert-hyperlink-form" {{on "submit" (action "ok")}}>
     <div class="inputs">
       <TextField @value={{this.linkUrl}} @placeholderKey="composer.link_url_placeholder" @class="link-url" @key-up={{action "search"}} @autofocus="autofocus" />
       {{#if this.searchLoading}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
index 7503af7c15..d7465134af 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
@@ -14,7 +14,7 @@
               <Input @value={{this.loginName}} @type="email" id="login-account-name" class={{value-entered this.loginName}} autocomplete="username" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" tabindex="1" />
               <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
               {{#if this.showLoginWithEmailLink}}
-                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
+                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{on "click" this.emailLogin}}>
                   {{i18n "email_login.login_link"}}
                 </a>
               {{/if}}
@@ -22,7 +22,7 @@
             <div class="input-group">
               <PasswordField @value={{this.loginPassword}} @type="password" class={{value-entered this.loginPassword}} id="login-account-password" autocomplete="current-password" maxlength="200" @capsLockOn={{this.capsLockOn}} disabled={{this.disableLoginFields}} tabindex="1" />
               <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-              <a href id="forgot-password-link" tabindex="3" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+              <a href id="forgot-password-link" tabindex="3" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
               <div class="caps-lock-warning {{unless this.capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
index ed5c02023f..d94537761a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
@@ -23,7 +23,7 @@
           {{#if this.showSecondFactorKey}}
             {{this.secondFactorKey}}
           {{else}}
-            <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
+            <a href {{on "click" this.enableShowSecondFactorKey}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
         </p>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index 4ce19d4867..fb74ee2874 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n "login.not_approved"}}</p>
       {{else}}
         {{#unless this.redirected}}
-          <a class="btn" href={{this.redirectHref}} {{action "done"}}>{{this.continueButtonText}}</a>
+          <a class="btn" href={{this.redirectHref}} {{on "click" this.done}}>{{this.continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index debb8266e5..166a2c81d9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -120,7 +120,7 @@
             <div class="controls" style="margin-top: 5px">
               {{this.resetPasswordProgress}}
               {{#unless this.resetPasswordLoading}}
-                <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
+                <a href class="instructions" {{on "click" this.resetPassword}}>{{ i18n "user.second_factor.forgot_password" }}</a>
               {{/unless}}
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 77e3995a23..40ae04547a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -53,7 +53,7 @@
                   {{else if email.resent}}
                     <span>{{i18n "user.email.resent_label"}}</span>
                   {{else}}
-                    <a {{action "resendConfirmationEmail" email}} href>{{i18n "user.email.resend_label"}}</a>
+                    <a {{on "click" (fn this.resendConfirmationEmail email)}} href>{{i18n "user.email.resend_label"}}</a>
                   {{/if}}
                 {{/unless}}
               </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index 76e2d3f63a..78459f73e7 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -2,7 +2,7 @@
   <div class="control-group pref-password">
     <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
-      <a href {{action "changePassword"}} class="btn btn-default">
+      <a href {{on "click" this.changePassword}} class="btn btn-default">
         {{d-icon "envelope"}}
         {{#if this.model.no_password}}
           {{i18n "user.change_password.set_password"}}
@@ -58,7 +58,7 @@
     </div>
 
     {{#if this.canShowAllAuthTokens}}
-      <a href {{action "toggleShowAllAuthTokens"}}>
+      <a href {{on "click" this.toggleShowAllAuthTokens}}>
         {{#if this.showAllAuthTokens}}
           {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
@@ -67,7 +67,7 @@
       </a>
     {{/if}}
 
-    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
+    <a href {{on "click" (fn this.revokeAuthToken null)}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
index e1e99c3826..8c38d50493 100644
--- a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
+++ b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
@@ -25,7 +25,7 @@
           <span>&middot;</span>
         {{/if}}
         <span>
-          <a href="" class="toggle-second-factor-method {{method.class}}" {{action "useAnotherMethod" method.id}}>
+          <a href class="toggle-second-factor-method {{method.class}}" {{on "click" (fn this.useAnotherMethod method.id)}}>
             {{i18n method.translationKey}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index afc2d8e4dd..de725a87a4 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -40,7 +40,7 @@
               {{else}}
                 {{#if this.topicTrackingState.hasIncoming}}
                   <div class="show-more {{if this.hasTopics "has-topics"}}">
-                    <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+                    <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
                       <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
                     </a>
                   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index a6c07e90f1..932bcf36ec 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -15,8 +15,8 @@
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{on "click" this.sortByCount}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{on "click" this.sortById}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 41fa19fd1d..85186edfe2 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -41,7 +41,7 @@
               <DButton @action={{action "cancelEditingTopic"}} @class="btn-default cancel-edit" @icon="times" @ariaLabel="composer.cancel" />
 
               {{#if this.canRemoveTopicFeaturedLink}}
-                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
+                <a href {{on "click" this.removeFeaturedLink}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{this.featuredLinkDomain}}
                 </a>
@@ -61,13 +61,13 @@
 
             {{#if this.model.details.loaded}}
               <TopicStatus @topic={{this.model}} />
-              <a href={{this.model.url}} {{action "jumpTop"}} class="fancy-title">
+              <a href={{this.model.url}} {{on "click" this.jumpTop}} class="fancy-title">
                 {{html-safe this.model.fancyTitle}}
               </a>
             {{/if}}
 
             {{#if this.model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
+              <a href {{on "click" this.editTopic}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
 
             <PluginOutlet @name="topic-title-suffix" @tagName="" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
index e4d7d361b4..c33c0d3bd1 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
@@ -7,12 +7,12 @@
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
   <span class="tag-sort-count {{if this.sortedByCount "active"}}">
-    <a href {{action "sortByCount"}}>
+    <a href {{on "click" this.sortByCount}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
   <span class="tag-sort-name {{if this.sortedByName "active"}}">
-    <a href {{action "sortById"}}>
+    <a href {{on "click" this.sortById}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
   </span>
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index dc086f0c10..6e72246280 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -9,7 +9,7 @@
 
     {{#if (gt this.incomingCount 0)}}
       <div class="show-mores">
-        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix="latest" @count={{this.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index fa522ce8b2..d036d2111e 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -32,7 +32,7 @@
             {{/if}}
             {{#if this.model.number_of_suspensions}}
               <div>
-                <a href {{action "showSuspensions"}}>
+                <a href {{on "click" this.showSuspensions}}>
                   <span class="suspensions">{{this.model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index 8f44b4d76e..09f3e59226 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -52,12 +52,12 @@ acceptance("Plugin Outlet - Connector Class", function (needs) {
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hello`
     ] = hbs`<span class='hello-username'>{{model.username}}</span>
-        <button class='say-hello' {{action "sayHello"}}></button>
+        <button class='say-hello' {{on "click" (action "sayHello")}}></button>
         <span class='hello-result'>{{hello}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hi`
-    ] = hbs`<button class='say-hi' {{action "sayHi"}}></button>
+    ] = hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
         <span class='hi-result'>{{hi}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index 09f9a135f7..b9bf541d09 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -148,25 +148,6 @@ acceptance("User menu", function (needs) {
       exists(".user-menu"),
       "clicking on the same item again closes the menu"
     );
-
-    await click(".d-header-icons .current-user");
-    await click("#user-menu-button-review-queue");
-    // this may not be ideal because it actually attempts to open a new tab
-    // which gets blocked by the browser, but otherwise it seems harmless and
-    // doesn't cause the test to fail. if it causes problems for you, feel free
-    // to remove the ctrl+click tests.
-    await click("#quick-access-review-queue li.reviewable.reviewed a", {
-      ctrlKey: true,
-    });
-    assert.strictEqual(
-      currentURL(),
-      "/review/17",
-      "ctrl-clicking on an item doesn't navigate to a new page"
-    );
-    assert.ok(
-      exists(".user-menu"),
-      "ctrl-clicking on an item doesn't close the menu"
-    );
   });
 
   test("tabs have title attributes", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
index d5ca5e5197..a75d7721a1 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE!!!
 // Update it by running `rake javascript:update_constants`
 
+
 export const NOTIFICATION_TYPES = {
   mentioned: 1,
   replied: 2,
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
index ddad59ca69..f3b1ffe139 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,4 @@
-<div {{action "onSelectedNameClick"}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
+<div {{on "click" this.onSelectedNameClick}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
   <div class="body">
     {{this.badge}}
     {{d-icon "times"}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
index 8e21aee4b5..c3a26a8e0e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
@@ -1,4 +1,4 @@
-<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{action this.selectKit.deselect this.item}} class="btn btn-default selected-choice {{this.extraClass}}">
+<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{on "click" (fn this.selectKit.deselect this.item)}} class="btn btn-default selected-choice {{this.extraClass}}">
   {{d-icon "times"}}
   {{#if (has-block)}}
     {{yield}}
diff --git a/app/assets/javascripts/wizard/addon/components/styling-preview.js b/app/assets/javascripts/wizard/addon/components/styling-preview.js
index cfe53afb0c..e44bc99846 100644
--- a/app/assets/javascripts/wizard/addon/components/styling-preview.js
+++ b/app/assets/javascripts/wizard/addon/components/styling-preview.js
@@ -205,12 +205,14 @@ export default createPreviewComponent(628, 322, {
   },
 
   @action
-  setPreviewHomepage() {
+  setPreviewHomepage(event) {
+    event?.preventDefault();
     this.set("previewTopic", false);
   },
 
   @action
-  setPreviewTopic() {
+  setPreviewTopic(event) {
+    event?.preventDefault();
     this.set("previewTopic", true);
   },
 });
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-step.js b/app/assets/javascripts/wizard/addon/components/wizard-step.js
index 4e77594618..64999e25b0 100644
--- a/app/assets/javascripts/wizard/addon/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/addon/components/wizard-step.js
@@ -134,12 +134,14 @@ export default Component.extend({
   },
 
   @action
-  quit() {
+  quit(event) {
+    event?.preventDefault();
     this.router.transitionTo("discovery.latest");
   },
 
   @action
-  exitEarly() {
+  exitEarly(event) {
+    event?.preventDefault();
     const step = this.step;
     step.validate();
 
@@ -156,7 +158,9 @@ export default Component.extend({
   },
 
   @action
-  backStep() {
+  backStep(event) {
+    event?.preventDefault();
+
     if (this.saving) {
       return;
     }
@@ -165,7 +169,9 @@ export default Component.extend({
   },
 
   @action
-  nextStep() {
+  nextStep(event) {
+    event?.preventDefault();
+
     if (this.saving) {
       return;
     }
diff --git a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
index 4d49d4febd..3c9b1736c9 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
@@ -9,10 +9,10 @@
 </div>
 
 <div class="preview-nav">
-  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{action "setPreviewTopic"}}>
+  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{on "click" this.setPreviewTopic}}>
     {{i18n "wizard.previews.topic_preview"}}
   </a>
-  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{action "setPreviewHomepage"}}>
+  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{on "click" this.setPreviewHomepage}}>
     {{i18n "wizard.previews.homepage_preview"}}
   </a>
 </div>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
index 96fd2e985d..3026476686 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
@@ -49,31 +49,31 @@
   <div class="wizard-container__buttons">
 
     {{#if this.showNextButton}}
-      <button {{action "nextStep"}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
+      <button {{on "click" this.nextStep}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
         {{i18n this.nextButtonLabel}}
       </button>
     {{/if}}
 
     {{#if this.showFinishButton}}
-      <button {{action "exitEarly"}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
+      <button {{on "click" this.exitEarly}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
         {{i18n "wizard.jump_in"}}
       </button>
     {{/if}}
 
     {{#if this.showJumpInButton}}
-      <button {{action "quit"}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
+      <button {{on "click" this.quit}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
         {{i18n this.jumpInButtonLabel}}
       </button>
     {{/if}}
   </div>
 
   <div class="wizard-container__step-progress">
-    <a href {{action "backStep"}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
+    <a href {{on "click" this.backStep}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
 
     <span class="wizard-container__step-text">{{bound-i18n "wizard.step-text"}}</span>
     <span class="wizard-container__step-count">{{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}</span>
 
-    <a href {{action "nextStep"}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
+    <a href {{on "click" this.nextStep}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
 
   </div>
 
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index a09212713c..5b473f6e5e 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -210,7 +210,7 @@ task 'javascript:update_constants' => :environment do
 
   emoji_buttons = groups_json.map do |group|
     <<~HTML
-			<button type="button" data-section="#{group["name"]}" {{action this.onCategorySelection "#{group["name"]}"}} class="btn btn-default category-button emoji">
+			<button type="button" data-section="#{group["name"]}" {{on "click" (fn this.onCategorySelection "#{group["name"]}")}} class="btn btn-default category-button emoji">
 				 {{replace-emoji ":#{group["tabicon"]}:"}}
 			</button>
     HTML
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 400489e895..426f2ab4d6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -1,7 +1,7 @@
 /* global Pikaday:true */
 import computed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { Promise } from "rsvp";
@@ -306,6 +306,12 @@ export default Component.extend({
     return dateTime.isValid() ? dateTime.format("LLLL") : emptyText;
   },
 
+  @action
+  updateFormat(format, event) {
+    event?.preventDefault();
+    this.format = format;
+  },
+
   actions: {
     setTime(event) {
       this._setTimeIfValid(event.target.value, "time");
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 390e4ece95..d18cf61fab 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -115,7 +115,7 @@
           <ul class="formats">
             {{#each this.previewedFormats as |previewedFormat|}}
               <li class="format">
-                <a class="moment-format" href {{action (mut this.format) previewedFormat.format}}>
+                <a class="moment-format" href {{on "click" (fn this.updateFormat previewedFormat.format)}}>
                   {{previewedFormat.format}}
                 </a>
                 <span class="previewed-format">
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
index 04a51d762e..5b4f34f446 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
@@ -398,4 +398,10 @@ export default Controller.extend(ModalFunctionality, {
   removeOption(option) {
     this.pollOptions.removeObject(option);
   },
+
+  @action
+  updatePollType(pollType, event) {
+    event?.preventDefault();
+    this.pollType = pollType;
+  },
 });
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 6bfd6cb1ba..e2f24afa90 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,15 +1,15 @@
 <DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
   <div class="input-group poll-type">
-    <a href {{action (mut this.pollType) "regular"}} class="poll-type-value {{if this.isRegular "active"}}">
+    <a href {{on "click" (fn this.updatePollType "regular")}} class="poll-type-value {{if this.isRegular "active"}}">
       {{i18n "poll.ui_builder.poll_type.regular"}}
     </a>
 
-    <a href {{action (mut this.pollType) "multiple"}} class="poll-type-value {{if this.isMultiple "active"}}">
+    <a href {{on "click" (fn this.updatePollType "multiple")}} class="poll-type-value {{if this.isMultiple "active"}}">
       {{i18n "poll.ui_builder.poll_type.multiple"}}
     </a>
 
     {{#if this.showNumber}}
-      <a href {{action (mut this.pollType) "number"}} class="poll-type-value {{if this.isNumber "active"}}">
+      <a href {{on "click" (fn this.updatePollType "number")}} class="poll-type-value {{if this.isNumber "active"}}">
         {{i18n "poll.ui_builder.poll_type.number"}}
       </a>
     {{/if}}

From 585c584fdb41fdb7ee086435c089bf845ad21098 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 4 Oct 2022 12:27:26 +0100
Subject: [PATCH 041/332] Revert "DEV: Remove usage of `{{action}}` modifiers
 (#18333)" (#18469)

This reverts commit ba27ee16376c961c93a4e3854b038a42f9577613.

We found some issues with handling of cmd/ctrl/shift + click on `<a` elements
---
 .template-lintrc.js                           |   1 -
 .../addon/components/admin-editable-field.js  |  14 +-
 .../addon/components/admin-theme-editor.js    |  33 ++---
 .../admin/addon/components/ip-lookup.js       |  12 +-
 .../addon/components/themes-list-item.js      |   9 +-
 .../addon/controllers/admin-badges/show.js    |   6 -
 .../addon/controllers/admin-email-bounced.js  |   7 -
 .../controllers/admin-email-preview-digest.js |  12 +-
 .../addon/controllers/admin-email-rejected.js |   7 -
 .../admin-logs-screened-ip-addresses.js       |  17 +--
 .../admin-logs-staff-action-logs.js           | 121 ++++++++----------
 .../admin-web-hooks-show-events.js            |  33 +++--
 .../modals/admin-uploaded-image-list.js       |  11 +-
 .../addon/templates/admin-badges/show.hbs     |   4 +-
 .../components/admin-editable-field.hbs       |   4 +-
 .../components/admin-theme-editor.hbs         |   6 +-
 .../addon/templates/components/ip-lookup.hbs  |   2 +-
 .../templates/components/themes-list-item.hbs |   2 +-
 .../admin/addon/templates/email-bounced.hbs   |   4 +-
 .../addon/templates/email-preview-digest.hbs  |   4 +-
 .../admin/addon/templates/email-rejected.hbs  |   4 +-
 .../templates/logs/screened-ip-addresses.hbs  |   2 +-
 .../templates/logs/staff-action-logs.hbs      |  20 +--
 .../modal/admin-uploaded-image-list.hbs       |   2 +-
 .../addon/templates/web-hooks-show-events.hbs |   2 +-
 .../app/components/categories-only.js         |   3 +-
 .../app/components/category-permission-row.js |  11 +-
 .../app/components/choose-message.js          |  15 ++-
 .../app/components/composer-messages.js       |  12 +-
 .../app/components/edit-category-tab.js       |  16 +--
 .../discourse/app/components/emoji-picker.js  |   3 +-
 .../app/components/group-card-contents.js     |  23 +---
 .../components/group-imap-email-settings.js   |   3 +-
 .../discourse/app/components/group-member.js  |  10 +-
 .../components/group-smtp-email-settings.js   |   3 +-
 .../discourse/app/components/mobile-nav.js    |  41 +++---
 .../app/components/navigation-bar.js          |  43 +++----
 .../app/components/reviewable-item.js         |  47 +++----
 .../app/components/reviewable-post-edits.js   |  25 ++--
 .../app/components/reviewable-queued-post.js  |   9 +-
 .../app/components/search-result-entry.js     |   1 -
 .../app/components/second-factor-form.js      |  21 ++-
 .../app/components/security-key-form.js       |  13 +-
 .../discourse/app/components/signup-cta.js    |  12 +-
 .../discourse/app/components/tag-info.js      |  71 +++++-----
 .../app/components/topic-list-item.js         |   2 -
 .../app/components/user-card-contents.js      |  16 +--
 .../discourse/app/controllers/auth-token.js   |  11 +-
 .../app/controllers/avatar-selector.js        |  17 +--
 .../discourse/app/controllers/composer.js     |  43 +++----
 .../app/controllers/discovery/categories.js   |  19 ++-
 .../app/controllers/discovery/topics.js       |  21 ++-
 .../app/controllers/full-page-search.js       |  33 +++--
 .../discourse/app/controllers/history.js      |  29 ++---
 .../discourse/app/controllers/login.js        | 111 ++++++++--------
 .../app/controllers/password-reset.js         |  13 +-
 .../app/controllers/preferences/account.js    |  28 ++--
 .../controllers/preferences/second-factor.js  |  40 +++---
 .../app/controllers/preferences/security.js   |  98 +++++++-------
 .../app/controllers/second-factor-add-totp.js |   9 +-
 .../app/controllers/second-factor-auth.js     |   3 +-
 .../discourse/app/controllers/tag-show.js     |   3 +-
 .../discourse/app/controllers/tags-index.js   |  37 +++---
 .../discourse/app/controllers/topic.js        |  87 ++++++-------
 .../controllers/user-private-messages-tags.js |  34 +++--
 .../app/controllers/user-topics-list.js       |   4 +-
 .../discourse/app/controllers/user.js         |  16 +--
 .../templates/components/categories-only.hbs  |   2 +-
 .../components/category-permission-row.hbs    |   2 +-
 .../templates/components/choose-message.hbs   |   2 +-
 .../components/edit-category-tab.hbs          |   2 +-
 .../components/emoji-group-buttons.hbs        |  18 +--
 .../app/templates/components/emoji-picker.hbs |   6 +-
 .../templates/components/flag-action-type.hbs |   4 +-
 .../components/group-card-contents.hbs        |   8 +-
 .../components/group-imap-email-settings.hbs  |   2 +-
 .../group-manage-email-settings.hbs           |   4 +-
 .../app/templates/components/group-member.hbs |   2 +-
 .../components/group-smtp-email-settings.hbs  |   2 +-
 .../templates/components/login-buttons.hbs    |   2 +-
 .../templates/components/reviewable-item.hbs  |   2 +-
 .../components/reviewable-post-edits.hbs      |   2 +-
 .../components/reviewable-queued-post.hbs     |   2 +-
 .../components/search-result-entry.hbs        |   2 +-
 .../components/second-factor-form.hbs         |   2 +-
 .../components/security-key-form.hbs          |   2 +-
 .../templates/components/selected-posts.hbs   |   6 +-
 .../app/templates/components/signup-cta.hbs   |   2 +-
 .../app/templates/components/tag-info.hbs     |   6 +-
 .../components/user-card-contents.hbs         |   6 +-
 .../discourse/app/templates/composer.hbs      |  10 +-
 .../templates/composer/dominating-topic.hbs   |   2 +-
 .../app/templates/composer/education.hbs      |   2 +-
 .../app/templates/composer/get-a-room.hbs     |   2 +-
 .../templates/composer/group-mentioned.hbs    |   2 +-
 .../app/templates/composer/similar-topics.hbs |   2 +-
 .../app/templates/discovery/categories.hbs    |   2 +-
 .../app/templates/discovery/topics.hbs        |   2 +-
 .../app/templates/full-page-search.hbs        |   2 +-
 .../mobile/components/categories-only.hbs     |   2 +-
 .../mobile/components/mobile-nav.hbs          |   2 +-
 .../mobile/components/navigation-bar.hbs      |   2 +-
 .../app/templates/mobile/discovery/topics.hbs |   2 +-
 .../app/templates/mobile/modal/login.hbs      |   4 +-
 .../app/templates/modal/auth-token.hbs        |   2 +-
 .../app/templates/modal/avatar-selector.hbs   |   2 +-
 .../discourse/app/templates/modal/history.hbs |   6 +-
 .../app/templates/modal/insert-hyperlink.hbs  |   2 +-
 .../discourse/app/templates/modal/login.hbs   |   4 +-
 .../modal/second-factor-add-totp.hbs          |   2 +-
 .../app/templates/password-reset.hbs          |   2 +-
 .../templates/preferences-second-factor.hbs   |   2 +-
 .../app/templates/preferences/account.hbs     |   2 +-
 .../app/templates/preferences/security.hbs    |   6 +-
 .../app/templates/second-factor-auth.hbs      |   2 +-
 .../discourse/app/templates/tag/show.hbs      |   2 +-
 .../discourse/app/templates/tags/index.hbs    |   4 +-
 .../discourse/app/templates/topic.hbs         |   6 +-
 .../templates/user-private-messages-tags.hbs  |   4 +-
 .../app/templates/user-topics-list.hbs        |   2 +-
 .../discourse/app/templates/user.hbs          |   2 +-
 .../plugin-outlet-connector-class-test.js     |   4 +-
 .../tests/acceptance/user-menu-test.js        |  19 +++
 .../fixtures/concerns/notification-types.js   |   1 -
 .../multi-select/selected-category.hbs        |   2 +-
 .../templates/components/selected-choice.hbs  |   2 +-
 .../addon/components/styling-preview.js       |   6 +-
 .../wizard/addon/components/wizard-step.js    |  14 +-
 .../templates/components/styling-preview.hbs  |   4 +-
 .../templates/components/wizard-step.hbs      |  10 +-
 lib/tasks/javascript.rake                     |   2 +-
 .../discourse-local-dates-create-form.js      |   8 +-
 .../discourse-local-dates-create-form.hbs     |   2 +-
 .../controllers/poll-ui-builder.js            |   6 -
 .../templates/modal/poll-ui-builder.hbs       |   6 +-
 135 files changed, 730 insertions(+), 929 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b5095385b2..e3fc07b48d 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,7 +3,6 @@ module.exports = {
   extends: "discourse:recommended",
 
   rules: {
-    "no-action-modifiers": true,
     "no-capital-arguments": false, // TODO: we extensively use `args` argument name
     "no-curly-component-invocation": {
       allow: [
diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
index 892a3208e8..993a3ed675 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
@@ -1,6 +1,4 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
-
 export default Component.extend({
   tagName: "",
 
@@ -12,14 +10,12 @@ export default Component.extend({
     this.set("editing", false);
   },
 
-  @action
-  edit(event) {
-    event?.preventDefault();
-    this.set("buffer", this.value);
-    this.toggleProperty("editing");
-  },
-
   actions: {
+    edit() {
+      this.set("buffer", this.value);
+      this.toggleProperty("editing");
+    },
+
     save() {
       // Action has to toggle 'editing' property.
       this.action(this.buffer);
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index de8f063579..014055c149 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -3,7 +3,6 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { isDocumentRTL } from "discourse/lib/text-direction";
-import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 
 export default Component.extend({
@@ -92,26 +91,15 @@ export default Component.extend({
     return this.theme.getError(target, fieldName);
   },
 
-  @action
-  toggleShowAdvanced(event) {
-    event?.preventDefault();
-    this.toggleProperty("showAdvanced");
-  },
-
-  @action
-  toggleAddField(event) {
-    event?.preventDefault();
-    this.toggleProperty("addingField");
-  },
-
-  @action
-  toggleMaximize(event) {
-    event?.preventDefault();
-    this.toggleProperty("maximized");
-    next(() => this.appEvents.trigger("ace:resize"));
-  },
-
   actions: {
+    toggleShowAdvanced() {
+      this.toggleProperty("showAdvanced");
+    },
+
+    toggleAddField() {
+      this.toggleProperty("addingField");
+    },
+
     cancelAddField() {
       this.set("addingField", false);
     },
@@ -126,6 +114,11 @@ export default Component.extend({
       this.fieldAdded(this.currentTargetName, name);
     },
 
+    toggleMaximize() {
+      this.toggleProperty("maximized");
+      next(() => this.appEvents.trigger("ace:resize"));
+    },
+
     onlyOverriddenChanged(value) {
       this.onlyOverriddenChanged(value);
     },
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js
index 02a5240564..222e04b9ab 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js
@@ -1,6 +1,6 @@
 import AdminUser from "admin/models/admin-user";
 import Component from "@ember/component";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import copyText from "discourse/lib/copy-text";
@@ -21,12 +21,6 @@ export default Component.extend({
     return Math.max(visible, total);
   },
 
-  @action
-  hide(event) {
-    event?.preventDefault();
-    this.set("show", false);
-  },
-
   actions: {
     lookup() {
       this.set("show", true);
@@ -61,6 +55,10 @@ export default Component.extend({
       }
     },
 
+    hide() {
+      this.set("show", false);
+    },
+
     copy() {
       let text = `IP: ${this.ip}\n`;
       const location = this.location;
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js
index 29158c4496..e2237e249b 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js
@@ -3,7 +3,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { escape } from "pretty-text/sanitizer";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import { action } from "@ember/object";
 
 const MAX_COMPONENTS = 4;
 
@@ -60,9 +59,9 @@ export default Component.extend({
     return childrenCount - MAX_COMPONENTS;
   },
 
-  @action
-  toggleChildrenExpanded(event) {
-    event?.preventDefault();
-    this.toggleProperty("childrenExpanded");
+  actions: {
+    toggleChildrenExpanded() {
+      this.toggleProperty("childrenExpanded");
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
index 5b098387ef..2b38081826 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
@@ -133,12 +133,6 @@ export default class AdminBadgesShowController extends Controller.extend(
     this.buffered.set("image_url", null);
   }
 
-  @action
-  showPreview(badge, explain, event) {
-    event?.preventDefault();
-    this.send("preview", badge, explain);
-  }
-
   @action
   save() {
     if (!this.saving) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
index c7a8ec98a6..1500549564 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
@@ -2,15 +2,8 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
-  @action
-  handleShowIncomingEmail(id, event) {
-    event?.preventDefault();
-    this.send("showIncomingEmail", id);
-  },
-
   @observes("filter.{status,user,address,type}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
index 84f85eea6d..50d74d35d8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
@@ -1,7 +1,7 @@
 import { empty, notEmpty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
-import { action, get } from "@ember/object";
+import { get } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 
@@ -14,12 +14,6 @@ export default Controller.extend({
   showSendEmailForm: notEmpty("model.html_content"),
   htmlEmpty: empty("model.html_content"),
 
-  @action
-  toggleShowHtml(event) {
-    event?.preventDefault();
-    this.toggleProperty("showHtml");
-  },
-
   actions: {
     updateUsername(selected) {
       this.set("username", get(selected, "firstObject"));
@@ -45,6 +39,10 @@ export default Controller.extend({
       });
     },
 
+    toggleShowHtml() {
+      this.toggleProperty("showHtml");
+    },
+
     sendEmail() {
       this.set("sendingEmail", true);
       this.set("sentEmail", false);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
index 6e4ce78656..89c67f3cf9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
@@ -3,7 +3,6 @@ import { INPUT_DELAY } from "discourse-common/config/environment";
 import IncomingEmail from "admin/models/incoming-email";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
@@ -11,12 +10,6 @@ export default AdminEmailLogsController.extend({
     discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
   },
 
-  @action
-  handleShowIncomingEmail(id, event) {
-    event?.preventDefault();
-    this.send("showIncomingEmail", id);
-  },
-
   actions: {
     loadMore() {
       this.loadLogs(IncomingEmail, true);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
index bc11ec51f4..0e8b43f9c1 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
@@ -6,7 +6,6 @@ import discourseDebounce from "discourse-common/lib/debounce";
 import { exportEntity } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 import { outputExportResult } from "discourse/lib/export-result";
-import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
@@ -27,15 +26,6 @@ export default Controller.extend({
     discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
   },
 
-  @action
-  edit(record, event) {
-    event?.preventDefault();
-    if (!record.get("editing")) {
-      this.set("savedIpAddress", record.get("ip_address"));
-    }
-    record.set("editing", true);
-  },
-
   actions: {
     allow(record) {
       record.set("action_name", "do_nothing");
@@ -47,6 +37,13 @@ export default Controller.extend({
       record.save();
     },
 
+    edit(record) {
+      if (!record.get("editing")) {
+        this.set("savedIpAddress", record.get("ip_address"));
+      }
+      record.set("editing", true);
+    },
+
     cancel(record) {
       const savedIpAddress = this.savedIpAddress;
       if (savedIpAddress && record.get("editing")) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index a8a297d47c..670d48c17b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -31,13 +31,11 @@ export default Controller.extend({
         this.set(
           "userHistoryActions",
           result.extras.user_history_actions
-            .map((historyAction) => ({
-              id: historyAction.id,
-              action_id: historyAction.action_id,
-              name: I18n.t(
-                "admin.logs.staff_actions.actions." + historyAction.id
-              ),
-              name_raw: historyAction.id,
+            .map((action) => ({
+              id: action.id,
+              action_id: action.action_id,
+              name: I18n.t("admin.logs.staff_actions.actions." + action.id),
+              name_raw: action.id,
             }))
             .sort((a, b) => a.name.localeCompare(b.name))
         );
@@ -77,74 +75,61 @@ export default Controller.extend({
     this.scheduleRefresh();
   },
 
-  @action
-  filterActionIdChanged(filterActionId) {
-    if (filterActionId) {
-      this.changeFilters({
-        action_name: filterActionId,
-        action_id: this.userHistoryActions.findBy("id", filterActionId)
-          .action_id,
-      });
-    }
-  },
+  actions: {
+    filterActionIdChanged(filterActionId) {
+      if (filterActionId) {
+        this.changeFilters({
+          action_name: filterActionId,
+          action_id: this.userHistoryActions.findBy("id", filterActionId)
+            .action_id,
+        });
+      }
+    },
 
-  @action
-  clearFilter(key, event) {
-    event?.preventDefault();
-    if (key === "actionFilter") {
+    clearFilter(key) {
+      if (key === "actionFilter") {
+        this.set("filterActionId", null);
+        this.changeFilters({
+          action_name: null,
+          action_id: null,
+          custom_type: null,
+        });
+      } else {
+        this.changeFilters({ [key]: null });
+      }
+    },
+
+    clearAllFilters() {
       this.set("filterActionId", null);
+      this.resetFilters();
+    },
+
+    filterByAction(logItem) {
       this.changeFilters({
-        action_name: null,
-        action_id: null,
-        custom_type: null,
+        action_name: logItem.get("action_name"),
+        action_id: logItem.get("action"),
+        custom_type: logItem.get("custom_type"),
       });
-    } else {
-      this.changeFilters({ [key]: null });
-    }
-  },
+    },
 
-  @action
-  clearAllFilters(event) {
-    event?.preventDefault();
-    this.set("filterActionId", null);
-    this.resetFilters();
-  },
+    filterByStaffUser(acting_user) {
+      this.changeFilters({ acting_user: acting_user.username });
+    },
 
-  @action
-  filterByAction(logItem, event) {
-    event?.preventDefault();
-    this.changeFilters({
-      action_name: logItem.get("action_name"),
-      action_id: logItem.get("action"),
-      custom_type: logItem.get("custom_type"),
-    });
-  },
+    filterByTargetUser(target_user) {
+      this.changeFilters({ target_user: target_user.username });
+    },
 
-  @action
-  filterByStaffUser(acting_user, event) {
-    event?.preventDefault();
-    this.changeFilters({ acting_user: acting_user.username });
-  },
+    filterBySubject(subject) {
+      this.changeFilters({ subject });
+    },
 
-  @action
-  filterByTargetUser(target_user, event) {
-    event?.preventDefault();
-    this.changeFilters({ target_user: target_user.username });
-  },
+    exportStaffActionLogs() {
+      exportEntity("staff_action").then(outputExportResult);
+    },
 
-  @action
-  filterBySubject(subject, event) {
-    event?.preventDefault();
-    this.changeFilters({ subject });
-  },
-
-  @action
-  exportStaffActionLogs() {
-    exportEntity("staff_action").then(outputExportResult);
-  },
-
-  @action
-  loadMore() {
-    this.model.loadMore();
+    loadMore() {
+      this.model.loadMore();
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
index 84b7650ff1..71990f47a3 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
@@ -1,6 +1,5 @@
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -44,23 +43,6 @@ export default Controller.extend({
     }
   },
 
-  @action
-  showInserted(event) {
-    event?.preventDefault();
-    const webHookId = this.get("model.extras.web_hook_id");
-
-    ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
-      type: "GET",
-      data: { ids: this.incomingEventIds },
-    }).then((data) => {
-      const objects = data.map((webHookEvent) =>
-        this.store.createRecord("web-hook-event", webHookEvent)
-      );
-      this.model.unshiftObjects(objects);
-      this.set("incomingEventIds", []);
-    });
-  },
-
   actions: {
     loadMore() {
       this.model.loadMore();
@@ -79,5 +61,20 @@ export default Controller.extend({
         popupAjaxError(error);
       });
     },
+
+    showInserted() {
+      const webHookId = this.get("model.extras.web_hook_id");
+
+      ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
+        type: "GET",
+        data: { ids: this.incomingEventIds },
+      }).then((data) => {
+        const objects = data.map((event) =>
+          this.store.createRecord("web-hook-event", event)
+        );
+        this.model.unshiftObjects(objects);
+        this.set("incomingEventIds", []);
+      });
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
index 8a60037a5b..7ab4cb6984 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
@@ -1,6 +1,5 @@
 import { observes, on } from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
@@ -11,17 +10,15 @@ export default Controller.extend(ModalFunctionality, {
     this.set("images", value && value.length ? value.split("|") : []);
   },
 
-  @action
-  remove(url, event) {
-    event?.preventDefault();
-    this.images.removeObject(url);
-  },
-
   actions: {
     uploadDone({ url }) {
       this.images.addObject(url);
     },
 
+    remove(url) {
+      this.images.removeObject(url);
+    },
+
     close() {
       this.save(this.images.join("|"));
       this.send("closeModal");
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index 82492beecb..31b16af4cc 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -88,9 +88,9 @@
       </div>
 
       {{#if this.hasQuery}}
-        <a href {{on "click" (fn this.showPreview this.buffered "false")}}>{{i18n "admin.badges.preview.link_text"}}</a>
+        <a href {{action "preview" this.buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{on "click" (fn this.showPreview this.buffered "true")}}>{{i18n "admin.badges.preview.plan_text"}}</a>
+        <a href {{action "preview" this.buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
         {{#if this.preview_loading}}
           {{i18n "loading"}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
index 998174f20a..d62cfdbd78 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
@@ -3,7 +3,7 @@
   {{#if this.editing}}
     <TextField @value={{this.buffer}} @autofocus="autofocus" @autocomplete="off" />
   {{else}}
-    <a href {{on "click" this.edit}} class="inline-editable-field">
+    <a href {{action "edit"}} class="inline-editable-field">
       <span>{{this.value}}</span>
     </a>
   {{/if}}
@@ -11,7 +11,7 @@
 <div class="controls">
   {{#if this.editing}}
     <DButton @class="btn-default" @action={{action "save"}} @label="admin.user_fields.save" />
-    <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
+    <a href {{action "edit"}}>{{i18n "cancel"}}</a>
   {{else}}
     <DButton @class="btn-default" @action={{action "edit"}} @icon="pencil-alt" />
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
index a8c33e1da2..ec8ed70f30 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
@@ -13,7 +13,7 @@
 
       {{#if this.allowAdvanced}}
         <li>
-          <a {{on "click" this.toggleShowAdvanced}}
+          <a {{action "toggleShowAdvanced"}}
             href
             title={{i18n (concat "admin.customize.theme." (if this.showAdvanced "hide_advanced" "show_advanced"))}}
             class="no-text">
@@ -52,7 +52,7 @@
             <DButton @class="ok" @action={{action "addField" this.newFieldName}} @icon="check" />
             <DButton @class="cancel" @action={{action "cancelAddField"}} @icon="times" />
           {{else}}
-            <a href {{on "click" this.toggleAddField}} class="no-text">
+            <a href {{action "toggleAddField" this.currentTargetName}} class="no-text">
               {{d-icon "plus"}}
             </a>
           {{/if}}
@@ -61,7 +61,7 @@
 
       <li class="spacer"></li>
       <li>
-        <a href {{on "click" this.toggleMaximize}} class="no-text">
+        <a href {{action "toggleMaximize"}} class="no-text">
           {{d-icon this.maximizeIcon}}
         </a>
       </li>
diff --git a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
index 31ec7f35a7..f63ab16730 100644
--- a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 {{#if this.show}}
   <div class="location-box">
-    <a href class="close pull-right" {{on "click" this.hide}}>{{d-icon "times"}}</a>
+    <a href class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
     {{#if this.copied}}
       <DButton @class="btn-hover pull-right" @icon="copy" @label="ip_lookup.copied" />
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
index 21678c1a43..1710a14454 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
@@ -31,7 +31,7 @@
       <span class="components">{{html-safe this.childrenString}}</span>
 
       {{#if this.displayHasMore}}
-        <a href {{on "click" this.toggleChildrenExpanded}} class="others-count">
+        <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if this.childrenExpanded}}
             {{i18n "admin.customize.theme.collapse"}}
           {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
index 6a47751d00..cf6ceb81bc 100644
--- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
@@ -30,7 +30,7 @@
           <td class="email-address"><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           <td>
             {{#if l.has_bounce_key}}
-              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}}>
+              <a href {{action "showIncomingEmail" l.id}}>
                 {{l.email_type}}
               </a>
             {{else}}
@@ -39,7 +39,7 @@
           </td>
           <td class="email-details">
             {{#if l.has_bounce_key}}
-              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}} title={{i18n "admin.email.details_title"}}>
+              <a href {{action "showIncomingEmail" l.id}} title={{i18n "admin.email.details_title"}}>
                 {{d-icon "info-circle"}}
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index b00332840d..d2ee4cad4d 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -15,11 +15,11 @@
         {{#if this.showHtml}}
           <span>{{i18n "admin.email.html"}}</span>
           |
-          <a href {{on "click" this.toggleShowHtml}}>
+          <a href {{action "toggleShowHtml"}}>
             {{i18n "admin.email.text"}}
           </a>
         {{else}}
-          <a href {{on "click" this.toggleShowHtml}}>{{i18n "admin.email.html"}}</a> |
+          <a href {{action "toggleShowHtml"}}>{{i18n "admin.email.html"}}</a> |
           <span>{{i18n "admin.email.text"}}</span>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
index 19033f5f6f..21dcbba21d 100644
--- a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
@@ -48,10 +48,10 @@
           </td>
           <td>{{email.subject}}</td>
           <td class="error">
-            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}}>{{email.error}}</a>
+            <a href {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
           </td>
           <td class="email-details">
-            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}} title={{i18n "admin.email.details_title"}}>
+            <a href {{action "showIncomingEmail" email.id}} title={{i18n "admin.email.details_title"}}>
               {{d-icon "info-circle"}}
             </a>
           </td>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index ab20b2316b..63489dcdee 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -27,7 +27,7 @@
               {{#if item.editing}}
                 <TextField @value={{item.ip_address}} @autofocus="autofocus" />
               {{else}}
-                <a href {{on "click" (fn this.edit item)}} class="inline-editable-field">
+                <a href {{action "edit" item}} class="inline-editable-field">
                   {{#if item.isRange}}
                     <strong>{{item.ip_address}}</strong>
                   {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index d2e46867c9..bcee25b439 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -1,29 +1,29 @@
 <div class="staff-action-logs-controls">
   {{#if this.filtersExists}}
     <div class="staff-action-logs-filters">
-      <a href {{on "click" this.clearAllFilters}} class="clear-filters filter btn">
+      <a href {{action "clearAllFilters"}} class="clear-filters filter btn">
         <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
       {{#if this.actionFilter}}
-        <a href {{on "click" (fn this.clearFilter "actionFilter")}} class="filter btn">
+        <a href {{action "clearFilter" "actionFilter"}} class="filter btn">
           <span class="label">{{i18n "admin.logs.action"}}</span>: {{this.actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.acting_user}}
-        <a href {{on "click" (fn this.clearFilter "acting_user")}} class="filter btn">
+        <a href {{action "clearFilter" "acting_user"}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{this.filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.target_user}}
-        <a href {{on "click" (fn this.clearFilter "target_user")}} class="filter btn">
+        <a href {{action "clearFilter" "target_user"}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{this.filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.subject}}
-        <a href {{on "click" (fn this.clearFilter "subject")}} class="filter btn">
+        <a href {{action "clearFilter" "subject"}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{this.filters.subject}}
           {{d-icon "times-circle"}}
         </a>
@@ -71,16 +71,16 @@
                 </div>
               </td>
               <td class="col value action">
-                <a href {{on "click" (fn this.filterByAction item)}}>{{item.actionName}}</a>
+                <a href {{action "filterByAction" item}}>{{item.actionName}}</a>
               </td>
               <td class="col value subject">
                 <div class="subject">
                   {{#if item.target_user}}
                     <LinkTo @route="adminUser" @model={{item.target_user}}>{{avatar item.target_user imageSize="tiny"}}</LinkTo>
-                    <a href {{on "click" (fn this.filterByTargetUser item.target_user)}}>{{item.target_user.username}}</a>
+                    <a href {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
                   {{/if}}
                   {{#if item.subject}}
-                    <a href {{on "click" (fn this.filterBySubject item.subject)}} title={{item.subject}}>{{item.subject}}</a>
+                    <a href {{action "filterBySubject" item.subject}} title={{item.subject}}>{{item.subject}}</a>
                   {{/if}}
                 </div>
               </td>
@@ -89,10 +89,10 @@
                 <div>
                   {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
-                    <a href {{on "click" (fn this.showCustomDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
-                    <a href {{on "click" (fn this.showDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
               </td>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
index aca6fef6f4..a7aefa7371 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
@@ -1,7 +1,7 @@
 <DModalBody @class="uploaded-image-list">
   <div class="selectable-avatars">
     {{#each this.images as |image|}}
-      <a href class="selectable-avatar" {{on "click" (fn this.remove image)}}>
+      <a href class="selectable-avatar" {{action "remove" image}}>
         {{bound-avatar-template image "huge"}}
       </a>
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
index c9791f0fc4..2b5c768def 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
@@ -21,7 +21,7 @@
           <div class="clearfix"></div>
         </div>
         {{#if this.hasIncoming}}
-          <a href tabindex="0" {{on "click" this.showInserted}} class="alert alert-info clickable">
+          <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
             <CountI18n @key="admin.web_hooks.events.incoming" @count={{this.incomingCount}} />
           </a>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js
index d480f46455..002ddf82e3 100644
--- a/app/assets/javascripts/discourse/app/components/categories-only.js
+++ b/app/assets/javascripts/discourse/app/components/categories-only.js
@@ -50,8 +50,7 @@ export default Component.extend({
   },
 
   @action
-  toggleShowMuted(event) {
-    event?.preventDefault();
+  toggleShowMuted() {
     this.toggleProperty("showMuted");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.js b/app/assets/javascripts/discourse/app/components/category-permission-row.js
index 46eb3690f9..2e41aa6e63 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.js
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.js
@@ -1,4 +1,3 @@
-import { action } from "@ember/object";
 import { alias, equal } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
@@ -93,13 +92,11 @@ export default Component.extend({
     this.category.updatePermission(this.group_name, type);
   },
 
-  @action
-  removeRow(event) {
-    event?.preventDefault();
-    this.category.removePermission(this.group_name);
-  },
-
   actions: {
+    removeRow() {
+      this.category.removePermission(this.group_name);
+    },
+
     setPermissionReply() {
       if (this.type <= PermissionType.CREATE_POST) {
         this.updatePermission(PermissionType.READONLY);
diff --git a/app/assets/javascripts/discourse/app/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
index 15f0424f60..09d9a9123c 100644
--- a/app/assets/javascripts/discourse/app/components/choose-message.js
+++ b/app/assets/javascripts/discourse/app/components/choose-message.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { action, get } from "@ember/object";
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
@@ -63,11 +63,12 @@ export default Component.extend({
     );
   },
 
-  @action
-  chooseMessage(message, event) {
-    event?.preventDefault();
-    const messageId = get(message, "id");
-    this.set("selectedTopicId", messageId);
-    next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
+  actions: {
+    chooseMessage(message) {
+      const messageId = get(message, "id");
+      this.set("selectedTopicId", messageId);
+      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
+      return false;
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index 275d1c534c..40832b5df1 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,5 +1,5 @@
 import Component from "@ember/component";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import LinkLookup from "discourse/lib/link-lookup";
 import { not } from "@ember/object/computed";
@@ -54,13 +54,11 @@ export default Component.extend({
     this.set("messageCount", messages.get("length"));
   },
 
-  @action
-  closeMessage(message, event) {
-    event?.preventDefault();
-    this._removeMessage(message);
-  },
-
   actions: {
+    closeMessage(message) {
+      this._removeMessage(message);
+    },
+
     hideMessage(message) {
       this._removeMessage(message);
       // kind of hacky but the visibility depends on this
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
index 5619e8c753..e96720db36 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -2,7 +2,6 @@ import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
 import { empty } from "@ember/object/computed";
 import getURL from "discourse-common/lib/get-url";
 import { propertyEqual } from "discourse/lib/computed";
@@ -50,12 +49,13 @@ export default Component.extend({
     return getURL(`/c/${slugPart}/edit/${this.tab}`);
   },
 
-  @action
-  select(event) {
-    event?.preventDefault();
-    this.set("selectedTab", this.tab);
-    if (!this.newCategory) {
-      DiscourseURL.routeTo(this.fullSlug);
-    }
+  actions: {
+    select() {
+      this.set("selectedTab", this.tab);
+
+      if (!this.newCategory) {
+        DiscourseURL.routeTo(this.fullSlug);
+      }
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index 8a5dec83a6..3e0646f893 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -240,8 +240,7 @@ export default Component.extend({
   },
 
   @action
-  onCategorySelection(sectionName, event) {
-    event?.preventDefault();
+  onCategorySelection(sectionName) {
     const section = document.querySelector(
       `.emoji-picker-emoji-area .section[data-section="${sectionName}"]`
     );
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index 8c7e5d93c5..cb073a6733 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -1,4 +1,3 @@
-import { action } from "@ember/object";
 import { alias, gt } from "@ember/object/computed";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -71,22 +70,11 @@ export default Component.extend(CardContentsBase, CleansUp, {
     this._close();
   },
 
-  @action
-  close(event) {
-    event?.preventDefault();
-    this._close();
-  },
-
-  @action
-  handleShowGroup(group, event) {
-    event?.preventDefault();
-    // Invokes `showGroup` argument. Convert to `this.args.showGroup` when
-    // refactoring this to a glimmer component.
-    this.showGroup(group);
-    this._close();
-  },
-
   actions: {
+    close() {
+      this._close();
+    },
+
     cancelFilter() {
       const postStream = this.postStream;
       postStream.cancelFilter();
@@ -102,7 +90,8 @@ export default Component.extend(CardContentsBase, CleansUp, {
     },
 
     showGroup(group) {
-      this.handleShowGroup(group);
+      this.showGroup(group);
+      this._close();
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
index a437f42d44..190a9fb2f9 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
@@ -53,8 +53,7 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider, event) {
-    event?.preventDefault();
+  prefillSettings(provider) {
     this.form.setProperties(emailProviderDefaultSettings(provider, "imap"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/group-member.js b/app/assets/javascripts/discourse/app/components/group-member.js
index 08d1097b42..64b2570dee 100644
--- a/app/assets/javascripts/discourse/app/components/group-member.js
+++ b/app/assets/javascripts/discourse/app/components/group-member.js
@@ -1,12 +1,10 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
-
 export default Component.extend({
   classNames: ["item"],
 
-  @action
-  remove(event) {
-    event?.preventDefault();
-    this.removeAction(this.member);
+  actions: {
+    remove() {
+      this.removeAction(this.member);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
index d4b4bcb9de..5456c75a79 100644
--- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
@@ -43,8 +43,7 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider, event) {
-    event?.preventDefault();
+  prefillSettings(provider) {
     this.form.setProperties(emailProviderDefaultSettings(provider, "smtp"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js
index f0ea3e6138..bdbb2cc85a 100644
--- a/app/assets/javascripts/discourse/app/components/mobile-nav.js
+++ b/app/assets/javascripts/discourse/app/components/mobile-nav.js
@@ -1,6 +1,5 @@
 import { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import deprecated from "discourse-common/lib/deprecated";
@@ -57,27 +56,27 @@ export default Component.extend({
     this.router.off("routeDidChange", this, this.currentRouteChanged);
   },
 
-  @action
-  toggleExpanded(event) {
-    event?.preventDefault();
-    this.toggleProperty("expanded");
+  actions: {
+    toggleExpanded() {
+      this.toggleProperty("expanded");
 
-    next(() => {
-      if (this.expanded) {
-        $(window)
-          .off("click.mobile-nav")
-          .on("click.mobile-nav", (e) => {
-            if (!this.element || this.isDestroying || this.isDestroyed) {
-              return;
-            }
+      next(() => {
+        if (this.expanded) {
+          $(window)
+            .off("click.mobile-nav")
+            .on("click.mobile-nav", (e) => {
+              if (!this.element || this.isDestroying || this.isDestroyed) {
+                return;
+              }
 
-            const expander = this.element.querySelector(".expander");
-            if (expander && e.target !== expander) {
-              this.set("expanded", false);
-              $(window).off("click.mobile-nav");
-            }
-          });
-      }
-    });
+              const expander = this.element.querySelector(".expander");
+              if (expander && e.target !== expander) {
+                this.set("expanded", false);
+                $(window).off("click.mobile-nav");
+              }
+            });
+        }
+      });
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index 5ede7b2bf4..ab9a5b9c71 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -1,6 +1,5 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import DiscourseURL from "discourse/lib/url";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import { next } from "@ember/runloop";
@@ -62,33 +61,33 @@ export default Component.extend(FilterModeMixin, {
     DiscourseURL.appEvents.off("dom:clean", this, this.ensureDropClosed);
   },
 
-  @action
-  toggleDrop(event) {
-    event?.preventDefault();
-    this.set("expanded", !this.expanded);
+  actions: {
+    toggleDrop() {
+      this.set("expanded", !this.expanded);
 
-    if (this.expanded) {
-      DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
+      if (this.expanded) {
+        DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-      next(() => {
-        if (!this.expanded) {
-          return;
-        }
+        next(() => {
+          if (!this.expanded) {
+            return;
+          }
 
-        $(this.element.querySelector(".drop a")).on("click", () => {
-          this.element.querySelector(".drop").style.display = "none";
+          $(this.element.querySelector(".drop a")).on("click", () => {
+            this.element.querySelector(".drop").style.display = "none";
 
-          next(() => {
-            this.ensureDropClosed();
+            next(() => {
+              this.ensureDropClosed();
+            });
+            return true;
           });
-          return true;
-        });
 
-        $(window).on("click.navigation-bar", () => {
-          this.ensureDropClosed();
-          return true;
+          $(window).on("click.navigation-bar", () => {
+            this.ensureDropClosed();
+            return true;
+          });
         });
-      });
-    }
+      }
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 73c90d665a..ff67e672a8 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -7,7 +7,7 @@ import { classify, dasherize } from "@ember/string";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { action, set } from "@ember/object";
+import { set } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 let _components = {};
@@ -121,7 +121,7 @@ export default Component.extend({
   },
 
   @bind
-  _performConfirmed(performableAction) {
+  _performConfirmed(action) {
     let reviewable = this.reviewable;
 
     let performAction = () => {
@@ -140,7 +140,7 @@ export default Component.extend({
       });
 
       return ajax(
-        `/review/${reviewable.id}/perform/${performableAction.id}?version=${version}`,
+        `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
         {
           type: "PUT",
           data,
@@ -173,16 +173,13 @@ export default Component.extend({
         .finally(() => this.set("updating", false));
     };
 
-    if (performableAction.client_action) {
-      let actionMethod =
-        this[`client${classify(performableAction.client_action)}`];
+    if (action.client_action) {
+      let actionMethod = this[`client${classify(action.client_action)}`];
       if (actionMethod) {
         return actionMethod.call(this, reviewable, performAction);
       } else {
         // eslint-disable-next-line no-console
-        console.error(
-          `No handler for ${performableAction.client_action} found`
-        );
+        console.error(`No handler for ${action.client_action} found`);
         return;
       }
     } else {
@@ -212,16 +209,14 @@ export default Component.extend({
     }
   },
 
-  @action
-  explainReviewable(reviewable, event) {
-    event?.preventDefault();
-    showModal("explain-reviewable", {
-      title: "review.explain.title",
-      model: reviewable,
-    });
-  },
-
   actions: {
+    explainReviewable(reviewable) {
+      showModal("explain-reviewable", {
+        title: "review.explain.title",
+        model: reviewable,
+      });
+    },
+
     edit() {
       this.set("editing", true);
       this.set("_updates", { payload: {} });
@@ -264,18 +259,18 @@ export default Component.extend({
       set(this._updates, fieldId, event.target.value);
     },
 
-    perform(performableAction) {
+    perform(action) {
       if (this.updating) {
         return;
       }
 
-      let msg = performableAction.get("confirm_message");
-      let requireRejectReason = performableAction.get("require_reject_reason");
-      let customModal = performableAction.get("custom_modal");
+      let msg = action.get("confirm_message");
+      let requireRejectReason = action.get("require_reject_reason");
+      let customModal = action.get("custom_modal");
       if (msg) {
         bootbox.confirm(msg, (answer) => {
           if (answer) {
-            return this._performConfirmed(performableAction);
+            return this._performConfirmed(action);
           }
         });
       } else if (requireRejectReason) {
@@ -284,7 +279,7 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action: performableAction,
+          action,
         });
       } else if (customModal) {
         showModal(customModal, {
@@ -292,10 +287,10 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action: performableAction,
+          action,
         });
       } else {
-        return this._performConfirmed(performableAction);
+        return this._performConfirmed(action);
       }
     },
   },
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
index 75b8692a49..84c27f152f 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
@@ -1,6 +1,5 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import { longDate } from "discourse/lib/formatter";
@@ -19,18 +18,18 @@ export default Component.extend({
     return longDate(updatedAt);
   },
 
-  @action
-  showEditHistory(event) {
-    event?.preventDefault();
-    let postId = this.get("reviewable.post_id");
-    this.store.find("post", postId).then((post) => {
-      let historyController = showModal("history", {
-        model: post,
-        modalClass: "history-modal",
+  actions: {
+    showEditHistory() {
+      let postId = this.get("reviewable.post_id");
+      this.store.find("post", postId).then((post) => {
+        let historyController = showModal("history", {
+          model: post,
+          modalClass: "history-modal",
+        });
+        historyController.refresh(postId, "latest");
+        historyController.set("post", post);
+        historyController.set("topicController", null);
       });
-      historyController.refresh(postId, "latest");
-      historyController.set("post", post);
-      historyController.set("topicController", null);
-    });
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
index d06ddf3c1c..e40ab39ef7 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
@@ -1,11 +1,10 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
-  @action
-  showRawEmail(event) {
-    event?.preventDefault();
-    showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
+  actions: {
+    showRawEmail() {
+      showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.js b/app/assets/javascripts/discourse/app/components/search-result-entry.js
index deeaee7825..9312174ed1 100644
--- a/app/assets/javascripts/discourse/app/components/search-result-entry.js
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.js
@@ -11,7 +11,6 @@ export default Component.extend({
 
   @action
   logClick(topicId) {
-    // Important: Don't prevent default handling of clicks
     if (this.searchLogId && topicId) {
       logSearchLinkClick({
         searchLogId: this.searchLogId,
diff --git a/app/assets/javascripts/discourse/app/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js
index e208a5f314..3f0c40b381 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-form.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-form.js
@@ -1,5 +1,4 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -49,15 +48,15 @@ export default Component.extend({
     );
   },
 
-  @action
-  toggleSecondFactorMethod(event) {
-    event?.preventDefault();
-    const secondFactorMethod = this.secondFactorMethod;
-    this.set("secondFactorToken", "");
-    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
-      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
-    } else {
-      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
-    }
+  actions: {
+    toggleSecondFactorMethod() {
+      const secondFactorMethod = this.secondFactorMethod;
+      this.set("secondFactorToken", "");
+      if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
+        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
+      } else {
+        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+      }
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/security-key-form.js b/app/assets/javascripts/discourse/app/components/security-key-form.js
index dcc0725113..bd6d03f9f4 100644
--- a/app/assets/javascripts/discourse/app/components/security-key-form.js
+++ b/app/assets/javascripts/discourse/app/components/security-key-form.js
@@ -1,13 +1,12 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
 export default Component.extend({
-  @action
-  useAnotherMethod(event) {
-    event?.preventDefault();
-    this.set("showSecurityKey", false);
-    this.set("showSecondFactor", true);
-    this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+  actions: {
+    useAnotherMethod() {
+      this.set("showSecurityKey", false);
+      this.set("showSecondFactor", true);
+      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js
index a4d80fd611..5ea99dffe9 100644
--- a/app/assets/javascripts/discourse/app/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/app/components/signup-cta.js
@@ -1,19 +1,15 @@
 import Component from "@ember/component";
 import discourseLater from "discourse-common/lib/later";
-import { action } from "@ember/object";
 import { on } from "@ember/object/evented";
 
 export default Component.extend({
   action: "showCreateAccount",
 
-  @action
-  neverShow(event) {
-    event?.preventDefault();
-    this.keyValueStore.setItem("anon-cta-never", "t");
-    this.session.set("showSignupCta", false);
-  },
-
   actions: {
+    neverShow() {
+      this.keyValueStore.setItem("anon-cta-never", "t");
+      this.session.set("showSignupCta", false);
+    },
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", Date.now());
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 21da9a92f1..6cb2a35dba 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -7,7 +7,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
-import { action } from "@ember/object";
 
 export default Component.extend({
   dialog: service(),
@@ -77,49 +76,19 @@ export default Component.extend({
       .catch(popupAjaxError);
   },
 
-  @action
-  edit(event) {
-    event?.preventDefault();
-    this.setProperties({
-      editing: true,
-      newTagName: this.tag.id,
-      newTagDescription: this.tagInfo.description,
-    });
-  },
-
-  @action
-  unlinkSynonym(tag, event) {
-    event?.preventDefault();
-    ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
-      type: "DELETE",
-    })
-      .then(() => this.tagInfo.synonyms.removeObject(tag))
-      .catch(popupAjaxError);
-  },
-
-  @action
-  deleteSynonym(tag, event) {
-    event?.preventDefault();
-    bootbox.confirm(
-      I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
-      (result) => {
-        if (!result) {
-          return;
-        }
-
-        tag
-          .destroyRecord()
-          .then(() => this.tagInfo.synonyms.removeObject(tag))
-          .catch(popupAjaxError);
-      }
-    );
-  },
-
   actions: {
     toggleEditControls() {
       this.toggleProperty("showEditControls");
     },
 
+    edit() {
+      this.setProperties({
+        editing: true,
+        newTagName: this.tag.id,
+        newTagDescription: this.tagInfo.description,
+      });
+    },
+
     cancelEditing() {
       this.set("editing", false);
     },
@@ -145,6 +114,30 @@ export default Component.extend({
       this.deleteAction(this.tagInfo);
     },
 
+    unlinkSynonym(tag) {
+      ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
+        type: "DELETE",
+      })
+        .then(() => this.tagInfo.synonyms.removeObject(tag))
+        .catch(popupAjaxError);
+    },
+
+    deleteSynonym(tag) {
+      bootbox.confirm(
+        I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
+        (result) => {
+          if (!result) {
+            return;
+          }
+
+          tag
+            .destroyRecord()
+            .then(() => this.tagInfo.synonyms.removeObject(tag))
+            .catch(popupAjaxError);
+        }
+      );
+    },
+
     addSynonyms() {
       bootbox.confirm(
         I18n.t("tagging.add_synonyms_explanation", {
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 2d6ce3e18f..972e824173 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -251,7 +251,6 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
-      e.preventDefault();
       return this.navigateToTopic(topic, e.target.getAttribute("href"));
     }
 
@@ -265,7 +264,6 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
-      e.preventDefault();
       return this.navigateToTopic(topic, topic.lastUnreadUrl);
     }
 
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index f114a1abf5..930f77a8c1 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,4 +1,4 @@
-import EmberObject, { action, set } from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 import { alias, and, gt, gte, not, or } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -220,15 +220,6 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     this._close();
   },
 
-  @action
-  handleShowUser(user, event) {
-    event?.preventDefault();
-    // Invokes `showUser` argument. Convert to `this.args.showUser` when
-    // refactoring this to a glimmer component.
-    this.showUser(user);
-    this._close();
-  },
-
   actions: {
     close() {
       this._close();
@@ -256,8 +247,9 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
       this._close();
     },
 
-    showUser(user) {
-      this.handleShowUser(user);
+    showUser(username) {
+      this.showUser(username);
+      this._close();
     },
 
     checkEmail(user) {
diff --git a/app/assets/javascripts/discourse/app/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
index 52ddce5f4d..2d8c91157a 100644
--- a/app/assets/javascripts/discourse/app/controllers/auth-token.js
+++ b/app/assets/javascripts/discourse/app/controllers/auth-token.js
@@ -1,7 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
-import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { userPath } from "discourse/lib/url";
 
@@ -18,13 +17,11 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
-  @action
-  toggleExpanded(event) {
-    event?.preventDefault();
-    this.set("expanded", !this.expanded);
-  },
-
   actions: {
+    toggleExpanded() {
+      this.set("expanded", !this.expanded);
+    },
+
     highlightSecure() {
       this.send("closeModal");
 
diff --git a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
index d63f464c2a..8373b7a106 100644
--- a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
@@ -1,5 +1,4 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
@@ -133,15 +132,6 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
-  @action
-  selectAvatar(url, event) {
-    event?.preventDefault();
-    this.user
-      .selectAvatar(url)
-      .then(() => window.location.reload())
-      .catch(popupAjaxError);
-  },
-
   actions: {
     uploadComplete() {
       this.set("selected", "custom");
@@ -169,6 +159,13 @@ export default Controller.extend(ModalFunctionality, {
         .finally(() => this.set("gravatarRefreshDisabled", false));
     },
 
+    selectAvatar(url) {
+      this.user
+        .selectAvatar(url)
+        .then(() => window.location.reload())
+        .catch(popupAjaxError);
+    },
+
     saveAvatarSelection() {
       const selectedUploadId = this.selectedUploadId;
       const type = this.selected;
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 61a986d64f..3463f6f1d7 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -508,32 +508,11 @@ export default Controller.extend({
     this.set("model.showFullScreenExitPrompt", false);
   },
 
-  @action
-  async cancel(event) {
-    event?.preventDefault();
-    await this.cancelComposer();
-  },
-
-  @action
-  cancelUpload(event) {
-    event?.preventDefault();
-    this.set("model.uploadCancelled", true);
-  },
-
-  @action
-  togglePreview(event) {
-    event?.preventDefault();
-    this.toggleProperty("showPreview");
-  },
-
-  @action
-  viewNewReply(event) {
-    event?.preventDefault();
-    DiscourseURL.routeTo(this.get("model.createdPost.url"));
-    this.close();
-  },
-
   actions: {
+    togglePreview() {
+      this.toggleProperty("showPreview");
+    },
+
     closeComposer() {
       this.close();
     },
@@ -564,6 +543,10 @@ export default Controller.extend({
       });
     },
 
+    cancelUpload() {
+      this.set("model.uploadCancelled", true);
+    },
+
     onPopupMenuAction(menuAction) {
       this.send(menuAction);
     },
@@ -724,6 +707,10 @@ export default Controller.extend({
       this.set("model.loading", false);
     },
 
+    async cancel() {
+      await this.cancelComposer();
+    },
+
     save(ignore, event) {
       this.save(false, {
         jump:
@@ -1288,6 +1275,12 @@ export default Controller.extend({
     }
   },
 
+  viewNewReply() {
+    DiscourseURL.routeTo(this.get("model.createdPost.url"));
+    this.close();
+    return false;
+  },
+
   async destroyDraft(draftSequence = null) {
     const key = this.get("model.draftKey");
     if (!key) {
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
index 1e07f67cb9..c46f41c1c8 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
@@ -1,6 +1,5 @@
 import DiscoveryController from "discourse/controllers/discovery";
 import { inject as controller } from "@ember/controller";
-import { action } from "@ember/object";
 import { dasherize } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
@@ -51,19 +50,17 @@ export default DiscoveryController.extend({
         : style;
     return dasherize(componentName);
   },
-
-  @action
-  showInserted(event) {
-    event?.preventDefault();
-    const tracker = this.topicTrackingState;
-    // Move inserted into topics
-    this.model.loadBefore(tracker.get("newIncoming"), true);
-    tracker.resetTracking();
-  },
-
   actions: {
     refresh() {
       this.send("triggerRefresh");
     },
+    showInserted() {
+      const tracker = this.topicTrackingState;
+
+      // Move inserted into topics
+      this.model.loadBefore(tracker.get("newIncoming"), true);
+      tracker.resetTracking();
+      return false;
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index 3e90fd42a8..a0037f4da5 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -63,17 +63,6 @@ const controllerOpts = {
     return this._isFilterPage(filter, "new") && topicsLength > 0;
   },
 
-  // Show newly inserted topics
-  @action
-  showInserted(event) {
-    event?.preventDefault();
-    const tracker = this.topicTrackingState;
-
-    // Move inserted into topics
-    this.model.loadBefore(tracker.get("newIncoming"), true);
-    tracker.resetTracking();
-  },
-
   actions: {
     changeSort() {
       deprecated(
@@ -83,6 +72,16 @@ const controllerOpts = {
       return routeAction("changeSort", this.router._router, ...arguments)();
     },
 
+    // Show newly inserted topics
+    showInserted() {
+      const tracker = this.topicTrackingState;
+
+      // Move inserted into topics
+      this.model.loadBefore(tracker.get("newIncoming"), true);
+      tracker.resetTracking();
+      return false;
+    },
+
     refresh(options = { skipResettingParams: [] }) {
       const filter = this.get("model.filter");
       this.send("resetParams", options.skipResettingParams);
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index a7cf017c6a..e082ca9d29 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -14,7 +14,6 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { escapeExpression } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
-import { action } from "@ember/object";
 import { gt, or } from "@ember/object/computed";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTransient } from "discourse/lib/page-tracker";
@@ -392,24 +391,22 @@ export default Controller.extend({
     }
   },
 
-  @action
-  createTopic(searchTerm, event) {
-    event?.preventDefault();
-    let topicCategory;
-    if (searchTerm.includes("category:")) {
-      const match = searchTerm.match(/category:(\S*)/);
-      if (match && match[1]) {
-        topicCategory = match[1];
-      }
-    }
-    this.composer.open({
-      action: Composer.CREATE_TOPIC,
-      draftKey: Composer.NEW_TOPIC_KEY,
-      topicCategory,
-    });
-  },
-
   actions: {
+    createTopic(searchTerm) {
+      let topicCategory;
+      if (searchTerm.includes("category:")) {
+        const match = searchTerm.match(/category:(\S*)/);
+        if (match && match[1]) {
+          topicCategory = match[1];
+        }
+      }
+      this.composer.open({
+        action: Composer.CREATE_TOPIC,
+        draftKey: Composer.NEW_TOPIC_KEY,
+        topicCategory,
+      });
+    },
+
     selectAll() {
       this.selected.addObjects(this.get("model.posts").mapBy("topic"));
 
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 00e64f86da..2540c78b54 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -1,4 +1,3 @@
-import { action } from "@ember/object";
 import { alias, equal, gt, not, or } from "@ember/object/computed";
 import discourseComputed, {
   observes,
@@ -314,24 +313,6 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  @action
-  displayInline(event) {
-    event?.preventDefault();
-    this.set("viewMode", "inline");
-  },
-
-  @action
-  displaySideBySide(event) {
-    event?.preventDefault();
-    this.set("viewMode", "side_by_side");
-  },
-
-  @action
-  displaySideBySideMarkdown(event) {
-    event?.preventDefault();
-    this.set("viewMode", "side_by_side_markdown");
-  },
-
   actions: {
     loadFirstVersion() {
       this.refresh(this.get("model.post_id"), this.get("model.first_revision"));
@@ -364,5 +345,15 @@ export default Controller.extend(ModalFunctionality, {
     revertToVersion() {
       this.revert(this.post, this.get("model.current_revision"));
     },
+
+    displayInline() {
+      this.set("viewMode", "inline");
+    },
+    displaySideBySide() {
+      this.set("viewMode", "side_by_side");
+    },
+    displaySideBySideMarkdown() {
+      this.set("viewMode", "side_by_side_markdown");
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 401c85f354..1a5a4ecc7f 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -3,7 +3,7 @@ import { alias, not, or, readOnly } from "@ember/object/computed";
 import { areCookiesEnabled, escapeExpression } from "discourse/lib/utilities";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { next, schedule } from "@ember/runloop";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -133,66 +133,7 @@ export default Controller.extend(ModalFunctionality, {
     return canLoginLocalWithEmail;
   },
 
-  @action
-  emailLogin(event) {
-    event?.preventDefault();
-
-    if (this.processingEmailLink) {
-      return;
-    }
-
-    if (isEmpty(this.loginName)) {
-      this.flash(I18n.t("login.blank_username"), "info");
-      return;
-    }
-
-    this.set("processingEmailLink", true);
-
-    ajax("/u/email-login", {
-      data: { login: this.loginName.trim() },
-      type: "POST",
-    })
-      .then((data) => {
-        const loginName = escapeExpression(this.loginName);
-        const isEmail = loginName.match(/@/);
-        let key = `email_login.complete_${isEmail ? "email" : "username"}`;
-        if (data.user_found === false) {
-          this.flash(
-            I18n.t(`${key}_not_found`, {
-              email: loginName,
-              username: loginName,
-            }),
-            "error"
-          );
-        } else {
-          let postfix = data.hide_taken ? "" : "_found";
-          this.flash(
-            I18n.t(`${key}${postfix}`, {
-              email: loginName,
-              username: loginName,
-            })
-          );
-        }
-      })
-      .catch((e) => this.flash(extractError(e), "error"))
-      .finally(() => this.set("processingEmailLink", false));
-  },
-
-  @action
-  handleForgotPassword(event) {
-    event?.preventDefault();
-    const forgotPasswordController = this.forgotPassword;
-    if (forgotPasswordController) {
-      forgotPasswordController.set("accountEmailOrUsername", this.loginName);
-    }
-    this.send("showForgotPassword");
-  },
-
   actions: {
-    forgotPassword() {
-      this.handleForgotPassword();
-    },
-
     login() {
       if (this.loginDisabled) {
         return;
@@ -356,6 +297,56 @@ export default Controller.extend(ModalFunctionality, {
       this.send("showCreateAccount");
     },
 
+    forgotPassword() {
+      const forgotPasswordController = this.forgotPassword;
+      if (forgotPasswordController) {
+        forgotPasswordController.set("accountEmailOrUsername", this.loginName);
+      }
+      this.send("showForgotPassword");
+    },
+
+    emailLogin() {
+      if (this.processingEmailLink) {
+        return;
+      }
+
+      if (isEmpty(this.loginName)) {
+        this.flash(I18n.t("login.blank_username"), "info");
+        return;
+      }
+
+      this.set("processingEmailLink", true);
+
+      ajax("/u/email-login", {
+        data: { login: this.loginName.trim() },
+        type: "POST",
+      })
+        .then((data) => {
+          const loginName = escapeExpression(this.loginName);
+          const isEmail = loginName.match(/@/);
+          let key = `email_login.complete_${isEmail ? "email" : "username"}`;
+          if (data.user_found === false) {
+            this.flash(
+              I18n.t(`${key}_not_found`, {
+                email: loginName,
+                username: loginName,
+              }),
+              "error"
+            );
+          } else {
+            let postfix = data.hide_taken ? "" : "_found";
+            this.flash(
+              I18n.t(`${key}${postfix}`, {
+                email: loginName,
+                username: loginName,
+              })
+            );
+          }
+        })
+        .catch((e) => this.flash(extractError(e), "error"))
+        .finally(() => this.set("processingEmailLink", false));
+    },
+
     authenticateSecurityKey() {
       getWebauthnCredential(
         this.securityKeyChallenge,
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index 0787a28271..bae85083a8 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,5 +1,4 @@
 import DiscourseURL, { userPath } from "discourse/lib/url";
-import { action } from "@ember/object";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -47,13 +46,6 @@ export default Controller.extend(PasswordValidation, {
 
   lockImageUrl: getURL("/images/lock.svg"),
 
-  @action
-  done(event) {
-    event?.preventDefault();
-    this.set("redirected", true);
-    DiscourseURL.redirectTo(this.redirectTo || "/");
-  },
-
   actions: {
     submit() {
       ajax({
@@ -134,5 +126,10 @@ export default Controller.extend(PasswordValidation, {
         }
       );
     },
+
+    done() {
+      this.set("redirected", true);
+      DiscourseURL.redirectTo(this.redirectTo || "/");
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 94ba197cfd..6c3051d452 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -2,7 +2,7 @@ import { gt, not, or } from "@ember/object/computed";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
@@ -132,20 +132,6 @@ export default Controller.extend(CanCheckEmails, {
     return findAll().length > 0;
   },
 
-  @action
-  resendConfirmationEmail(email, event) {
-    event?.preventDefault();
-    email.set("resending", true);
-    this.model
-      .addEmail(email.email)
-      .then(() => {
-        email.set("resent", true);
-      })
-      .finally(() => {
-        email.set("resending", false);
-      });
-  },
-
   actions: {
     save() {
       this.set("saved", false);
@@ -171,6 +157,18 @@ export default Controller.extend(CanCheckEmails, {
       this.model.destroyEmail(email);
     },
 
+    resendConfirmationEmail(email) {
+      email.set("resending", true);
+      this.model
+        .addEmail(email.email)
+        .then(() => {
+          email.set("resent", true);
+        })
+        .finally(() => {
+          email.set("resending", false);
+        });
+    },
+
     delete() {
       this.dialog.alert({
         message: I18n.t("user.delete_account_confirm"),
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index fc5293054a..946903a568 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -3,7 +3,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
-import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -92,27 +91,6 @@ export default Controller.extend(CanCheckEmails, {
     this.set("dirty", true);
   },
 
-  @action
-  resetPassword(event) {
-    event?.preventDefault();
-
-    this.setProperties({
-      resetPasswordLoading: true,
-      resetPasswordProgress: "",
-    });
-
-    return this.model
-      .changePassword()
-      .then(() => {
-        this.set(
-          "resetPasswordProgress",
-          I18n.t("user.change_password.success")
-        );
-      })
-      .catch(popupAjaxError)
-      .finally(() => this.set("resetPasswordLoading", false));
-  },
-
   actions: {
     confirmPassword() {
       if (!this.password) {
@@ -123,6 +101,24 @@ export default Controller.extend(CanCheckEmails, {
       this.set("password", null);
     },
 
+    resetPassword() {
+      this.setProperties({
+        resetPasswordLoading: true,
+        resetPasswordProgress: "",
+      });
+
+      return this.model
+        .changePassword()
+        .then(() => {
+          this.set(
+            "resetPasswordProgress",
+            I18n.t("user.change_password.success")
+          );
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("resetPasswordLoading", false));
+    },
+
     disableAllSecondFactors() {
       if (this.loading) {
         return;
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/security.js b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
index 800d597c65..c1e7dc52c0 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/security.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
@@ -1,5 +1,4 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -52,56 +51,6 @@ export default Controller.extend(CanCheckEmails, {
     DEFAULT_AUTH_TOKENS_COUNT
   ),
 
-  @action
-  changePassword(event) {
-    event?.preventDefault();
-    if (!this.passwordProgress) {
-      this.set("passwordProgress", I18n.t("user.change_password.in_progress"));
-      return this.model
-        .changePassword()
-        .then(() => {
-          // password changed
-          this.setProperties({
-            changePasswordProgress: false,
-            passwordProgress: I18n.t("user.change_password.success"),
-          });
-        })
-        .catch(() => {
-          // password failed to change
-          this.setProperties({
-            changePasswordProgress: false,
-            passwordProgress: I18n.t("user.change_password.error"),
-          });
-        });
-    }
-  },
-
-  @action
-  toggleShowAllAuthTokens(event) {
-    event?.preventDefault();
-    this.toggleProperty("showAllAuthTokens");
-  },
-
-  @action
-  revokeAuthToken(token, event) {
-    event?.preventDefault();
-    ajax(
-      userPath(
-        `${this.get("model.username_lower")}/preferences/revoke-auth-token`
-      ),
-      {
-        type: "POST",
-        data: token ? { token_id: token.id } : {},
-      }
-    )
-      .then(() => {
-        if (!token) {
-          logout();
-        } // All sessions revoked
-      })
-      .catch(popupAjaxError);
-  },
-
   actions: {
     save() {
       this.set("saved", false);
@@ -111,6 +60,53 @@ export default Controller.extend(CanCheckEmails, {
         .catch(popupAjaxError);
     },
 
+    changePassword() {
+      if (!this.passwordProgress) {
+        this.set(
+          "passwordProgress",
+          I18n.t("user.change_password.in_progress")
+        );
+        return this.model
+          .changePassword()
+          .then(() => {
+            // password changed
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.success"),
+            });
+          })
+          .catch(() => {
+            // password failed to change
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.error"),
+            });
+          });
+      }
+    },
+
+    toggleShowAllAuthTokens() {
+      this.toggleProperty("showAllAuthTokens");
+    },
+
+    revokeAuthToken(token) {
+      ajax(
+        userPath(
+          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+        ),
+        {
+          type: "POST",
+          data: token ? { token_id: token.id } : {},
+        }
+      )
+        .then(() => {
+          if (!token) {
+            logout();
+          } // All sessions revoked
+        })
+        .catch(popupAjaxError);
+    },
+
     showToken(token) {
       showModal("auth-token", { model: token });
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
index 2ed9127535..bdc1f3511d 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
@@ -1,5 +1,4 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -41,15 +40,9 @@ export default Controller.extend(ModalFunctionality, {
       .finally(() => this.set("loading", false));
   },
 
-  @action
-  enableShowSecondFactorKey(event) {
-    event?.preventDefault();
-    this.set("showSecondFactorKey", true);
-  },
-
   actions: {
     showSecondFactorKey() {
-      this.enableShowSecondFactorKey();
+      this.set("showSecondFactorKey", true);
     },
 
     enableSecondFactor() {
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
index f4199f9ee9..8e88afdf95 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
@@ -212,8 +212,7 @@ export default Controller.extend({
   },
 
   @action
-  useAnotherMethod(newMethod, event) {
-    event?.preventDefault();
+  useAnotherMethod(newMethod) {
     this.set("userSelectedMethod", newMethod);
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index 2f9c493516..619c5e860d 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -110,8 +110,7 @@ export default DiscoverySortableController.extend(
     },
 
     @action
-    showInserted(event) {
-      event?.preventDefault();
+    showInserted() {
       const tracker = this.topicTrackingState;
       this.list.loadBefore(tracker.newIncoming, true);
       tracker.resetTracking();
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index eff2f1d30b..ec56d24003 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -1,4 +1,3 @@
-import { action } from "@ember/object";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -42,27 +41,23 @@ export default Controller.extend({
     };
   },
 
-  @action
-  sortByCount(event) {
-    event?.preventDefault();
-    this.setProperties({
-      sortProperties: ["totalCount:desc", "id"],
-      sortedByCount: true,
-      sortedByName: false,
-    });
-  },
-
-  @action
-  sortById(event) {
-    event?.preventDefault();
-    this.setProperties({
-      sortProperties: ["id"],
-      sortedByCount: false,
-      sortedByName: true,
-    });
-  },
-
   actions: {
+    sortByCount() {
+      this.setProperties({
+        sortProperties: ["totalCount:desc", "id"],
+        sortedByCount: true,
+        sortedByName: false,
+      });
+    },
+
+    sortById() {
+      this.setProperties({
+        sortProperties: ["id"],
+        sortedByCount: false,
+        sortedByName: true,
+      });
+    },
+
     showUploader() {
       showModal("tag-upload");
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 913362255e..aace5530cb 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -313,55 +313,6 @@ export default Controller.extend(bufferedProperty("model"), {
       });
   },
 
-  @action
-  editTopic(event) {
-    event?.preventDefault();
-    if (this.get("model.details.can_edit")) {
-      this.set("editingTopic", true);
-    }
-  },
-
-  @action
-  jumpTop(event) {
-    event?.preventDefault();
-    DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
-      skipIfOnScreen: false,
-      keepFilter: true,
-    });
-  },
-
-  @action
-  removeFeaturedLink(event) {
-    event?.preventDefault();
-    this.set("buffered.featured_link", null);
-  },
-
-  @action
-  selectAll(event) {
-    event?.preventDefault();
-    const smallActionsPostIds = this._smallActionPostIds();
-    this.set("selectedPostIds", [
-      ...this.get("model.postStream.stream").filter(
-        (postId) => !smallActionsPostIds.has(postId)
-      ),
-    ]);
-    this._forceRefreshPostStream();
-  },
-
-  @action
-  deselectAll(event) {
-    event?.preventDefault();
-    this.set("selectedPostIds", []);
-    this._forceRefreshPostStream();
-  },
-
-  @action
-  toggleMultiSelect(event) {
-    event?.preventDefault();
-    this.toggleProperty("multiSelect");
-    this._forceRefreshPostStream();
-  },
-
   actions: {
     topicCategoryChanged(categoryId) {
       this.set("buffered.category_id", categoryId);
@@ -871,6 +822,13 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostNumber(postNumber);
     },
 
+    jumpTop() {
+      DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
+        skipIfOnScreen: false,
+        keepFilter: true,
+      });
+    },
+
     jumpBottom() {
       // When a topic only has one lengthy post
       const jumpEnd = this.model.highest_post_number === 1 ? true : false;
@@ -901,6 +859,26 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostId(postId);
     },
 
+    toggleMultiSelect() {
+      this.toggleProperty("multiSelect");
+      this._forceRefreshPostStream();
+    },
+
+    selectAll() {
+      const smallActionsPostIds = this._smallActionPostIds();
+      this.set("selectedPostIds", [
+        ...this.get("model.postStream.stream").filter(
+          (postId) => !smallActionsPostIds.has(postId)
+        ),
+      ]);
+      this._forceRefreshPostStream();
+    },
+
+    deselectAll() {
+      this.set("selectedPostIds", []);
+      this._forceRefreshPostStream();
+    },
+
     togglePostSelection(post) {
       const selected = this.selectedPostIds;
       selected.includes(post.id)
@@ -995,6 +973,13 @@ export default Controller.extend(bufferedProperty("model"), {
         .then(() => this.updateQueryParams);
     },
 
+    editTopic() {
+      if (this.get("model.details.can_edit")) {
+        this.set("editingTopic", true);
+      }
+      return false;
+    },
+
     cancelEditingTopic() {
       this.set("editingTopic", false);
       this.rollbackBuffer();
@@ -1174,6 +1159,10 @@ export default Controller.extend(bufferedProperty("model"), {
         .catch(popupAjaxError);
     },
 
+    removeFeaturedLink() {
+      this.set("buffered.featured_link", null);
+    },
+
     resetBumpDate() {
       this.model.resetBumpDate();
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
index b73149358f..9d4f536866 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
@@ -1,29 +1,25 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
-
 export default Controller.extend({
   sortProperties: ["count:desc", "id"],
   tagsForUser: null,
   sortedByCount: true,
   sortedByName: false,
 
-  @action
-  sortByCount(event) {
-    event?.preventDefault();
-    this.setProperties({
-      sortProperties: ["count:desc", "id"],
-      sortedByCount: true,
-      sortedByName: false,
-    });
-  },
+  actions: {
+    sortByCount() {
+      this.setProperties({
+        sortProperties: ["count:desc", "id"],
+        sortedByCount: true,
+        sortedByName: false,
+      });
+    },
 
-  @action
-  sortById(event) {
-    event?.preventDefault();
-    this.setProperties({
-      sortProperties: ["id"],
-      sortedByCount: false,
-      sortedByName: true,
-    });
+    sortById() {
+      this.setProperties({
+        sortProperties: ["id"],
+        sortedByCount: false,
+        sortedByName: true,
+      });
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
index a40ab97f4e..021502f615 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
@@ -81,10 +81,10 @@ export default Controller.extend(BulkTopicSelection, {
   },
 
   @action
-  showInserted(event) {
-    event?.preventDefault();
+  showInserted() {
     this.model.loadBefore(this.pmTopicTrackingState.newIncoming);
     this.pmTopicTrackingState.resetIncomingTracking();
+    return false;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 8f2d24beb1..4c8ba40cbc 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -211,15 +211,6 @@ export default Controller.extend(CanCheckEmails, {
     }
   },
 
-  @action
-  showSuspensions(event) {
-    event?.preventDefault();
-    this.adminTools.showActionLogs(this, {
-      target_user: this.get("model.username"),
-      action_name: "suspend_user",
-    });
-  },
-
   actions: {
     collapseProfile() {
       this.set("forceExpand", false);
@@ -229,6 +220,13 @@ export default Controller.extend(CanCheckEmails, {
       this.set("forceExpand", true);
     },
 
+    showSuspensions() {
+      this.adminTools.showActionLogs(this, {
+        target_user: this.get("model.username"),
+        action_name: "suspend_user",
+      });
+    },
+
     adminDelete() {
       const userId = this.get("model.id");
       const location = document.location.pathname;
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
index 6f3be0d4a9..338e4b1cf5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
@@ -20,7 +20,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
+      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
index 4acbfc6298..16e062fda2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
@@ -1,6 +1,6 @@
 <span class="group-name">
   <span class="group-name-label">{{this.group_name}}</span>
-  <a class="remove-permission" href {{on "click" this.removeRow}}>
+  <a class="remove-permission" href {{action "removeRow"}}>
     {{d-icon "far-trash-alt"}}
   </a>
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
index c7d07e87f2..ce6c36f17d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
@@ -11,7 +11,7 @@
     {{#each this.messages as |m|}}
       <div class="controls existing-message">
         <label class="radio">
-          <input id="choose-message-{{m.id}}" {{on "click" (fn this.chooseMessage m)}} type="radio" name="choose_message_id">
+          <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
index f59b10dd5b..836736abf7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{on "click" this.select}} class={{if this.active "active"}}>{{this.title}}</a>
+<a href {{action "select"}} class={{if this.active "active"}}>{{this.title}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
index d0eac567ac..f7e48e3951 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
@@ -1,30 +1,30 @@
 {{!-- DO NOT EDIT THIS FILE!!! --}}
 {{!-- Update it by running `rake javascript:update_constants` --}}
 
-<button type="button" data-section="smileys_&_emotion" {{on "click" (fn this.onCategorySelection "smileys_&_emotion")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="smileys_&_emotion" {{action this.onCategorySelection "smileys_&_emotion"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":grinning:"}}
 </button>
-<button type="button" data-section="people_&_body" {{on "click" (fn this.onCategorySelection "people_&_body")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="people_&_body" {{action this.onCategorySelection "people_&_body"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":wave:"}}
 </button>
-<button type="button" data-section="animals_&_nature" {{on "click" (fn this.onCategorySelection "animals_&_nature")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="animals_&_nature" {{action this.onCategorySelection "animals_&_nature"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":evergreen_tree:"}}
 </button>
-<button type="button" data-section="food_&_drink" {{on "click" (fn this.onCategorySelection "food_&_drink")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="food_&_drink" {{action this.onCategorySelection "food_&_drink"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":hamburger:"}}
 </button>
-<button type="button" data-section="travel_&_places" {{on "click" (fn this.onCategorySelection "travel_&_places")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="travel_&_places" {{action this.onCategorySelection "travel_&_places"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":airplane:"}}
 </button>
-<button type="button" data-section="activities" {{on "click" (fn this.onCategorySelection "activities")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="activities" {{action this.onCategorySelection "activities"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":soccer:"}}
 </button>
-<button type="button" data-section="objects" {{on "click" (fn this.onCategorySelection "objects")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="objects" {{action this.onCategorySelection "objects"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":eyeglasses:"}}
 </button>
-<button type="button" data-section="symbols" {{on "click" (fn this.onCategorySelection "symbols")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="symbols" {{action this.onCategorySelection "symbols"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":white_check_mark:"}}
 </button>
-<button type="button" data-section="flags" {{on "click" (fn this.onCategorySelection "flags")}} class="btn btn-default category-button emoji">
+<button type="button" data-section="flags" {{action this.onCategorySelection "flags"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":checkered_flag:"}}
 </button>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index cba02e4d65..d35c0e5e2f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -4,15 +4,15 @@
     {{!-- template-lint-enable no-invalid-interactive no-down-event-binding --}}
     <div class="emoji-picker-category-buttons">
       {{#if this.recentEmojis.length}}
-        <button type="button" data-section="recent" {{on "click" (fn this.onCategorySelection "recent")}} class="btn btn-default category-button emoji">
+        <button type="button" data-section="recent" {{action "onCategorySelection" "recent"}} class="btn btn-default category-button emoji">
           {{replace-emoji ":star:"}}
         </button>
       {{/if}}
 
-      <EmojiGroupButtons @onCategorySelection={{this.onCategorySelection}} @tagName="" />
+      <EmojiGroupButtons @onCategorySelection={{action "onCategorySelection"}} @tagName="" />
 
       {{#each-in this.customEmojis as |group emojis|}}
-        <button type="button" data-section={{concat "custom-" group}} {{on "click" (fn this.onCategorySelection (concat "custom-" group))}} class="btn btn-default category-button emoji">
+        <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
           {{replace-emoji (concat ":" emojis.firstObject.code ":")}}
         </button>
       {{/each-in}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
index 6e41deadef..ba18d20f35 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
@@ -2,7 +2,7 @@
   <h3>{{this.formattedName}}</h3>
   <div class="controls">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
 
       <div class="flag-action-type-details">
         <span class="description">{{html-safe this.flag.description}}</span>
@@ -19,7 +19,7 @@
 {{else}}
   <div class="controls {{this.flag.name_key}}">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
       <div class="flag-action-type-details">
         <strong>{{this.formattedName}}</strong>
         {{#if this.showDescription}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
index f93472eaeb..a47f02deca 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
@@ -13,14 +13,14 @@
     {{else}}
       <div class="card-row first-row">
         <div class="group-card-avatar">
-          <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="card-huge-avatar">
+          <a href={{this.groupPath}} {{action "showGroup" this.group}} class="card-huge-avatar">
             <AvatarFlair @flairName={{this.group.name}} @flairUrl={{this.group.flair_url}} @flairBgColor={{this.group.flair_bg_color}} @flairColor={{this.group.flair_color}} />
           </a>
         </div>
         <div class="names">
           <span>
             <h1 class={{this.group.name}}>
-              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="group-page-link">{{this.group.name}}</a>
+              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="group-page-link">{{this.group.name}}</a>
             </h1>
             {{#if this.group.full_name}}
               <h2 class="full-name">{{this.group.full_name}}</h2>
@@ -53,10 +53,10 @@
         <div class="card-row third-row">
           <div class="members metadata">
             {{#each this.group.members as |user|}}
-              <a {{on "click" this.close}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+              <a {{action "close"}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
             {{/each}}
             {{#if this.showMoreMembers}}
-              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="more-members-link">
+              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="more-members-link">
                 <span class="more-members-count">+{{this.moreMembersCount}} {{i18n "more"}}</span>
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
index e86851cb2c..0033afdf8a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
@@ -34,7 +34,7 @@
 
   <div class="control-group">
     <div class="group-imap-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index 7c59effdfd..709ab0615e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" (action "smtpEnabledChange")}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" (action "imapEnabledChange")}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
index 703a39658a..78f084e8ff 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
@@ -3,7 +3,7 @@
 </a>
 <span>{{this.member.username}}</span>
 {{#unless this.automatic}}
-  <a href {{on "click" this.remove}} class="remove">
+  <a href {{action "remove"}} class="remove">
     {{d-icon "times"}}
   </a>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
index 68623cda2b..4263b72514 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
@@ -40,7 +40,7 @@
 
   <div class="control-group">
     <div class="group-smtp-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
index b7a0ffeba7..ab36ebbfa0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each this.buttons as |b|}}
-  <button type="button" class="btn btn-social {{b.name}}" {{on "click" (action this.externalLogin b)}} aria-label={{b.screenReaderTitle}} tabindex="3">
+  <button type="button" class="btn btn-social {{b.name}}" {{action this.externalLogin b}} aria-label={{b.screenReaderTitle}} tabindex="3">
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index d5bfb00f08..f98826d61b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -10,7 +10,7 @@
     <span class="status">
       {{reviewable-status this.reviewable.status}}
     </span>
-    <a href {{on "click" (fn this.explainReviewable this.reviewable)}} title={{i18n "review.explain.why"}} class="explain">
+    <a href {{action "explainReviewable" this.reviewable}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
index 349953e988..16df22dbb5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
@@ -1,5 +1,5 @@
 {{#if this.hasEdits}}
-  <a href {{on "click" this.showEditHistory}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
+  <a href {{action "showEditHistory"}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
     {{d-icon "pencil-alt"}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
index 39b8e7dd3a..5c18aab0cd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
@@ -6,7 +6,7 @@
   {{category-badge this.reviewable.category}}
   <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
   {{#if this.reviewable.payload.via_email}}
-    <a href {{on "click" this.showRawEmail}} class="show-raw-email">
+    <a href {{action "showRawEmail"}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
index 6e49ebe210..25a563daa0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
@@ -10,7 +10,7 @@
       <TrackSelected @selectedList={{this.selected}} @selectedId={{this.post.topic}} @class="bulk-select" />
     {{/if}}
 
-    <a href={{this.post.url}} {{on "click" (fn this.logClick this.post.topic_id)}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
+    <a href={{this.post.url}} {{action "logClick" this.post.topic_id}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
       {{raw "topic-status" topic=this.post.topic showPrivateMessageIcon=true}}
       <span class="topic-title">
         {{#if this.post.useTopicTitleHeadline}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
index 714d1b4e92..b5f1fbfbe2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
@@ -7,7 +7,7 @@
   {{yield}}
   {{#if this.showToggleMethodLink}}
     <p>
-      <a href class="toggle-second-factor-method" {{on "click" this.toggleSecondFactorMethod}}>{{ i18n this.linkText }}</a>
+      <a href="" class="toggle-second-factor-method" {{action "toggleSecondFactorMethod"}}>{{ i18n this.linkText }}</a>
     </p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
index f321e2ca05..f0f70b3c6c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
@@ -2,7 +2,7 @@
   <DButton @action={{this.action}} @icon="key" @id="security-key-authenticate-button" @label="login.security_key_authenticate" @type="button" @class="btn btn-large btn-primary" />
   <p>
     {{#if this.otherMethodAllowed}}
-      <a href class="toggle-second-factor-method" {{on "click" this.useAnotherMethod}}>{{ i18n "login.security_key_alternative" }}</a>
+      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
index 206ff4ae21..09afc7c50a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
@@ -4,7 +4,7 @@
 
 {{#if this.canSelectAll}}
   <p>
-    <a class="select-all" href {{on "click" this.selectAll}}>
+    <a class="select-all" href {{action this.selectAll}}>
       {{i18n "topic.multi_select.select_all"}}
     </a>
   </p>
@@ -12,7 +12,7 @@
 
 {{#if this.canDeselectAll}}
   <p>
-    <a href {{on "click" this.deselectAll}}>
+    <a href {{action this.deselectAll}}>
       {{i18n "topic.multi_select.deselect_all"}}
     </a>
   </p>
@@ -35,7 +35,7 @@
 {{/if}}
 
 <p class="cancel">
-  <a href {{on "click" this.toggleMultiSelect}}>
+  <a href {{action this.toggleMultiSelect}}>
     {{i18n "topic.multi_select.cancel"}}
   </a>
 </p>
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
index f6d4148d83..cf640feb23 100644
--- a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
@@ -10,7 +10,7 @@
     <div class="buttons">
       <DButton @action={{route-action "showCreateAccount"}} @label="signup_cta.sign_up" @icon="user" @class="btn-primary" />
       <DButton @action={{action "hideForSession"}} @label="signup_cta.hide_session" @class="no-icon" />
-      <a href {{on "click" this.neverShow}}>{{i18n "signup_cta.hide_forever"}}</a>
+      <a href {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index b85e1bfa28..4e1c273767 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -17,7 +17,7 @@
         <div class="tag-name-wrapper">
           {{discourse-tag this.tagInfo.name tagName="div"}}
           {{#if this.canAdminTag}}
-            <a href {{on "click" this.edit}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
+            <a href {{action "edit"}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
           {{/if}}
         </div>
         <div class="tag-description-wrapper">
@@ -56,10 +56,10 @@
             <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
               {{#if this.editSynonymsMode}}
-                <a href {{on "click" (fn this.unlinkSynonym tag)}} class="unlink-synonym">
+                <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
                   {{d-icon "unlink" title="tagging.remove_synonym"}}
                 </a>
-                <a href {{on "click" (fn this.deleteSynonym tag)}} class="delete-synonym">
+                <a href {{action "deleteSynonym" tag}} class="delete-synonym">
                   {{d-icon "far-trash-alt" title="tagging.delete_tag"}}
                 </a>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index eb422a5e39..f2614399f2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -26,7 +26,7 @@
           {{#if this.user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar this.user "huge"}}</span>
           {{else}}
-            <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
+            <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
 
           <UserAvatarFlair @user={{this.user}} />
@@ -40,7 +40,7 @@
                 {{if this.nameFirst this.user.name (format-username this.user.username)}}
               </span>
             {{else}}
-              <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="user-profile-link">
+              <a href={{this.user.path}} {{action "showUser" this.user}} class="user-profile-link">
                 <span id="discourse-user-card-title" class="name-username-wrapper">
                   {{if this.nameFirst this.user.name (format-username this.user.username)}}
                 </span>
@@ -48,7 +48,7 @@
               </a>
             {{/if}}
           </h1>
-          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(fn this.handleShowUser this.user)}} />
+          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(action "showUser" this.user)}} />
           {{#if this.nameFirst}}
             <h2 class="username">{{this.user.username}}</h2>
           {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 64967f9982..132e37cff6 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -101,7 +101,7 @@
             <ComposerSaveButton @action={{action "save"}} @icon={{this.saveIcon}} @label={{this.saveLabel}} @forwardEvent={{true}} @disableSubmit={{this.disableSubmit}} />
 
             {{#if this.site.mobileView}}
-              <a href {{on "click" this.cancel}} title={{i18n "cancel"}} class="cancel">
+              <a href {{action "cancel"}} title={{i18n "cancel"}} class="cancel">
                 {{#if this.canEdit}}
                   {{d-icon "times"}}
                 {{else}}
@@ -109,7 +109,7 @@
                 {{/if}}
               </a>
             {{else}}
-              <a href {{on "click" this.cancel}} class="cancel" >{{i18n "close"}}</a>
+              <a href {{action "cancel"}} class="cancel" >{{i18n "close"}}</a>
             {{/if}}
 
             {{#if this.site.mobileView}}
@@ -133,7 +133,7 @@
                 {{/if}}
 
                 {{#if this.isCancellable}}
-                  <a href id="cancel-file-upload" {{on "click" this.cancelUpload}}>{{d-icon "times"}}</a>
+                  <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
@@ -165,7 +165,7 @@
               </a>
             {{/if}}
 
-            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{on "click" this.togglePreview}} aria-label={{i18n "preview"}}>
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{action "togglePreview"}} aria-label={{i18n "preview"}}>
               {{d-icon "desktop"}}
             </a>
 
@@ -180,7 +180,7 @@
     {{else}}
       <div class="saving-text">
         {{#if this.model.createdPost}}
-          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{on "click" this.viewNewReply}} class="permalink">{{i18n "composer.view_new_post"}}</a>
+          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
           {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
index 6edf2f0dc3..248e6c05a4 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -1,4 +1,4 @@
-<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
index b1d56bdaff..1c83813b00 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
@@ -1,4 +1,4 @@
-<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
index f5ab696290..308dbeefc9 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
@@ -1,4 +1,4 @@
-<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
index 7547ea9aa9..49a28605b6 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
@@ -1,4 +1,4 @@
-<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 4b7b4be309..510da64e49 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 51734fa801..4187cda09d 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -3,7 +3,7 @@
 <DiscoveryCategories @refresh={{action "refresh"}}>
   {{#if (and this.topicTrackingState.hasIncoming this.isCategoriesRoute)}}
     <div class="show-more {{if this.hasTopics "has-topics"}}">
-      <div role="button" class="alert alert-info clickable" {{on "click" this.showInserted}}>
+      <div role="button" class="alert alert-info clickable" {{action "showInserted"}}>
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 3b6018bae9..7deb8d1edc 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -20,7 +20,7 @@
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
       <div class="show-more {{if this.hasTopics "has-topics"}}">
-        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
+        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 23926dd460..de59e86dae 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -101,7 +101,7 @@
                     <div class="no-results-suggestion">
                       {{i18n "search.cant_find"}}
                       {{#if this.canCreateTopic}}
-                        <a href {{on "click" (fn this.createTopic this.searchTerm)}}>{{i18n "search.start_new_topic"}}</a>
+                        <a href {{action "createTopic" this.searchTerm}}>{{i18n "search.start_new_topic"}}</a>
                         {{#unless this.siteSettings.login_required}}
                           {{i18n "search.or_search_google"}}
                         {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
index a5382ff98c..53f0ee38c6 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
@@ -9,7 +9,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
+      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
index 6c7e389d6c..b062e88d04 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
@@ -1,6 +1,6 @@
 {{#if this.selectedHtml}}
   <li>
-    <a href {{on "click" this.toggleExpanded}} class="expander">
+    <a href {{action "toggleExpanded"}} class="expander">
       <span class="selection">{{html-safe this.selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index 06bddeb0fa..72e29f165f 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -1,5 +1,5 @@
 <li class="navigation-toggle">
-  <a href {{on "click" this.toggleDrop}} class="toggle-link">
+  <a href {{action "toggleDrop"}} class="toggle-link">
     {{this.selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index 1e6cf38bcc..c91dcd6405 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -7,7 +7,7 @@
     </div>
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
-      <a href {{on "click" this.showInserted}} class="alert alert-info clickable">
+      <a href {{action "showInserted"}} class="alert alert-info clickable">
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 9ac8b5d77a..8bd68ee20e 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -16,7 +16,7 @@
             <Input @value={{this.loginName}} class={{value-entered this.loginName}} @type="email" id="login-account-name" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" />
             <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
             {{#if this.showLoginWithEmailLink}}
-              <a href id="email-login-link" {{on "click" this.emailLogin}}>
+              <a href id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
                 {{i18n "email_login.login_link"}}
               </a>
             {{/if}}
@@ -24,7 +24,7 @@
           <div class="input-group">
             <Input @value={{this.loginPassword}} class={{value-entered this.loginPassword}} @type="password" id="login-account-password" maxlength="200" disabled={{this.showSecondFactor}} />
             <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-            <a href id="forgot-password-link" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
+            <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
           </div>
         </div>
         <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @class={{this.secondFactorClass}} @backupEnabled={{this.backupEnabled}} @isLogin={{true}}>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
index c0cc595e83..86310ecef2 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
@@ -17,7 +17,7 @@
     <div>
       <h3>
         {{i18n "user.auth_tokens.latest_post"}}
-        <a href {{on "click" this.toggleExpanded}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
+        <a href {{action "toggleExpanded"}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
       </h3>
 
       {{#if this.expanded}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index 115a78dde5..d8447cfc13 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -2,7 +2,7 @@
   {{#if this.showSelectableAvatars}}
     <div class="selectable-avatars">
       {{#each this.selectableAvatars as |avatar|}}
-        <a href class="selectable-avatar" {{on "click" (fn this.selectAvatar avatar)}}>
+        <a href class="selectable-avatar" {{action "selectAvatar" avatar}}>
           {{bound-avatar-template avatar "huge"}}
         </a>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index 0f48b08226..38f30da9dd 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -30,19 +30,19 @@
       <div id="display-modes">
         <ul class="nav nav-pills">
           <li>
-            <a href class={{this.inlineClass}} {{on "click" this.displayInline}} title={{i18n "post.revisions.displays.inline.title"}}>
+            <a href class={{this.inlineClass}} {{action "displayInline"}} title={{i18n "post.revisions.displays.inline.title"}}>
               {{d-icon "far-square"}}
               {{i18n "post.revisions.displays.inline.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideClass}} {{on "click" this.displaySideBySide}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
+            <a href class={{this.sideBySideClass}} {{action "displaySideBySide"}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideMarkdownClass}} {{on "click" this.displaySideBySideMarkdown}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
+            <a href class={{this.sideBySideMarkdownClass}} {{action "displaySideBySideMarkdown"}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
             </a>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index f93cea0807..52250bd825 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="composer.link_dialog_title" @class="insert-link">
-  <form id="insert-hyperlink-form" {{on "submit" (action "ok")}}>
+  <form id="insert-hyperlink-form" {{action "ok" on="submit"}}>
     <div class="inputs">
       <TextField @value={{this.linkUrl}} @placeholderKey="composer.link_url_placeholder" @class="link-url" @key-up={{action "search"}} @autofocus="autofocus" />
       {{#if this.searchLoading}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
index d7465134af..7503af7c15 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
@@ -14,7 +14,7 @@
               <Input @value={{this.loginName}} @type="email" id="login-account-name" class={{value-entered this.loginName}} autocomplete="username" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" tabindex="1" />
               <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
               {{#if this.showLoginWithEmailLink}}
-                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{on "click" this.emailLogin}}>
+                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
                   {{i18n "email_login.login_link"}}
                 </a>
               {{/if}}
@@ -22,7 +22,7 @@
             <div class="input-group">
               <PasswordField @value={{this.loginPassword}} @type="password" class={{value-entered this.loginPassword}} id="login-account-password" autocomplete="current-password" maxlength="200" @capsLockOn={{this.capsLockOn}} disabled={{this.disableLoginFields}} tabindex="1" />
               <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-              <a href id="forgot-password-link" tabindex="3" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
+              <a href id="forgot-password-link" tabindex="3" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a>
               <div class="caps-lock-warning {{unless this.capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
index d94537761a..ed5c02023f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
@@ -23,7 +23,7 @@
           {{#if this.showSecondFactorKey}}
             {{this.secondFactorKey}}
           {{else}}
-            <a href {{on "click" this.enableShowSecondFactorKey}}>{{i18n "user.second_factor.show_key_description"}}</a>
+            <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
         </p>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index fb74ee2874..4ce19d4867 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n "login.not_approved"}}</p>
       {{else}}
         {{#unless this.redirected}}
-          <a class="btn" href={{this.redirectHref}} {{on "click" this.done}}>{{this.continueButtonText}}</a>
+          <a class="btn" href={{this.redirectHref}} {{action "done"}}>{{this.continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index 166a2c81d9..debb8266e5 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -120,7 +120,7 @@
             <div class="controls" style="margin-top: 5px">
               {{this.resetPasswordProgress}}
               {{#unless this.resetPasswordLoading}}
-                <a href class="instructions" {{on "click" this.resetPassword}}>{{ i18n "user.second_factor.forgot_password" }}</a>
+                <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
               {{/unless}}
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 40ae04547a..77e3995a23 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -53,7 +53,7 @@
                   {{else if email.resent}}
                     <span>{{i18n "user.email.resent_label"}}</span>
                   {{else}}
-                    <a {{on "click" (fn this.resendConfirmationEmail email)}} href>{{i18n "user.email.resend_label"}}</a>
+                    <a {{action "resendConfirmationEmail" email}} href>{{i18n "user.email.resend_label"}}</a>
                   {{/if}}
                 {{/unless}}
               </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index 78459f73e7..76e2d3f63a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -2,7 +2,7 @@
   <div class="control-group pref-password">
     <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
-      <a href {{on "click" this.changePassword}} class="btn btn-default">
+      <a href {{action "changePassword"}} class="btn btn-default">
         {{d-icon "envelope"}}
         {{#if this.model.no_password}}
           {{i18n "user.change_password.set_password"}}
@@ -58,7 +58,7 @@
     </div>
 
     {{#if this.canShowAllAuthTokens}}
-      <a href {{on "click" this.toggleShowAllAuthTokens}}>
+      <a href {{action "toggleShowAllAuthTokens"}}>
         {{#if this.showAllAuthTokens}}
           {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
@@ -67,7 +67,7 @@
       </a>
     {{/if}}
 
-    <a href {{on "click" (fn this.revokeAuthToken null)}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
+    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
index 8c38d50493..e1e99c3826 100644
--- a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
+++ b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
@@ -25,7 +25,7 @@
           <span>&middot;</span>
         {{/if}}
         <span>
-          <a href class="toggle-second-factor-method {{method.class}}" {{on "click" (fn this.useAnotherMethod method.id)}}>
+          <a href="" class="toggle-second-factor-method {{method.class}}" {{action "useAnotherMethod" method.id}}>
             {{i18n method.translationKey}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index de725a87a4..afc2d8e4dd 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -40,7 +40,7 @@
               {{else}}
                 {{#if this.topicTrackingState.hasIncoming}}
                   <div class="show-more {{if this.hasTopics "has-topics"}}">
-                    <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
+                    <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
                       <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
                     </a>
                   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index 932bcf36ec..a6c07e90f1 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -15,8 +15,8 @@
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{on "click" this.sortByCount}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{on "click" this.sortById}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 85186edfe2..41fa19fd1d 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -41,7 +41,7 @@
               <DButton @action={{action "cancelEditingTopic"}} @class="btn-default cancel-edit" @icon="times" @ariaLabel="composer.cancel" />
 
               {{#if this.canRemoveTopicFeaturedLink}}
-                <a href {{on "click" this.removeFeaturedLink}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
+                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{this.featuredLinkDomain}}
                 </a>
@@ -61,13 +61,13 @@
 
             {{#if this.model.details.loaded}}
               <TopicStatus @topic={{this.model}} />
-              <a href={{this.model.url}} {{on "click" this.jumpTop}} class="fancy-title">
+              <a href={{this.model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{html-safe this.model.fancyTitle}}
               </a>
             {{/if}}
 
             {{#if this.model.details.can_edit}}
-              <a href {{on "click" this.editTopic}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
 
             <PluginOutlet @name="topic-title-suffix" @tagName="" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
index c33c0d3bd1..e4d7d361b4 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
@@ -7,12 +7,12 @@
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
   <span class="tag-sort-count {{if this.sortedByCount "active"}}">
-    <a href {{on "click" this.sortByCount}}>
+    <a href {{action "sortByCount"}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
   <span class="tag-sort-name {{if this.sortedByName "active"}}">
-    <a href {{on "click" this.sortById}}>
+    <a href {{action "sortById"}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
   </span>
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index 6e72246280..dc086f0c10 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -9,7 +9,7 @@
 
     {{#if (gt this.incomingCount 0)}}
       <div class="show-mores">
-        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
+        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix="latest" @count={{this.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index d036d2111e..fa522ce8b2 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -32,7 +32,7 @@
             {{/if}}
             {{#if this.model.number_of_suspensions}}
               <div>
-                <a href {{on "click" this.showSuspensions}}>
+                <a href {{action "showSuspensions"}}>
                   <span class="suspensions">{{this.model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index 09f3e59226..8f44b4d76e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -52,12 +52,12 @@ acceptance("Plugin Outlet - Connector Class", function (needs) {
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hello`
     ] = hbs`<span class='hello-username'>{{model.username}}</span>
-        <button class='say-hello' {{on "click" (action "sayHello")}}></button>
+        <button class='say-hello' {{action "sayHello"}}></button>
         <span class='hello-result'>{{hello}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hi`
-    ] = hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
+    ] = hbs`<button class='say-hi' {{action "sayHi"}}></button>
         <span class='hi-result'>{{hi}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index b9bf541d09..09f9a135f7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -148,6 +148,25 @@ acceptance("User menu", function (needs) {
       exists(".user-menu"),
       "clicking on the same item again closes the menu"
     );
+
+    await click(".d-header-icons .current-user");
+    await click("#user-menu-button-review-queue");
+    // this may not be ideal because it actually attempts to open a new tab
+    // which gets blocked by the browser, but otherwise it seems harmless and
+    // doesn't cause the test to fail. if it causes problems for you, feel free
+    // to remove the ctrl+click tests.
+    await click("#quick-access-review-queue li.reviewable.reviewed a", {
+      ctrlKey: true,
+    });
+    assert.strictEqual(
+      currentURL(),
+      "/review/17",
+      "ctrl-clicking on an item doesn't navigate to a new page"
+    );
+    assert.ok(
+      exists(".user-menu"),
+      "ctrl-clicking on an item doesn't close the menu"
+    );
   });
 
   test("tabs have title attributes", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
index a75d7721a1..d5ca5e5197 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
@@ -1,7 +1,6 @@
 // DO NOT EDIT THIS FILE!!!
 // Update it by running `rake javascript:update_constants`
 
-
 export const NOTIFICATION_TYPES = {
   mentioned: 1,
   replied: 2,
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
index f3b1ffe139..ddad59ca69 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,4 @@
-<div {{on "click" this.onSelectedNameClick}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
+<div {{action "onSelectedNameClick"}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
   <div class="body">
     {{this.badge}}
     {{d-icon "times"}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
index c3a26a8e0e..8e21aee4b5 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
@@ -1,4 +1,4 @@
-<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{on "click" (fn this.selectKit.deselect this.item)}} class="btn btn-default selected-choice {{this.extraClass}}">
+<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{action this.selectKit.deselect this.item}} class="btn btn-default selected-choice {{this.extraClass}}">
   {{d-icon "times"}}
   {{#if (has-block)}}
     {{yield}}
diff --git a/app/assets/javascripts/wizard/addon/components/styling-preview.js b/app/assets/javascripts/wizard/addon/components/styling-preview.js
index e44bc99846..cfe53afb0c 100644
--- a/app/assets/javascripts/wizard/addon/components/styling-preview.js
+++ b/app/assets/javascripts/wizard/addon/components/styling-preview.js
@@ -205,14 +205,12 @@ export default createPreviewComponent(628, 322, {
   },
 
   @action
-  setPreviewHomepage(event) {
-    event?.preventDefault();
+  setPreviewHomepage() {
     this.set("previewTopic", false);
   },
 
   @action
-  setPreviewTopic(event) {
-    event?.preventDefault();
+  setPreviewTopic() {
     this.set("previewTopic", true);
   },
 });
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-step.js b/app/assets/javascripts/wizard/addon/components/wizard-step.js
index 64999e25b0..4e77594618 100644
--- a/app/assets/javascripts/wizard/addon/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/addon/components/wizard-step.js
@@ -134,14 +134,12 @@ export default Component.extend({
   },
 
   @action
-  quit(event) {
-    event?.preventDefault();
+  quit() {
     this.router.transitionTo("discovery.latest");
   },
 
   @action
-  exitEarly(event) {
-    event?.preventDefault();
+  exitEarly() {
     const step = this.step;
     step.validate();
 
@@ -158,9 +156,7 @@ export default Component.extend({
   },
 
   @action
-  backStep(event) {
-    event?.preventDefault();
-
+  backStep() {
     if (this.saving) {
       return;
     }
@@ -169,9 +165,7 @@ export default Component.extend({
   },
 
   @action
-  nextStep(event) {
-    event?.preventDefault();
-
+  nextStep() {
     if (this.saving) {
       return;
     }
diff --git a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
index 3c9b1736c9..4d49d4febd 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
@@ -9,10 +9,10 @@
 </div>
 
 <div class="preview-nav">
-  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{on "click" this.setPreviewTopic}}>
+  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{action "setPreviewTopic"}}>
     {{i18n "wizard.previews.topic_preview"}}
   </a>
-  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{on "click" this.setPreviewHomepage}}>
+  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{action "setPreviewHomepage"}}>
     {{i18n "wizard.previews.homepage_preview"}}
   </a>
 </div>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
index 3026476686..96fd2e985d 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
@@ -49,31 +49,31 @@
   <div class="wizard-container__buttons">
 
     {{#if this.showNextButton}}
-      <button {{on "click" this.nextStep}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
+      <button {{action "nextStep"}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
         {{i18n this.nextButtonLabel}}
       </button>
     {{/if}}
 
     {{#if this.showFinishButton}}
-      <button {{on "click" this.exitEarly}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
+      <button {{action "exitEarly"}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
         {{i18n "wizard.jump_in"}}
       </button>
     {{/if}}
 
     {{#if this.showJumpInButton}}
-      <button {{on "click" this.quit}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
+      <button {{action "quit"}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
         {{i18n this.jumpInButtonLabel}}
       </button>
     {{/if}}
   </div>
 
   <div class="wizard-container__step-progress">
-    <a href {{on "click" this.backStep}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
+    <a href {{action "backStep"}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
 
     <span class="wizard-container__step-text">{{bound-i18n "wizard.step-text"}}</span>
     <span class="wizard-container__step-count">{{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}</span>
 
-    <a href {{on "click" this.nextStep}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
+    <a href {{action "nextStep"}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
 
   </div>
 
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 5b473f6e5e..a09212713c 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -210,7 +210,7 @@ task 'javascript:update_constants' => :environment do
 
   emoji_buttons = groups_json.map do |group|
     <<~HTML
-			<button type="button" data-section="#{group["name"]}" {{on "click" (fn this.onCategorySelection "#{group["name"]}")}} class="btn btn-default category-button emoji">
+			<button type="button" data-section="#{group["name"]}" {{action this.onCategorySelection "#{group["name"]}"}} class="btn btn-default category-button emoji">
 				 {{replace-emoji ":#{group["tabicon"]}:"}}
 			</button>
     HTML
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 426f2ab4d6..400489e895 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -1,7 +1,7 @@
 /* global Pikaday:true */
 import computed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import EmberObject, { action } from "@ember/object";
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { Promise } from "rsvp";
@@ -306,12 +306,6 @@ export default Component.extend({
     return dateTime.isValid() ? dateTime.format("LLLL") : emptyText;
   },
 
-  @action
-  updateFormat(format, event) {
-    event?.preventDefault();
-    this.format = format;
-  },
-
   actions: {
     setTime(event) {
       this._setTimeIfValid(event.target.value, "time");
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d18cf61fab..390e4ece95 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -115,7 +115,7 @@
           <ul class="formats">
             {{#each this.previewedFormats as |previewedFormat|}}
               <li class="format">
-                <a class="moment-format" href {{on "click" (fn this.updateFormat previewedFormat.format)}}>
+                <a class="moment-format" href {{action (mut this.format) previewedFormat.format}}>
                   {{previewedFormat.format}}
                 </a>
                 <span class="previewed-format">
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
index 5b4f34f446..04a51d762e 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
@@ -398,10 +398,4 @@ export default Controller.extend(ModalFunctionality, {
   removeOption(option) {
     this.pollOptions.removeObject(option);
   },
-
-  @action
-  updatePollType(pollType, event) {
-    event?.preventDefault();
-    this.pollType = pollType;
-  },
 });
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index e2f24afa90..6bfd6cb1ba 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,15 +1,15 @@
 <DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
   <div class="input-group poll-type">
-    <a href {{on "click" (fn this.updatePollType "regular")}} class="poll-type-value {{if this.isRegular "active"}}">
+    <a href {{action (mut this.pollType) "regular"}} class="poll-type-value {{if this.isRegular "active"}}">
       {{i18n "poll.ui_builder.poll_type.regular"}}
     </a>
 
-    <a href {{on "click" (fn this.updatePollType "multiple")}} class="poll-type-value {{if this.isMultiple "active"}}">
+    <a href {{action (mut this.pollType) "multiple"}} class="poll-type-value {{if this.isMultiple "active"}}">
       {{i18n "poll.ui_builder.poll_type.multiple"}}
     </a>
 
     {{#if this.showNumber}}
-      <a href {{on "click" (fn this.updatePollType "number")}} class="poll-type-value {{if this.isNumber "active"}}">
+      <a href {{action (mut this.pollType) "number"}} class="poll-type-value {{if this.isNumber "active"}}">
         {{i18n "poll.ui_builder.poll_type.number"}}
       </a>
     {{/if}}

From cf646b2061fb0a7ddd9988c523425c30536435ca Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 4 Oct 2022 18:41:06 +0300
Subject: [PATCH 042/332] FIX: Count resulting bulk invites correctly (#18461)

Skipped invites were not counted at all and some invites could generate
more than one error and resulted in a grand total that was not equal to
the count of bulk invites.
---
 app/jobs/regular/bulk_invite.rb | 41 ++++++++++++++++++++++++---------
 config/locales/server.en.yml    |  9 ++++++--
 spec/jobs/bulk_invite_spec.rb   | 11 ++++++++-
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index 08fc977f45..ed83eb381d 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -9,6 +9,8 @@ module Jobs
 
       @logs         = []
       @sent         = 0
+      @skipped      = 0
+      @warnings     = 0
       @failed       = 0
       @groups       = {}
       @user_fields  = {}
@@ -39,8 +41,14 @@ module Jobs
       invites.each do |invite|
         if EmailAddressValidator.valid_value?(invite[:email])
           # email is valid
-          send_invite(invite)
-          @sent += 1
+          result = send_invite(invite)
+          if Invite === result
+            @sent += 1
+          elsif User === result
+            @skipped += 1
+          else
+            @failed += 1
+          end
         else
           # invalid email
           save_log "Invalid Email '#{invite[:email]}"
@@ -58,7 +66,7 @@ module Jobs
       if group_names
         group_names = group_names.split(';')
 
-        group_names.each { |group_name|
+        group_names.each do |group_name|
           group = fetch_group(group_name)
 
           if group && can_edit_group?(group)
@@ -67,9 +75,9 @@ module Jobs
           else
             # invalid group
             save_log "Invalid Group '#{group_name}'"
-            @failed += 1
+            @warnings += 1
           end
-        }
+        end
       end
 
       groups
@@ -82,7 +90,7 @@ module Jobs
         topic = Topic.find_by_id(topic_id)
         if topic.nil?
           save_log "Invalid Topic ID '#{topic_id}'"
-          @failed += 1
+          @warnings += 1
         end
       end
 
@@ -94,7 +102,11 @@ module Jobs
 
       fields.each do |key, value|
         @user_fields[key] ||= UserField.includes(:user_field_options).where('name ILIKE ?', key).first || :nil
-        next if @user_fields[key] == :nil
+        if @user_fields[key] == :nil
+          save_log "Invalid User Field '#{key}'"
+          @warnings += 1
+          next
+        end
 
         # Automatically correct user field value
         if @user_fields[key].field_type == "dropdown"
@@ -139,6 +151,8 @@ module Jobs
             user.locale = locale
             user.save!
           end
+
+          user
         else
           if user_fields.present? || locale.present?
             user = User.where(staged: true).find_by_email(email)
@@ -171,8 +185,8 @@ module Jobs
         end
       rescue => e
         save_log "Error inviting '#{email}' -- #{Rails::Html::FullSanitizer.new.sanitize(e.message)}"
-        @sent -= 1
-        @failed += 1
+
+        nil
       end
     end
 
@@ -182,17 +196,22 @@ module Jobs
 
     def notify_user
       if @current_user
-        if (@sent > 0 && @failed == 0)
+        if @sent > 0 && @failed == 0
           SystemMessage.create_from_system_user(
             @current_user,
             :bulk_invite_succeeded,
-            sent: @sent
+            sent: @sent,
+            skipped: @skipped,
+            warnings: @warnings,
+            logs: @logs.join("\n")
           )
         else
           SystemMessage.create_from_system_user(
             @current_user,
             :bulk_invite_failed,
             sent: @sent,
+            skipped: @skipped,
+            warnings: @warnings,
             failed: @failed,
             logs: @logs.join("\n")
           )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 1d08c5e04a..02a5f4e693 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3091,13 +3091,18 @@ en:
     bulk_invite_succeeded:
       title: "Bulk Invite Succeeded"
       subject_template: "Bulk user invite processed successfully"
-      text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
+      text_body_template: |
+        Your bulk user invite file was processed, %{sent} invites mailed, %{skipped} skipped and %{warnings} warning(s).
+
+        ``` text
+        %{logs}
+        ```
 
     bulk_invite_failed:
       title: "Bulk Invite Failed"
       subject_template: "Bulk user invite processed with errors"
       text_body_template: |
-        Your bulk user invite file was processed, %{sent} invites mailed with %{failed} error(s).
+        Your bulk user invite file was processed, %{sent} invites mailed, %{skipped} skipped, %{warnings} warning(s) and %{failed} error(s).
 
         Here's the log:
 
diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb
index 9d0984551d..53d38d7888 100644
--- a/spec/jobs/bulk_invite_spec.rb
+++ b/spec/jobs/bulk_invite_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Jobs::BulkInvite do
     fab!(:topic) { Fabricate(:topic) }
     let(:staged_user) { Fabricate(:user, staged: true, active: false) }
     let(:email) { 'test@discourse.org' }
-    let(:invites) { [{ email: staged_user.email }, { email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: topic.id }] }
+    let(:invites) { [{ email: user.email }, { email: staged_user.email }, { email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: topic.id }, { email: 'invalid' }] }
 
     it 'raises an error when the invites array is missing' do
       expect { Jobs::BulkInvite.new.execute(current_user_id: user.id) }
@@ -34,6 +34,12 @@ RSpec.describe Jobs::BulkInvite do
       expect(invite.email).to eq(email)
       expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(group1.id, group2.id)
       expect(invite.topic_invites.pluck(:topic_id)).to contain_exactly(topic.id)
+
+      post = Post.last
+      expect(post.raw).to include("3 invites")
+      expect(post.raw).to include("1 skipped")
+      expect(post.raw).to include("0 warning")
+      expect(post.raw).to include("1 error")
     end
 
     it 'does not create invited groups for automatic groups' do
@@ -47,6 +53,9 @@ RSpec.describe Jobs::BulkInvite do
       invite = Invite.last
       expect(invite.email).to eq(email)
       expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(group1.id)
+
+      post = Post.last
+      expect(post.raw).to include("1 warning")
     end
 
     it 'does not create invited groups record if the user can not manage the group' do

From 2d391565e4876806bbb7a9826aa9a9856908c57f Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Tue, 4 Oct 2022 21:55:21 +0300
Subject: [PATCH 043/332] FIX: Skip quality title validations for static topics
 when edited by admin (#18468)

Static topics are the seeded topics that are automatically created for every Discourse instance to hold the content for the FAQ, ToS and Privacy pages. These topics are allowed to bypass the minimum title length checks when they're edited by admins:

https://github.com/discourse/discourse/blob/ba27ee16376c961c93a4e3854b038a42f9577613/app/assets/javascripts/discourse/app/models/composer.js#L487-L496

However, on the server-side, the "quality title" validations aren't skipped for static topics and that can cause confusion for admins when they change the title of a static topic to something that's short enough to fail the quality title validations. This commit ignores all quality title validations on static topics when they're edited by admins.

Internal topic: t/75745.
---
 lib/validators/quality_title_validator.rb     |  2 +
 .../quality_title_validator_spec.rb           | 54 +++++++++++--------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/lib/validators/quality_title_validator.rb b/lib/validators/quality_title_validator.rb
index c05ae07f9d..2fa9562439 100644
--- a/lib/validators/quality_title_validator.rb
+++ b/lib/validators/quality_title_validator.rb
@@ -5,6 +5,8 @@ require 'text_cleaner'
 
 class QualityTitleValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
+    return if Discourse.static_doc_topic_ids.include?(record.id) && record.acting_user&.admin?
+
     sentinel = TextSentinel.title_sentinel(value)
 
     if !sentinel.valid?
diff --git a/spec/lib/validators/quality_title_validator_spec.rb b/spec/lib/validators/quality_title_validator_spec.rb
index 00a0d70524..a5574e29b9 100644
--- a/spec/lib/validators/quality_title_validator_spec.rb
+++ b/spec/lib/validators/quality_title_validator_spec.rb
@@ -1,29 +1,19 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 
-require 'ostruct'
-
-module QualityTitleValidatorSpec
-  class Validatable < OpenStruct
-    include ActiveModel::Validations
-    validates :title, quality_title: { unless: :private_message? }
-  end
-end
-
 RSpec.describe QualityTitleValidator do
   let(:valid_title) { "hello this is my cool topic! welcome: all;" }
   let(:short_title) { valid_title.slice(0, SiteSetting.min_topic_title_length - 1) }
   let(:long_title) { valid_title.center(SiteSetting.max_topic_title_length + 1, 'x') }
   let(:xxxxx_title) { valid_title.gsub(/./, 'x') }
 
-  let(:meaningless_title) { "asdf asdf asdf" }
+  let(:meaningless_title) { "asdf asdf asdf asdf" }
   let(:loud_title) { "ALL CAPS INVALID TITLE" }
   let(:pretentious_title) { "superverylongwordintitlefornoparticularreason" }
+  fab!(:topic) { Fabricate(:post).topic }
 
-  subject(:topic) { QualityTitleValidatorSpec::Validatable.new }
-
-  before(:each) do
-    topic.stubs(private_message?: false)
+  before do
+    SiteSetting.title_prettify = false
   end
 
   it "allows a regular title with a few ascii characters" do
@@ -41,32 +31,34 @@ RSpec.describe QualityTitleValidator do
     expect(topic).to be_valid
   end
 
-  it "allows anything in a private message" do
-    topic.stubs(private_message?: true)
-    [short_title, long_title, xxxxx_title].each do |bad_title|
-      topic.title = bad_title
-      expect(topic).to be_valid
-    end
-  end
-
   it "strips a title when identifying length" do
     topic.title = short_title.center(SiteSetting.min_topic_title_length + 1, ' ')
     expect(topic).not_to be_valid
+    expect(topic.errors.full_messages.first).to include(
+      I18n.t("errors.messages.too_short", count: SiteSetting.min_topic_title_length)
+    )
   end
 
   it "doesn't allow a long title" do
     topic.title = long_title
     expect(topic).not_to be_valid
+    expect(topic.errors.full_messages.first).to include(
+      I18n.t("errors.messages.too_long", count: SiteSetting.max_topic_title_length)
+    )
   end
 
   it "doesn't allow a short title" do
     topic.title = short_title
     expect(topic).not_to be_valid
+    expect(topic.errors.full_messages.first).to include(
+      I18n.t("errors.messages.too_short", count: SiteSetting.min_topic_title_length)
+    )
   end
 
   it "doesn't allow a title of one repeated character" do
     topic.title = xxxxx_title
     expect(topic).not_to be_valid
+    expect(topic.errors.full_messages.first).to include(I18n.t("errors.messages.is_invalid_meaningful"))
   end
 
   it "doesn't allow a meaningless title" do
@@ -86,4 +78,22 @@ RSpec.describe QualityTitleValidator do
     expect(topic).not_to be_valid
     expect(topic.errors.full_messages.first).to include(I18n.t("errors.messages.is_invalid_quiet"))
   end
+
+  it "bypasses all checks for static docs if the acting user is admin" do
+    SiteSetting.tos_topic_id = topic.id
+    topic.acting_user = Fabricate(:admin)
+    [loud_title, pretentious_title, meaningless_title].each do |bad|
+      topic.title = bad
+      expect(topic).to be_valid
+    end
+  end
+
+  it "doesn't bypass all checks for static docs if the acting user isn't admin" do
+    SiteSetting.tos_topic_id = topic.id
+    topic.acting_user = Fabricate(:moderator)
+    [loud_title, pretentious_title, meaningless_title].each do |bad|
+      topic.title = bad
+      expect(topic).not_to be_valid
+    end
+  end
 end

From f5194aadd39d5c323df52a346c6641e49d3279c5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 5 Oct 2022 10:50:20 +1000
Subject: [PATCH 044/332] DEV: Remove usages of enable_personal_messages
 (#18437)

cf. e62e93f83a77adfa80b38fbfecf82bbee14e12fe

This PR also makes it so `bot` (negative ID) and `system` users are always allowed
to send PMs, since the old conditional was just based on `enable_personal_messages`
---
 lib/guardian.rb                               | 14 ++++++-------
 lib/guardian/group_guardian.rb                |  4 +---
 lib/guardian/post_guardian.rb                 |  5 +----
 lib/guardian/topic_guardian.rb                |  3 +--
 lib/topic_query.rb                            |  8 ++------
 spec/integration/watched_words_spec.rb        |  1 +
 spec/lib/guardian_spec.rb                     | 19 +++++++++---------
 spec/lib/new_post_manager_spec.rb             |  1 +
 spec/lib/post_creator_spec.rb                 |  8 ++++++--
 spec/lib/search_spec.rb                       |  9 +++++----
 spec/lib/topic_creator_spec.rb                |  6 +++++-
 .../topic_query/private_message_lists_spec.rb | 12 +++++++++++
 spec/lib/topic_query_spec.rb                  |  4 ++--
 spec/models/group_archived_message_spec.rb    |  4 ++++
 ...ivate_message_topic_tracking_state_spec.rb |  4 ++++
 spec/models/topic_spec.rb                     | 11 ++++++++--
 spec/models/topic_user_spec.rb                |  1 +
 spec/models/trust_level3_requirements_spec.rb |  1 +
 spec/models/user_search_spec.rb               |  1 +
 spec/models/user_spec.rb                      |  2 ++
 spec/requests/groups_controller_spec.rb       |  1 -
 spec/requests/list_controller_spec.rb         |  3 ++-
 spec/requests/posts_controller_spec.rb        | 11 ++++++++++
 spec/requests/topics_controller_spec.rb       | 20 +++++++++++++++++++
 spec/requests/users_controller_spec.rb        |  1 +
 .../basic_group_serializer_spec.rb            |  5 +++++
 .../serializers/topic_view_serializer_spec.rb |  2 --
 spec/support/helpers.rb                       |  2 ++
 28 files changed, 117 insertions(+), 46 deletions(-)

diff --git a/lib/guardian.rb b/lib/guardian.rb
index 16d50003d0..69415b5470 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -50,6 +50,9 @@ class Guardian
     def is_system_user?
       false
     end
+    def bot?
+      false
+    end
     def secure_category_ids
       []
     end
@@ -402,9 +405,7 @@ class Guardian
       if object.private_message?
         return true if is_admin?
 
-        # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-        if !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) ||
-            !SiteSetting.enable_personal_messages
+        if !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
           return false
         end
         return false if object.reached_recipients_limit? && !is_staff?
@@ -451,6 +452,7 @@ class Guardian
     is_user = target.is_a?(User)
     is_group = target.is_a?(Group)
     from_system = @user.is_system_user?
+    from_bot = @user.bot?
 
     (is_group || is_user) &&
     # User is authenticated
@@ -458,8 +460,7 @@ class Guardian
     # User disabled private message
     (is_staff? || is_group || target.user_option.allow_private_messages) &&
     # User can send PMs, this can be covered by trust levels as well via AUTO_GROUPS
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-    (is_staff? || (@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) || SiteSetting.enable_personal_messages) || notify_moderators) &&
+    (is_staff? || from_bot || from_system || (@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)) || notify_moderators) &&
     # Can't send PMs to suspended users
     (is_staff? || is_group || !target.suspended?) &&
     # Check group messageable level
@@ -474,8 +475,7 @@ class Guardian
     # User is authenticated
     return false if !authenticated?
     # User is trusted enough
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-    (@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) || SiteSetting.enable_personal_messages) &&
+    @user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) &&
       @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_send_email_messages)
   end
 
diff --git a/lib/guardian/group_guardian.rb b/lib/guardian/group_guardian.rb
index e5df8bfdc6..b3e571776c 100644
--- a/lib/guardian/group_guardian.rb
+++ b/lib/guardian/group_guardian.rb
@@ -35,9 +35,7 @@ module GroupGuardian
     return true if is_moderator? && group.id == Group::AUTO_GROUPS[:moderators]
     return false if user.blank?
 
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-    (SiteSetting.enable_personal_messages ||
-      user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)) &&
+    user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) &&
       group.users.include?(user)
   end
 
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 1e884d5e58..2f6a10b9f5 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -50,10 +50,7 @@ module PostGuardian
         (!SiteSetting.allow_flagging_staff?) &&
         post&.user&.staff?
 
-      # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-      if action_key == :notify_user &&
-          (!@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) ||
-           !SiteSetting.enable_personal_messages)
+      if action_key == :notify_user && !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
         return false
       end
 
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 5d974bad28..874ed0fb1d 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -183,8 +183,7 @@ module TopicGuardian
   end
 
   def can_convert_topic?(topic)
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-    return false unless SiteSetting.enable_personal_messages? || @user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
+    return false unless @user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
     return false if topic.blank?
     return false if topic.trashed?
     return false if topic.is_category_topic?
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index b8df87cce1..ec75d18206 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -173,8 +173,7 @@ class TopicQuery
     return if !topic.private_message?
     return if @user.blank?
 
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
-    if !SiteSetting.enable_personal_messages || !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
+    if !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
       return
     end
 
@@ -201,13 +200,10 @@ class TopicQuery
   # Return a list of suggested topics for a topic
   def list_suggested_for(topic, pm_params: nil)
 
-    # TODO (martin) Remove enable_personal_messages here once plugins have been changed.
     # Don't suggest messages unless we have a user, and private messages are
     # enabled.
     if topic.private_message? && (
-        @user.blank? ||
-          !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) ||
-          !SiteSetting.enable_personal_messages
+        @user.blank? || !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
     )
       return
     end
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
index f776bafe99..2eef6fdc32 100644
--- a/spec/integration/watched_words_spec.rb
+++ b/spec/integration/watched_words_spec.rb
@@ -117,6 +117,7 @@ RSpec.describe WatchedWord do
     end
 
     it "doesn't need approval in a private message" do
+      Group.refresh_automatic_groups!
       manager = NewPostManager.new(
         tl2_user,
         raw: "Want some #{require_approval_word.word} for cheap?",
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index fee398089e..193bd342e3 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -179,7 +179,6 @@ RSpec.describe Guardian do
 
     it "returns false for notify_user if user is not in any group that can send personal messages" do
       user = Fabricate(:user)
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
       user.change_trust_level!(1)
       expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey
@@ -267,7 +266,6 @@ RSpec.describe Guardian do
     end
 
     it "returns false when you are untrusted" do
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_2]
       user.update!(trust_level: TrustLevel[0])
       Group.user_trust_level_change!(user.id, TrustLevel[0])
@@ -279,7 +277,6 @@ RSpec.describe Guardian do
     end
 
     it "disallows pms to other users if trust level is not met" do
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_2]
       user.update!(trust_level: TrustLevel[1])
       Group.user_trust_level_change!(user.id, TrustLevel[1])
@@ -290,7 +287,6 @@ RSpec.describe Guardian do
       let(:group) { Fabricate(:group) }
       before do
         SiteSetting.personal_message_enabled_groups = group.id
-        SiteSetting.enable_personal_messages = false
       end
 
       it "returns false if user is not staff member" do
@@ -304,6 +300,14 @@ RSpec.describe Guardian do
         expect(Guardian.new(moderator).can_send_private_message?(another_user)).to be_truthy
         expect(Guardian.new(admin).can_send_private_message?(another_user)).to be_truthy
       end
+
+      it "returns true for bot user" do
+        expect(Guardian.new(Fabricate(:user, id: -19876)).can_send_private_message?(another_user)).to be_truthy
+      end
+
+      it "returns true for system user" do
+        expect(Guardian.new(Discourse.system_user).can_send_private_message?(another_user)).to be_truthy
+      end
     end
 
     context "when target user is suspended" do
@@ -356,7 +360,6 @@ RSpec.describe Guardian do
 
     it "allows TL0 to message group with messageable_level = everyone" do
       group.update!(messageable_level: Group::ALIAS_LEVELS[:everyone])
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_0]
       expect(Guardian.new(trust_level_0).can_send_private_message?(group)).to eq(true)
       expect(Guardian.new(user).can_send_private_message?(group)).to eq(true)
@@ -369,11 +372,11 @@ RSpec.describe Guardian do
       group.add(user)
       expect(Guardian.new(user).can_send_private_message?(group)).to eq(true)
 
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_0]
       expect(Guardian.new(trust_level_0).can_send_private_message?(group)).to eq(false)
 
-      #  group membership trumps min_trust_to_send_messages setting
+      # user must have both a group from personal_message_enabled_groups to send messages in general,
+      # and be a member of this group to send the message to this group for this messageable_level
       group.add(trust_level_0)
       expect(Guardian.new(trust_level_0).can_send_private_message?(group)).to eq(true)
     end
@@ -644,7 +647,6 @@ RSpec.describe Guardian do
 
       context "when user does not belong to personal_message_enabled_groups" do
         before do
-          SiteSetting.enable_personal_messages = false
           SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
         end
 
@@ -1323,7 +1325,6 @@ RSpec.describe Guardian do
     end
 
     it 'returns false when user is not in personal_message_enabled_groups' do
-      SiteSetting.enable_personal_messages = false
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
       expect(Guardian.new(user).can_convert_topic?(topic)).to be_falsey
     end
diff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rb
index f904074b99..c602df9a52 100644
--- a/spec/lib/new_post_manager_spec.rb
+++ b/spec/lib/new_post_manager_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe NewPostManager do
     fab!(:other_user) { Fabricate(:user) }
 
     it "doesn't enqueue private messages" do
+      Group.refresh_automatic_groups!
       SiteSetting.approve_unless_trust_level = 4
 
       manager = NewPostManager.new(user,
diff --git a/spec/lib/post_creator_spec.rb b/spec/lib/post_creator_spec.rb
index e510753ab2..d21db96998 100644
--- a/spec/lib/post_creator_spec.rb
+++ b/spec/lib/post_creator_spec.rb
@@ -965,6 +965,7 @@ RSpec.describe PostCreator do
     fab!(:target_user2) { Fabricate(:moderator) }
     fab!(:unrelated_user) { Fabricate(:user) }
     let(:post) do
+      Group.refresh_automatic_groups!
       PostCreator.create!(user,
         title: 'hi there welcome to my topic',
         raw: "this is my awesome message @#{unrelated_user.username_lower}",
@@ -1063,6 +1064,7 @@ RSpec.describe PostCreator do
 
       1.upto(3) do |i|
         user = Fabricate(:user)
+        Group.refresh_automatic_groups!
         topic.invite(topic.user, user.username)
         topic.reload
         expect(topic.posts_count).to eq(1)
@@ -1091,6 +1093,7 @@ RSpec.describe PostCreator do
     end
 
     it "works as expected" do
+      Group.refresh_automatic_groups!
       # Invalid archetype
       creator = PostCreator.new(user, base_args)
       creator.create
@@ -1159,9 +1162,9 @@ RSpec.describe PostCreator do
   end
 
   describe 'private message to group' do
-    let(:target_user1) { coding_horror }
+    fab!(:target_user1) { coding_horror }
     fab!(:target_user2) { Fabricate(:moderator) }
-    let(:group) do
+    let!(:group) do
       g = Fabricate.build(:group, messageable_level: Group::ALIAS_LEVELS[:everyone])
       g.add(target_user1)
       g.add(target_user2)
@@ -1170,6 +1173,7 @@ RSpec.describe PostCreator do
     end
     fab!(:unrelated) { Fabricate(:user) }
     let(:post) do
+      Group.refresh_automatic_groups!
       PostCreator.create!(user,
         title: 'hi there welcome to my topic',
         raw: "this is my awesome message @#{unrelated.username_lower}",
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index c3ddb409ae..b5d6087ae8 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -583,10 +583,10 @@ RSpec.describe Search do
     end
 
     context 'with personal-direct and group_messages flags' do
-      let(:current) { Fabricate(:user, admin: true, username: "current_user") }
-      let(:participant) { Fabricate(:user, username: "participant_1") }
-      let(:participant_2) { Fabricate(:user, username: "participant_2") }
-      let(:non_participant) { Fabricate(:user, username: "non_participant") }
+      let!(:current) { Fabricate(:user, admin: true, username: "current_user") }
+      let!(:participant) { Fabricate(:user, username: "participant_1") }
+      let!(:participant_2) { Fabricate(:user, username: "participant_2") }
+      let!(:non_participant) { Fabricate(:user, username: "non_participant") }
 
       let(:group) do
         group = Fabricate(:group, has_messages: true)
@@ -596,6 +596,7 @@ RSpec.describe Search do
       end
 
       def create_pm(users:, group: nil)
+        Group.refresh_automatic_groups!
         pm = Fabricate(:private_message_post_one_user, user: users.first).topic
         users[1..-1].each do |u|
           pm.invite(users.first, u.username)
diff --git a/spec/lib/topic_creator_spec.rb b/spec/lib/topic_creator_spec.rb
index 6ce006ed85..b1536b8bec 100644
--- a/spec/lib/topic_creator_spec.rb
+++ b/spec/lib/topic_creator_spec.rb
@@ -410,6 +410,7 @@ RSpec.describe TopicCreator do
           TopicCreator.any_instance.expects(:watch_topic).returns(true)
           SiteSetting.allow_duplicate_topic_titles = true
           SiteSetting.enable_staged_users = true
+          Group.refresh_automatic_groups!
         end
 
         it "should be possible for a regular user to send private message" do
@@ -442,7 +443,6 @@ RSpec.describe TopicCreator do
         end
 
         it "personal_message_enabled_groups setting should be checked when sending private message" do
-          SiteSetting.enable_personal_messages = false
           SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
 
           expect do
@@ -452,6 +452,10 @@ RSpec.describe TopicCreator do
       end
 
       context 'with to emails' do
+        before do
+          Group.refresh_automatic_groups!
+        end
+
         it 'works for staff' do
           SiteSetting.min_trust_to_send_email_messages = 'staff'
           expect(TopicCreator.create(admin, Guardian.new(admin), pm_to_email_valid_attrs)).to be_valid
diff --git a/spec/lib/topic_query/private_message_lists_spec.rb b/spec/lib/topic_query/private_message_lists_spec.rb
index d1c9409b57..aeecaf31aa 100644
--- a/spec/lib/topic_query/private_message_lists_spec.rb
+++ b/spec/lib/topic_query/private_message_lists_spec.rb
@@ -7,6 +7,10 @@ RSpec.describe TopicQuery::PrivateMessageLists do
   fab!(:user_3) { Fabricate(:user) }
   fab!(:user_4) { Fabricate(:user) }
 
+  before_all do
+    Group.refresh_automatic_groups!
+  end
+
   fab!(:group) do
     Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
       g.add(user_2)
@@ -167,6 +171,10 @@ RSpec.describe TopicQuery::PrivateMessageLists do
     fab!(:user) { Fabricate(:user) }
     fab!(:user_2) { Fabricate(:user) }
 
+    before_all do
+      Group.refresh_automatic_groups!
+    end
+
     fab!(:pm) do
       create_post(
         user: user,
@@ -210,6 +218,10 @@ RSpec.describe TopicQuery::PrivateMessageLists do
     fab!(:user) { Fabricate(:user) }
     fab!(:user_2) { Fabricate(:user) }
 
+    before_all do
+      Group.refresh_automatic_groups!
+    end
+
     fab!(:pm) do
       create_post(
         user: user,
diff --git a/spec/lib/topic_query_spec.rb b/spec/lib/topic_query_spec.rb
index afaddb25f8..e09227b712 100644
--- a/spec/lib/topic_query_spec.rb
+++ b/spec/lib/topic_query_spec.rb
@@ -1261,9 +1261,9 @@ RSpec.describe TopicQuery do
             expect(suggested_topics).to match_array([private_group_topic.id, private_message.id])
           end
 
-          context "when enable_personal_messages is false" do
+          context "when user is not in personal_message_enabled_groups" do
             before do
-              SiteSetting.enable_personal_messages = false
+              SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
             end
 
             it 'should not return topics by the group user' do
diff --git a/spec/models/group_archived_message_spec.rb b/spec/models/group_archived_message_spec.rb
index 5988d934e3..7a4fd9cda0 100644
--- a/spec/models/group_archived_message_spec.rb
+++ b/spec/models/group_archived_message_spec.rb
@@ -4,6 +4,10 @@ RSpec.describe GroupArchivedMessage do
   fab!(:user) { Fabricate(:user) }
   fab!(:user_2) { Fabricate(:user) }
 
+  before_all do
+    Group.refresh_automatic_groups!
+  end
+
   fab!(:group) do
     Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
       g.add(user_2)
diff --git a/spec/models/private_message_topic_tracking_state_spec.rb b/spec/models/private_message_topic_tracking_state_spec.rb
index 8e1063fb53..2e24ecd208 100644
--- a/spec/models/private_message_topic_tracking_state_spec.rb
+++ b/spec/models/private_message_topic_tracking_state_spec.rb
@@ -4,6 +4,10 @@ RSpec.describe PrivateMessageTopicTrackingState do
   fab!(:user) { Fabricate(:user) }
   fab!(:user_2) { Fabricate(:user) }
 
+  before_all do
+    Group.refresh_automatic_groups!
+  end
+
   fab!(:group) do
     Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
       g.add(user_2)
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 3dcc50f878..56abc419ae 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -725,6 +725,7 @@ RSpec.describe Topic do
       before do
         SiteSetting.max_topic_invitations_per_day = 1
         RateLimiter.enable
+        Group.refresh_automatic_groups!
       end
 
       after do
@@ -779,6 +780,10 @@ RSpec.describe Topic do
       fab!(:user) { trust_level_2 }
       fab!(:topic) { Fabricate(:private_message_topic, user: trust_level_2) }
 
+      before do
+        Group.refresh_automatic_groups!
+      end
+
       describe 'by username' do
         it 'should be able to invite a user' do
           expect(topic.invite(user, user1.username)).to eq(true)
@@ -831,7 +836,6 @@ RSpec.describe Topic do
         context "when PMs are enabled for TL3 or higher only" do
           before do
             SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
-            SiteSetting.enable_personal_messages = false
           end
 
           it 'should raise error' do
@@ -1029,9 +1033,11 @@ RSpec.describe Topic do
   end
 
   describe 'private message' do
+    fab!(:pm_user) { Fabricate(:user) }
     fab!(:topic) do
+      Group.refresh_automatic_groups!
       PostCreator.new(
-        Fabricate(:user),
+        pm_user,
         title: "This is a private message",
         raw: "This is my message to you-ou-ou",
         archetype: Archetype.private_message,
@@ -2470,6 +2476,7 @@ RSpec.describe Topic do
     end
 
     it "limits according to max_personal_messages_per_day" do
+      Group.refresh_automatic_groups!
       create_post(user: user, archetype: 'private_message', target_usernames: [user1.username, user2.username])
       expect {
         create_post(user: user, archetype: 'private_message', target_usernames: [user1.username, user2.username])
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index b61e0eedb3..9e34d548ab 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -392,6 +392,7 @@ RSpec.describe TopicUser do
         new_user.user_option.update!(auto_track_topics_after_msecs: 0)
 
         another_user = Fabricate(:user)
+        Group.refresh_automatic_groups!
         pm = Fabricate(:private_message_topic, user: another_user)
         pm.invite(another_user, new_user.username)
 
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index 984714f76f..303b0d5ad6 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -424,6 +424,7 @@ RSpec.describe TrustLevel3Requirements do
     let(:recent_post1) { create_post(topic: topic, user: user, created_at: 1.hour.ago) }
     let(:recent_post2) { create_post(topic: topic, user: user, created_at: 10.days.ago) }
     let(:private_post) do
+      Group.refresh_automatic_groups!
       create_post(
         user: user,
         archetype: Archetype.private_message,
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index d114257450..11e7ef5f9c 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -193,6 +193,7 @@ RSpec.describe UserSearch do
         search_for("", topic_id: pm_topic.id, searching_user: mr_b)
       end.to raise_error(Discourse::InvalidAccess)
 
+      Group.refresh_automatic_groups!
       pm_topic.invite(pm_topic.user, mr_b.username)
 
       results = search_for("", topic_id: pm_topic.id, searching_user: mr_b)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 70dc777cfc..a1a91cf9bd 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1601,6 +1601,8 @@ RSpec.describe User do
     fab!(:unactivated_old_with_post) { Fabricate(:user, active: false, created_at: 1.month.ago) }
 
     before do
+      Group.refresh_automatic_groups!
+
       PostCreator.new(Discourse.system_user,
                       title: "Welcome to our Discourse",
                       raw: "This is a welcome message",
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 262083c012..f4f1b41a4e 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -635,7 +635,6 @@ RSpec.describe GroupsController do
       expect(body["messageable"]).to eq(true)
 
       SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
-      SiteSetting.enable_personal_messages = false
 
       get "/groups/#{group.name}/messageable.json"
       expect(response.status).to eq(200)
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index cc6b941cd8..f105b1e8b0 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -197,7 +197,6 @@ RSpec.describe ListController do
       before do
         group.add(user)
         SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
-        SiteSetting.enable_personal_messages = false
         Group.refresh_automatic_groups!
       end
 
@@ -239,6 +238,7 @@ RSpec.describe ListController do
         group.add(user)
         sign_in(user)
         SiteSetting.unicode_usernames = false
+        Group.refresh_automatic_groups!
       end
 
       it 'should return the right response when user does not belong to group' do
@@ -266,6 +266,7 @@ RSpec.describe ListController do
       before do
         sign_in(user)
         SiteSetting.unicode_usernames = true
+        Group.refresh_automatic_groups!
       end
 
       it 'Returns a 200 with unicode group name' do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 1180a36c62..348a5d026a 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1067,6 +1067,7 @@ RSpec.describe PostsController do
       end
 
       it "can send a message to a group" do
+        Group.refresh_automatic_groups!
         group = Group.create(name: 'test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
         user1 = user
         group.add(user1)
@@ -1100,6 +1101,7 @@ RSpec.describe PostsController do
       end
 
       it "can send a message to a group with caps" do
+        Group.refresh_automatic_groups!
         group = Group.create(name: 'Test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
         user1 = user
         group.add(user1)
@@ -1303,6 +1305,7 @@ RSpec.describe PostsController do
         user_4 = Fabricate(:user, username: "Iyi_Iyi")
         user_4.update_attribute(:username, "İyi_İyi")
         user_4.update_attribute(:username_lower, "İyi_İyi".downcase)
+        Group.refresh_automatic_groups!
 
         post "/posts.json", params: {
           raw: 'this is the test content',
@@ -1462,6 +1465,10 @@ RSpec.describe PostsController do
     describe 'warnings' do
       fab!(:user_2) { Fabricate(:user) }
 
+      before do
+        Group.refresh_automatic_groups!
+      end
+
       context 'as a staff user' do
         before do
           sign_in(admin)
@@ -1898,6 +1905,10 @@ RSpec.describe PostsController do
     include_examples "action requires login", :get, "/posts/system/deleted.json"
 
     describe "when logged in" do
+      before do
+        Group.refresh_automatic_groups!
+      end
+
       it "raises an error if the user doesn't have permission to see the deleted posts" do
         sign_in(user)
         get "/posts/system/deleted.json"
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 7f84e4919a..212c55466d 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -3136,6 +3136,10 @@ RSpec.describe TopicsController do
       end
 
       context "with private message" do
+        before_all do
+          Group.refresh_automatic_groups!
+        end
+
         fab!(:group) do
           Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
             g.add(user_2)
@@ -3647,6 +3651,10 @@ RSpec.describe TopicsController do
       fab!(:topic) { Fabricate(:topic, user: user) }
       fab!(:post) { Fabricate(:post, user: user, topic: topic) }
 
+      before do
+        Group.refresh_automatic_groups!
+      end
+
       it "raises an error when the user doesn't have permission to convert topic" do
         sign_in(user)
         put "/t/#{topic.id}/convert-topic/private.json"
@@ -3673,6 +3681,10 @@ RSpec.describe TopicsController do
       fab!(:topic) { Fabricate(:private_message_topic, user: user) }
       fab!(:post) { Fabricate(:post, user: post_author1, topic: topic) }
 
+      before do
+        Group.refresh_automatic_groups!
+      end
+
       it "raises an error when the user doesn't have permission to convert topic" do
         sign_in(user)
         put "/t/#{topic.id}/convert-topic/public.json"
@@ -4490,6 +4502,10 @@ RSpec.describe TopicsController do
   end
 
   describe '#private_message_reset_new' do
+    before_all do
+      Group.refresh_automatic_groups!
+    end
+
     fab!(:group) do
       Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
         g.add(user_2)
@@ -4634,6 +4650,10 @@ RSpec.describe TopicsController do
   end
 
   describe '#archive_message' do
+    before_all do
+      Group.refresh_automatic_groups!
+    end
+
     fab!(:group) do
       Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
         g.add(user)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index ebcf3a0c56..56276bdecc 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -5535,6 +5535,7 @@ RSpec.describe UsersController do
     fab!(:user_2) { Fabricate(:user) }
 
     fab!(:private_message) do
+      Group.refresh_automatic_groups!
       create_post(
         user: user1,
         target_usernames: [user_2.username],
diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb
index f0711a6db4..1d3d98dfdc 100644
--- a/spec/serializers/basic_group_serializer_spec.rb
+++ b/spec/serializers/basic_group_serializer_spec.rb
@@ -41,10 +41,15 @@ RSpec.describe BasicGroupSerializer do
   describe '#has_messages' do
     fab!(:group) { Fabricate(:group, has_messages: true) }
 
+    before do
+      Group.refresh_automatic_groups!
+    end
+
     describe 'for a staff user' do
       let(:guardian) { Guardian.new(Fabricate(:moderator)) }
 
       it 'should be present' do
+        Group.refresh_automatic_groups!
         expect(subject.as_json[:has_messages]).to eq(true)
       end
     end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 75de9a1faf..d63674c3bc 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -98,7 +98,6 @@ RSpec.describe TopicViewSerializer do
 
   describe '#suggested_topics' do
     before do
-      SiteSetting.enable_personal_messages = false
       Group.refresh_automatic_groups!
     end
 
@@ -133,7 +132,6 @@ RSpec.describe TopicViewSerializer do
 
     describe 'with private messages' do
       before do
-        SiteSetting.enable_personal_messages = true
         Group.refresh_automatic_groups!
       end
 
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 9ef8c27d4d..43f4a5b86b 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -54,7 +54,9 @@ module Helpers
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     args[:raw] ||= "This is the raw body of my post, it is cool #{Helpers.next_seq}"
     args[:topic_id] = args[:topic].id if args[:topic]
+    automated_group_refresh_required = args[:user].blank?
     user = args.delete(:user) || Fabricate(:user)
+    Group.refresh_automatic_groups! if automated_group_refresh_required
     args[:category] = args[:category].id if args[:category].is_a?(Category)
     creator = PostCreator.new(user, args)
     post = creator.create

From 90f1e2df8020dbb552e414ed26efc687c4ab16ba Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 09:54:32 +0800
Subject: [PATCH 045/332] FIX: Link to `discovery.category` in sidebar`
 (#18467)

`discovery.category` route respects the default view of the category as
configured by `Category#default_view`. `discovery.latestCategory` forces
the latest filter when viewing the category which is not what we want.

https://meta.discourse.org/t/239999
---
 .../user/categories-section/category-section-link.js      | 4 ++--
 .../acceptance/sidebar-user-categories-section-test.js    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 365aa1ead5..6fa4638dbc 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -37,7 +37,7 @@ export default class CategorySectionLink {
   }
 
   get currentWhen() {
-    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory";
+    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory discovery.category";
   }
 
   get title() {
@@ -84,7 +84,7 @@ export default class CategorySectionLink {
     } else if (this.totalNew > 0) {
       return "discovery.newCategory";
     } else {
-      return "discovery.latestCategory";
+      return "discovery.category";
     }
   }
 }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 8737c9eb9e..e7e617893e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -212,8 +212,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       currentURL(),
-      `/c/${category1.slug}/${category1.id}/l/latest`,
-      "it should transition to the category1's discovery page"
+      `/c/${category1.slug}/${category1.id}`,
+      "it should transition to the category1 page"
     );
 
     assert.strictEqual(
@@ -231,8 +231,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       currentURL(),
-      `/c/${category2.slug}/${category2.id}/l/latest`,
-      "it should transition to the category2's discovery page"
+      `/c/${category2.slug}/${category2.id}`,
+      "it should transition to the category2's page"
     );
 
     assert.strictEqual(

From e3f1e0e9bcf89d960cc13cfa1bc56f60a89055a3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 5 Oct 2022 13:57:52 +1000
Subject: [PATCH 046/332] DEV: Add displaySection to sidebar sections (#18479)

This PR renames the old Sidebar::Section displaySection function
to displaySectionContent, and changes the meaning of displaySection
to hide the entire sidebar section including the header. This is
implemented via an arg passed to Sidebar::Section, which will default
to true if it is not passed, and the BaseCustomSidebarSection class
implements a default of `return true` for this function.
---
 .../app/components/sidebar/section.hbs        | 74 ++++++++++---------
 .../app/components/sidebar/section.js         | 20 +++--
 .../app/components/sidebar/user/sections.hbs  |  3 +-
 .../sidebar/base-custom-sidebar-section.js    |  7 ++
 .../acceptance/sidebar-plugin-api-test.js     | 45 +++++++++++
 .../components/sidebar/section-test.js        | 73 ++++++++++++++++++
 6 files changed, 179 insertions(+), 43 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/sidebar/section-test.js

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
index 1a2381edb8..de74d2ccdf 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
@@ -1,42 +1,44 @@
-<div class={{concat "sidebar-section-wrapper sidebar-section-" @sectionName}}>
-  <div class="sidebar-section-header-wrapper sidebar-row">
-    <Sidebar::SectionHeader @collapsable={{@collapsable}} @toggleSectionDisplay={{this.toggleSectionDisplay}}>
-      {{#if @collapsable}}
-        <span class="sidebar-section-header-caret">
-          {{d-icon this.headerCaretIcon}}
+{{#if this.displaySection}}
+  <div class={{concat "sidebar-section-wrapper sidebar-section-" @sectionName}}>
+    <div class="sidebar-section-header-wrapper sidebar-row">
+      <Sidebar::SectionHeader @collapsable={{@collapsable}} @toggleSectionDisplay={{this.toggleSectionDisplay}}>
+        {{#if @collapsable}}
+          <span class="sidebar-section-header-caret">
+            {{d-icon this.headerCaretIcon}}
+          </span>
+        {{/if}}
+
+        <span class="sidebar-section-header-text">
+          {{@headerLinkText}}
         </span>
+      </Sidebar::SectionHeader>
+
+      {{#if this.isSingleHeaderAction}}
+        {{#each @headerActions as |headerAction|}}
+          <button
+            type="button"
+            class="sidebar-section-header-button"
+            {{on "click" headerAction.action}}
+            title={{headerAction.title}}
+          >
+            {{d-icon @headerActionsIcon}}
+          </button>
+        {{/each}}
       {{/if}}
 
-      <span class="sidebar-section-header-text">
-        {{@headerLinkText}}
-      </span>
-    </Sidebar::SectionHeader>
+      {{#if this.isMultipleHeaderActions}}
+        <DropdownSelectBox
+          @options={{hash icon=@headerActionsIcon placementStrategy="absolute"}}
+          @content={{@headerActions}}
+          @onChange={{action "handleMultipleHeaderActions"}}
+          @class="sidebar-section-header-dropdown" />
+      {{/if}}
+    </div>
 
-    {{#if this.isSingleHeaderAction}}
-      {{#each @headerActions as |headerAction|}}
-        <button
-          type="button"
-          class="sidebar-section-header-button"
-          {{on "click" headerAction.action}}
-          title={{headerAction.title}}
-        >
-          {{d-icon @headerActionsIcon}}
-        </button>
-      {{/each}}
-    {{/if}}
-
-    {{#if this.isMultipleHeaderActions}}
-      <DropdownSelectBox
-        @options={{hash icon=@headerActionsIcon placementStrategy="absolute"}}
-        @content={{@headerActions}}
-        @onChange={{action "handleMultipleHeaderActions"}}
-        @class="sidebar-section-header-dropdown" />
+    {{#if this.displaySectionContent}}
+      <div class="sidebar-section-content">
+        {{yield}}
+      </div>
     {{/if}}
   </div>
-
-  {{#if this.displaySection}}
-    <div class="sidebar-section-content">
-      {{yield}}
-    </div>
-  {{/if}}
-</div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section.js b/app/assets/javascripts/discourse/app/components/sidebar/section.js
index 7b348f64e4..ea11c34d95 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section.js
@@ -7,20 +7,20 @@ import { tracked } from "@glimmer/tracking";
 export default class SidebarSection extends Component {
   @service keyValueStore;
 
-  @tracked displaySection;
+  @tracked displaySectionContent;
   collapsedSidebarSectionKey = `sidebar-section-${this.args.sectionName}-collapsed`;
 
   constructor() {
     super(...arguments);
 
     if (this.args.collapsable) {
-      this.displaySection =
+      this.displaySectionContent =
         this.keyValueStore.getItem(this.collapsedSidebarSectionKey) ===
         undefined
           ? true
           : false;
     } else {
-      this.displaySection = true;
+      this.displaySectionContent = true;
     }
   }
 
@@ -32,9 +32,9 @@ export default class SidebarSection extends Component {
 
   @action
   toggleSectionDisplay() {
-    this.displaySection = !this.displaySection;
+    this.displaySectionContent = !this.displaySectionContent;
 
-    if (this.displaySection) {
+    if (this.displaySectionContent) {
       this.keyValueStore.remove(this.collapsedSidebarSectionKey);
     } else {
       this.keyValueStore.setItem(this.collapsedSidebarSectionKey, true);
@@ -54,7 +54,7 @@ export default class SidebarSection extends Component {
   }
 
   get headerCaretIcon() {
-    return this.displaySection ? "angle-down" : "angle-right";
+    return this.displaySectionContent ? "angle-down" : "angle-right";
   }
 
   get isSingleHeaderAction() {
@@ -64,4 +64,12 @@ export default class SidebarSection extends Component {
   get isMultipleHeaderActions() {
     return this.args.headerActions?.length > 1;
   }
+
+  get displaySection() {
+    if (this.args.displaySection === undefined) {
+      return true;
+    }
+
+    return this.args.displaySection;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
index a5987ba0d9..518875cb93 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
@@ -18,7 +18,8 @@
       @headerActionsIcon={{customSection.actionsIcon}}
       @headerActions={{customSection.actions}}
       @willDestroy={{customSection.willDestroy}}
-      @collapsable={{@collapsableSections}}>
+      @collapsable={{@collapsableSections}}
+      @displaySection={{customSection.displaySection}}>
 
       {{#each customSection.links as |link|}}
         <Sidebar::SectionLink
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
index 5e8be1b224..85dc82e188 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
@@ -35,6 +35,13 @@ export default class BaseCustomSidebarSection {
    */
   get links() {}
 
+  /**
+   * @returns {Boolean} Whether or not to show the entire section including heading.
+   */
+  get displaySection() {
+    return true;
+  }
+
   _notImplemented() {
     throw "not implemented";
   }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
index e83b1a05e4..553e4daaea 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
@@ -564,4 +564,49 @@ acceptance("Sidebar - Plugin API", function (needs) {
       "does not display my favourite topic custom section link when current route does not match the link's route"
     );
   });
+
+  test("Section that is not displayed via displaySection", async function (assert) {
+    withPluginApi("1.3.0", (api) => {
+      api.addSidebarSection((BaseCustomSidebarSection) => {
+        return class extends BaseCustomSidebarSection {
+          get name() {
+            return "test-chat-channels";
+          }
+
+          get text() {
+            return "chat channels text";
+          }
+
+          get actionsIcon() {
+            return "cog";
+          }
+
+          get actions() {
+            return [
+              {
+                id: "browseChannels",
+                title: "Browse channels",
+                action: () => {},
+              },
+            ];
+          }
+
+          get links() {
+            return [];
+          }
+
+          get displaySection() {
+            return false;
+          }
+        };
+      });
+    });
+
+    await visit("/");
+
+    assert.notOk(
+      exists(".sidebar-section-test-chat-channels"),
+      "does not display the section"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-test.js b/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-test.js
new file mode 100644
index 0000000000..76b734e6e3
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-test.js
@@ -0,0 +1,73 @@
+import { module, test } from "qunit";
+import { hbs } from "ember-cli-htmlbars";
+import { click, render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { exists } from "discourse/tests/helpers/qunit-helpers";
+
+module("Integration | Component | sidebar | section", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("default displaySection value for section", async function (assert) {
+    const template = hbs`
+      <Sidebar::Section
+        @sectionName="test"
+        @headerLinkText="test header"
+        @headerLinkTitle="some title"
+        @headerActionsIcon="plus"
+        @headerActions={{this.headerActions}} />`;
+
+    this.headerActions = [];
+    await render(template);
+
+    assert.ok(
+      exists(".sidebar-section-wrapper"),
+      "section is displayed by default if no display arg is provided"
+    );
+  });
+
+  test("displaySection is dynamic based on argument", async function (assert) {
+    const template = hbs`
+      <Sidebar::Section
+        @sectionName="test"
+        @headerLinkText="test header"
+        @headerLinkTitle="some title"
+        @headerActionsIcon="plus"
+        @headerActions={{this.headerActions}}
+        @displaySection={{this.displaySection}}/>`;
+
+    this.displaySection = false;
+    this.headerActions = [];
+    await render(template);
+
+    assert.notOk(
+      exists(".sidebar-section-wrapper"),
+      "section is not displayed"
+    );
+
+    this.set("displaySection", true);
+    assert.ok(exists(".sidebar-section-wrapper"), "section is displayed");
+  });
+
+  test("can expand and collapse content when section is collapsible", async function (assert) {
+    const template = hbs`
+      <Sidebar::Section
+        @sectionName="test"
+        @headerLinkText="test header"
+        @headerLinkTitle="some title"
+        @headerActionsIcon="plus"
+        @headerActions={{this.headerActions}}
+        @collapsable=true />`;
+
+    this.headerActions = [];
+    await render(template);
+
+    assert.ok(exists(".sidebar-section-content"), "shows content by default");
+
+    await click(".sidebar-section-header-caret");
+
+    assert.notOk(
+      exists(".sidebar-section-content"),
+      "does not show content after collapsing"
+    );
+  });
+});

From 70258232f5b0ff2c8336147ddf1f15183af582a4 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Wed, 5 Oct 2022 12:39:35 +0800
Subject: [PATCH 047/332] DEV: Add tests for review-index route (#18415)

Add tests for review-index route
---
 .../tests/unit/routes/review-index-test.js    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js

diff --git a/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js b/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js
new file mode 100644
index 0000000000..489777c775
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js
@@ -0,0 +1,66 @@
+import User from "discourse/models/user";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+
+module("Unit | Route | review-index", function (hooks) {
+  setupTest(hooks);
+
+  test("subscribes and unsubscribes /reviewable_counts MessageBus channel when user menu not enabled", function (assert) {
+    const currentUser = User.create({ redesigned_user_menu_enabled: false });
+    this.owner.unregister("service:current-user");
+    this.owner.register("service:current-user", currentUser, {
+      instantiate: false,
+    });
+    this.owner.inject("route", "currentUser", "service:current-user");
+
+    const reviewIndexRoute = this.owner.lookup("route:review-index");
+    const messageBus = this.owner.lookup("service:message-bus");
+
+    let channels = messageBus.callbacks.map((c) => c.channel);
+    assert.false(channels.includes("/reviewable_counts"));
+    assert.false(channels.includes("/reviewable_claimed"));
+
+    reviewIndexRoute.activate();
+
+    channels = messageBus.callbacks.map((c) => c.channel);
+    assert.true(channels.includes("/reviewable_counts"));
+    assert.true(channels.includes("/reviewable_claimed"));
+
+    reviewIndexRoute.deactivate();
+
+    channels = messageBus.callbacks.map((c) => c.channel);
+    assert.false(channels.includes("/reviewable_counts"));
+    assert.false(channels.includes("/reviewable_claimed"));
+  });
+
+  test("subscribes and unsubscribes /reviewable_counts(with id) when user menu enabled", function (assert) {
+    const currentUser = User.create({
+      redesigned_user_menu_enabled: true,
+      id: "the-id",
+    });
+    this.owner.unregister("service:current-user");
+    this.owner.register("service:current-user", currentUser, {
+      instantiate: false,
+    });
+    this.owner.inject("route", "currentUser", "service:current-user");
+
+    const reviewIndexRoute = this.owner.lookup("route:review-index");
+    const messageBus = this.owner.lookup("service:message-bus");
+
+    let channels = messageBus.callbacks.map((c) => c.channel);
+    assert.false(channels.includes("/reviewable_counts/the-id"));
+    assert.false(channels.includes("/reviewable_claimed"));
+
+    reviewIndexRoute.activate();
+
+    channels = messageBus.callbacks.map((c) => c.channel);
+    assert.true(channels.includes("/reviewable_counts/the-id"));
+    assert.true(channels.includes("/reviewable_claimed"));
+
+    reviewIndexRoute.deactivate();
+
+    channels = messageBus.callbacks.map((c) => c.channel);
+    assert.false(channels.includes("/reviewable_counts/the-id"));
+    assert.false(channels.includes("/reviewable_claimed"));
+  });
+});

From 63b7f7c85c47292a8f8923eb172986223d34116f Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 12:50:30 +0800
Subject: [PATCH 048/332] UX: `More...` -> `More` in Sidebar (#18482)

We already have an icon so `...` is redundant
---
 config/locales/client.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3a485e8d00..e8f39b3f01 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4140,7 +4140,7 @@ en:
         one: "%{count} new"
         other: "%{count} new"
       toggle_section: "toggle section"
-      more: "More..."
+      more: "More"
       all_categories: "All categories"
       all_tags: "All tags"
       sections:

From 637b1211b5c06e32050ff138d68e92415e3279d6 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 14:19:46 +0800
Subject: [PATCH 049/332] DEV: Convert experimental user page activity nav to
 horizontal nav (#18483)

As usual, design is still in flux so no tests for now.

Internal Ref: /t/67780/59
---
 .../discourse/app/components/user-nav.hbs     | 44 +++----------------
 .../app/components/user-nav/messages-nav.hbs  |  2 +-
 .../discourse/app/templates/user/activity.hbs | 40 ++++++++++++++++-
 .../app/templates/user/notifications.hbs      |  2 +-
 4 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 6988e134fa..e5f45b102d 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -9,44 +9,12 @@
           </LinkTo>
         </li>
 
-        <UserNav::DropdownList
-          @icon="stream"
-          @text={{i18n "user.activity_stream"}}
-          @isActive={{eq @currentParentRoute "userActivity"}}
-          @class="user-activity" >
-
-          <:submenu>
-            <DNavigationItem @route="userActivity.index">{{i18n "user.filters.all"}}</DNavigationItem>
-            <DNavigationItem @route="userActivity.topics">{{i18n "user_action_groups.4"}}</DNavigationItem>
-            <DNavigationItem @route="userActivity.replies">{{i18n "user_action_groups.5"}}</DNavigationItem>
-
-            {{#if @showRead}}
-              <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
-                {{i18n "user.read"}}
-              </DNavigationItem>
-            {{/if}}
-
-            {{#if @showDrafts}}
-              <DNavigationItem @route="userActivity.drafts">
-                {{this.draftLabel}}
-              </DNavigationItem>
-            {{/if}}
-
-            {{#if (gt @user.pending_posts_count 0)}}
-              <DNavigationItem @route="userActivity.pending">
-                {{this.pendingLabel}}
-              </DNavigationItem>
-            {{/if}}
-
-            <DNavigationItem @route="userActivity.likesGiven">{{i18n "user_action_groups.1"}}</DNavigationItem>
-
-            {{#if @showBookmarks}}
-              <DNavigationItem @route="userActivity.bookmarks">{{i18n "user_action_groups.3"}}</DNavigationItem>
-            {{/if}}
-
-            <PluginOutlet @name="user-activity-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=@user}} />
-          </:submenu>
-        </UserNav::DropdownList>
+        <li class="user-activity">
+          <LinkTo @route="userActivity">
+            {{d-icon "stream"}}
+            {{i18n "user.activity_stream"}}
+          </LinkTo>
+        </li>
       {{/unless}}
 
       {{#if @showNotificationsTab}}
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
index a35091d7a7..e0744b6030 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
@@ -88,7 +88,7 @@
       {{/if}}
     {{/if}}
 
-    <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=@user}} />
+    <PluginOutlet @name="user-messages-nav" @connectorTagName="li" @args={{hash model=@user}} />
   </ul>
 
   {{#if this.site.desktopView}}
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index a115f1cf06..18a0971b36 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -1,4 +1,40 @@
-{{#unless this.currentUser.redesigned_user_page_nav_enabled}}
+{{#if this.currentUser.redesigned_user_page_nav_enabled}}
+  <DSection @pageClass="user-activity" />
+
+  <div class="user-navigation-container">
+    <ul id="navigation-bar" class="nav-pills action-list">
+      <DNavigationItem @route="userActivity.index">{{i18n "user.filters.all"}}</DNavigationItem>
+      <DNavigationItem @route="userActivity.topics">{{i18n "user_action_groups.4"}}</DNavigationItem>
+      <DNavigationItem @route="userActivity.replies">{{i18n "user_action_groups.5"}}</DNavigationItem>
+
+      {{#if this.user.showRead}}
+        <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
+          {{i18n "user.read"}}
+        </DNavigationItem>
+      {{/if}}
+
+      {{#if this.user.showDrafts}}
+        <DNavigationItem @route="userActivity.drafts">
+          {{this.draftLabel}}
+        </DNavigationItem>
+      {{/if}}
+
+      {{#if (gt this.model.pending_posts_count 0)}}
+        <DNavigationItem @route="userActivity.pending">
+          {{this.pendingLabel}}
+        </DNavigationItem>
+      {{/if}}
+
+      <DNavigationItem @route="userActivity.likesGiven">{{i18n "user_action_groups.1"}}</DNavigationItem>
+
+      {{#if this.user.showBookmarks}}
+        <DNavigationItem @route="userActivity.bookmarks">{{i18n "user_action_groups.3"}}</DNavigationItem>
+      {{/if}}
+
+      <PluginOutlet @name="user-activity-bottom" @connectorTagName="li" @args={{hash model=this.model}} />
+    </ul>
+  </div>
+{{else}}
   <DSection @pageClass="user-activity" @class="user-secondary-navigation" @scrollTop={{false}}>
     <nav role="navigation">
       <MobileNav @class="activity-nav" @desktopClass="action-list activity-list nav-stacked">
@@ -40,7 +76,7 @@
       <DButton @action={{action "exportUserArchive"}} @class="btn-default" @label="user.download_archive.button_text" @icon="download" />
     </section>
   {{/if}}
-{{/unless}}
+{{/if}}
 
 <section class="user-content">
   {{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 462340cf05..a1ba2bbf29 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -35,7 +35,7 @@
         </LinkTo>
       </li>
 
-      <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
+      <PluginOutlet @name="user-notifications-bottom" @connectorTagName="li" @args={{hash model=this.model}} />
     </ul>
 
     {{#if this.model}}

From c0037dc0f06f08bd050aedc8aad97d1f05b322ab Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 14:20:03 +0800
Subject: [PATCH 050/332] FIX: Missing sidebar section link icon for PM tags
 (#18481)

No tests cause a missing icon regression is not the end of the world and
I don't feel like it will provide enough value as a regression test long
term.
---
 .../messages-section/message-section-link.js  |  8 ++-----
 .../tags-section/base-tag-section-link.js     | 21 +++++++++++++++++
 .../user/tags-section/pm-tag-section-link.js  | 16 ++++---------
 .../user/tags-section/tag-section-link.js     | 23 ++++---------------
 4 files changed, 32 insertions(+), 36 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
index a28cebdeb7..d1a10fefb0 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
@@ -73,14 +73,10 @@ export default class MessageSectionLink {
   }
 
   get prefixType() {
-    if (this._isInbox) {
-      return "icon";
-    }
+    return "icon";
   }
 
   get prefixValue() {
-    if (this._isInbox) {
-      return "inbox";
-    }
+    return "inbox";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js
new file mode 100644
index 0000000000..6a32ae9027
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js
@@ -0,0 +1,21 @@
+export default class BaseTagSectionLink {
+  constructor({ tagName }) {
+    this.tagName = tagName;
+  }
+
+  get name() {
+    return this.tagName;
+  }
+
+  get text() {
+    return this.tagName;
+  }
+
+  get prefixType() {
+    return "icon";
+  }
+
+  get prefixValue() {
+    return "tag";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
index fceac26abf..3c1b4ccb1b 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
@@ -1,11 +1,9 @@
-export default class PMTagSectionLink {
-  constructor({ tagName, currentUser }) {
-    this.tagName = tagName;
-    this.currentUser = currentUser;
-  }
+import BaseTagSectionLink from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
 
-  get name() {
-    return this.tagName;
+export default class PMTagSectionLink extends BaseTagSectionLink {
+  constructor({ currentUser }) {
+    super(...arguments);
+    this.currentUser = currentUser;
   }
 
   get models() {
@@ -15,8 +13,4 @@ export default class PMTagSectionLink {
   get route() {
     return "userPrivateMessages.tagsShow";
   }
-
-  get text() {
-    return this.tagName;
-  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
index 85ee3ae956..094fe74de2 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
@@ -3,13 +3,14 @@ import I18n from "I18n";
 import { tracked } from "@glimmer/tracking";
 
 import { bind } from "discourse-common/utils/decorators";
+import BaseTagSectionLink from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
 
-export default class TagSectionLink {
+export default class TagSectionLink extends BaseTagSectionLink {
   @tracked totalUnread = 0;
   @tracked totalNew = 0;
 
-  constructor({ tagName, topicTrackingState }) {
-    this.tagName = tagName;
+  constructor({ topicTrackingState }) {
+    super(...arguments);
     this.topicTrackingState = topicTrackingState;
     this.refreshCounts();
   }
@@ -27,10 +28,6 @@ export default class TagSectionLink {
     }
   }
 
-  get name() {
-    return this.tagName;
-  }
-
   get models() {
     return [this.tagName];
   }
@@ -49,10 +46,6 @@ export default class TagSectionLink {
     return "tag.show tag.showNew tag.showUnread tag.showTop";
   }
 
-  get text() {
-    return this.tagName;
-  }
-
   get badgeText() {
     if (this.totalUnread > 0) {
       return I18n.t("sidebar.unread_count", {
@@ -64,12 +57,4 @@ export default class TagSectionLink {
       });
     }
   }
-
-  get prefixType() {
-    return "icon";
-  }
-
-  get prefixValue() {
-    return "tag";
-  }
 }

From 4d05e3edab1c2968980316ef6e1d0ef7e5bdca82 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Wed, 5 Oct 2022 12:30:02 +0300
Subject: [PATCH 051/332] DEV: Include pending reviewables in the main tab in
 the user menu (#18471)

This commit makes pending reviewables show up in the main tab (a.k.a. "all notifications" tab). Pending reviewables along with unread notifications are always shown first and they're sorted based on their creation date (most recent comes first).

The dismiss button currently only shows up if there are unread notifications and it doesn't dismiss pending reviewables. We may follow up with another change soon that allows makes the dismiss button work with reviewables and remove them from the list without taking any action on them.

Follow-up to https://github.com/discourse/discourse/commit/079450c9e496ac9bed8ff491ceb1e4ac0b83448f.
---
 .../app/components/user-menu/messages-list.js |  48 ++----
 .../user-menu/notifications-list.js           |  80 ++++++++--
 .../discourse/app/lib/utilities.js            |  26 ++++
 .../discourse/app/models/notification.js      |   6 +
 .../user-menu/notifications-list-test.js      | 124 ++++++++++++++-
 .../tests/unit/lib/utilities-test.js          |  40 +++++
 app/controllers/notifications_controller.rb   |  29 ++--
 app/controllers/reviewables_controller.rb     |   6 +-
 app/models/reviewable.rb                      |   8 +
 .../basic_reviewable_serializer.rb            |   2 +-
 .../requests/notifications_controller_spec.rb | 142 +++++++++++-------
 .../common_basic_reviewable_serializer.rb     |   8 +
 12 files changed, 394 insertions(+), 125 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
index 7d916ec668..192967c3ca 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
@@ -6,18 +6,7 @@ import I18n from "I18n";
 import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
 import UserMenuMessageItem from "discourse/lib/user-menu/message-item";
 import Topic from "discourse/models/topic";
-
-function parseDateString(date) {
-  if (date) {
-    return new Date(date);
-  }
-}
-
-async function initializeNotifications(rawList) {
-  const notifications = rawList.map((n) => Notification.create(n));
-  await Notification.applyTransformations(notifications);
-  return notifications;
-}
+import { mergeSortedLists } from "discourse/lib/utilities";
 
 export default class UserMenuMessagesList extends UserMenuNotificationsList {
   get dismissTypes() {
@@ -63,7 +52,7 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
     );
     const content = [];
 
-    const unreadNotifications = await initializeNotifications(
+    const unreadNotifications = await Notification.initializeNotifications(
       data.unread_notifications
     );
     unreadNotifications.forEach((notification) => {
@@ -80,38 +69,29 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
     const topics = data.topics.map((t) => Topic.create(t));
     await Topic.applyTransformations(topics);
 
-    const readNotifications = await initializeNotifications(
+    const readNotifications = await Notification.initializeNotifications(
       data.read_notifications
     );
 
-    let latestReadNotificationDate = parseDateString(
-      readNotifications[0]?.created_at
-    );
-    let latestMessageDate = parseDateString(topics[0]?.bumped_at);
-
-    while (latestReadNotificationDate || latestMessageDate) {
-      if (
-        !latestReadNotificationDate ||
-        (latestMessageDate && latestReadNotificationDate < latestMessageDate)
-      ) {
-        content.push(new UserMenuMessageItem({ message: topics[0] }));
-        topics.shift();
-        latestMessageDate = parseDateString(topics[0]?.bumped_at);
-      } else {
+    mergeSortedLists(readNotifications, topics, (notification, topic) => {
+      const notificationCreatedAt = new Date(notification.created_at);
+      const topicBumpedAt = new Date(topic.bumped_at);
+      return topicBumpedAt > notificationCreatedAt;
+    }).forEach((item) => {
+      if (item instanceof Notification) {
         content.push(
           new UserMenuNotificationItem({
-            notification: readNotifications[0],
+            notification: item,
             currentUser: this.currentUser,
             siteSettings: this.siteSettings,
             site: this.site,
           })
         );
-        readNotifications.shift();
-        latestReadNotificationDate = parseDateString(
-          readNotifications[0]?.created_at
-        );
+      } else {
+        content.push(new UserMenuMessageItem({ message: item }));
       }
-    }
+    });
+
     return content;
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
index a585b5a06f..efe1cadf52 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
@@ -2,11 +2,16 @@ import UserMenuItemsList from "discourse/components/user-menu/items-list";
 import I18n from "I18n";
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
-import { postRNWebviewMessage } from "discourse/lib/utilities";
+import {
+  mergeSortedLists,
+  postRNWebviewMessage,
+} from "discourse/lib/utilities";
 import showModal from "discourse/lib/show-modal";
 import { inject as service } from "@ember/service";
 import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
 import Notification from "discourse/models/notification";
+import UserMenuReviewable from "discourse/models/user-menu-reviewable";
+import UserMenuReviewableItem from "discourse/lib/user-menu/reviewable-item";
 
 export default class UserMenuNotificationsList extends UserMenuItemsList {
   @service currentUser;
@@ -31,7 +36,11 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
   }
 
   get showDismiss() {
-    return this.items.some((item) => !item.notification.read);
+    return Object.keys(
+      this.currentUser.get("grouped_unread_notifications") || {}
+    ).any((key) => {
+      return this.currentUser.get(`grouped_unread_notifications.${key}`) > 0;
+    });
   }
 
   get dismissTitle() {
@@ -60,27 +69,70 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
       limit: 30,
       recent: true,
       bump_last_seen_reviewable: true,
-      silent: this.currentUser.enforcedSecondFactor,
     };
 
+    if (this.currentUser.enforcedSecondFactor) {
+      params.silent = true;
+    }
+
     const types = this.filterByTypes;
     if (types?.length > 0) {
       params.filter_by_types = types.join(",");
       params.silent = true;
     }
-    const collection = await this.store
-      .findStale("notification", params)
-      .refresh();
-    const notifications = collection.content;
-    await Notification.applyTransformations(notifications);
-    return notifications.map((notification) => {
-      return new UserMenuNotificationItem({
-        notification,
-        currentUser: this.currentUser,
-        siteSettings: this.siteSettings,
-        site: this.site,
+
+    const content = [];
+    const data = await ajax("/notifications", { data: params });
+
+    const notifications = await Notification.initializeNotifications(
+      data.notifications
+    );
+
+    const reviewables = data.pending_reviewables?.map((r) =>
+      UserMenuReviewable.create(r)
+    );
+
+    if (reviewables?.length) {
+      const firstReadNotificationIndex = notifications.findIndex((n) => n.read);
+      const unreadNotifications = notifications.splice(
+        0,
+        firstReadNotificationIndex
+      );
+      mergeSortedLists(
+        unreadNotifications,
+        reviewables,
+        (notification, reviewable) => {
+          const notificationCreatedAt = new Date(notification.created_at);
+          const reviewableCreatedAt = new Date(reviewable.created_at);
+          return reviewableCreatedAt > notificationCreatedAt;
+        }
+      ).forEach((item) => {
+        const props = {
+          currentUser: this.currentUser,
+          siteSettings: this.siteSettings,
+          site: this.site,
+        };
+        if (item instanceof Notification) {
+          props.notification = item;
+          content.push(new UserMenuNotificationItem(props));
+        } else {
+          props.reviewable = item;
+          content.push(new UserMenuReviewableItem(props));
+        }
       });
+    }
+
+    notifications.forEach((notification) => {
+      content.push(
+        new UserMenuNotificationItem({
+          notification,
+          currentUser: this.currentUser,
+          siteSettings: this.siteSettings,
+          site: this.site,
+        })
+      );
     });
+    return content;
   }
 
   dismissWarningModal() {
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index a54b3c6c67..d2ae39cdea 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -606,5 +606,31 @@ function clipboardCopyFallback(text) {
   return success;
 }
 
+// this function takes 2 sorted lists and returns another sorted list that
+// contains both of the original lists.
+// you need to provide a callback as the 3rd argument that will be called with
+// an item from the first list (1st callback argument) and another item from
+// the second list (2nd callback argument). The callback should return true if
+// its 2nd argument should go before its 1st argument and return false
+// otherwise.
+export function mergeSortedLists(list1, list2, comparator) {
+  let index1 = 0;
+  let index2 = 0;
+  const merged = [];
+  while (index1 < list1.length || index2 < list2.length) {
+    if (
+      index1 === list1.length ||
+      (index2 < list2.length && comparator(list1[index1], list2[index2]))
+    ) {
+      merged.push(list2[index2]);
+      index2++;
+    } else {
+      merged.push(list1[index1]);
+      index1++;
+    }
+  }
+  return merged;
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/discourse/app/models/notification.js b/app/assets/javascripts/discourse/app/models/notification.js
index 000aa0c10a..b49d8003c2 100644
--- a/app/assets/javascripts/discourse/app/models/notification.js
+++ b/app/assets/javascripts/discourse/app/models/notification.js
@@ -7,5 +7,11 @@ export default class Notification extends RestModel {
     await applyModelTransformations("notification", notifications);
   }
 
+  static async initializeNotifications(rawList) {
+    const notifications = rawList.map((n) => this.create(n));
+    await this.applyTransformations(notifications);
+    return notifications;
+  }
+
   @tracked read;
 }
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/notifications-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/notifications-list-test.js
index cf1baf30b8..1c8c6e4fd8 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/notifications-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/notifications-list-test.js
@@ -1,10 +1,11 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, render } from "@ember/test-helpers";
 import { cloneJSON } from "discourse-common/lib/object";
 import NotificationFixtures from "discourse/tests/fixtures/notification-fixtures";
 import { hbs } from "ember-cli-htmlbars";
+import { NOTIFICATION_TYPES } from "discourse/tests/fixtures/concerns/notification-types";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import I18n from "I18n";
 
@@ -78,11 +79,10 @@ module(
       );
     });
 
-    test("has a dismiss button if some notifications are not read", async function (assert) {
-      notificationsData.forEach((notification) => {
-        notification.read = true;
+    test("has a dismiss button if some notification types have unread notifications", async function (assert) {
+      this.currentUser.set("grouped_unread_notifications", {
+        [NOTIFICATION_TYPES.mentioned]: 1,
       });
-      notificationsData[0].read = false;
       await render(template);
       const dismissButton = query(
         ".panel-body-bottom .btn.notifications-dismiss"
@@ -109,9 +109,8 @@ module(
 
     test("dismiss button makes a request to the server and then refreshes the notifications list", async function (assert) {
       await render(template);
-      notificationsData = getNotificationsData();
-      notificationsData.forEach((notification) => {
-        notification.read = true;
+      this.currentUser.set("grouped_unread_notifications", {
+        [NOTIFICATION_TYPES.mentioned]: 1,
       });
       assert.strictEqual(notificationsFetches, 1);
       await click(".panel-body-bottom .btn.notifications-dismiss");
@@ -126,5 +125,114 @@ module(
         "dismiss button is not shown"
       );
     });
+
+    test("all notifications tab shows pending reviewables and sorts them with unread notifications based on their creation date", async function (assert) {
+      pretender.get("/notifications", () => {
+        return response({
+          notifications: [
+            {
+              id: 6,
+              user_id: 1,
+              notification_type: NOTIFICATION_TYPES.mentioned,
+              read: false,
+              high_priority: false,
+              created_at: "2021-11-25T19:31:13.241Z",
+              post_number: 6,
+              topic_id: 10,
+              fancy_title: "Unread notification #01",
+              slug: "unread-notification-01",
+              data: {
+                topic_title: "Unread notification #01",
+                original_post_id: 20,
+                original_post_type: 1,
+                original_username: "discobot",
+                revision_number: null,
+                display_username: "discobot",
+              },
+            },
+            {
+              id: 13,
+              user_id: 1,
+              notification_type: NOTIFICATION_TYPES.replied,
+              read: false,
+              high_priority: false,
+              created_at: "2021-08-25T19:31:13.241Z",
+              post_number: 6,
+              topic_id: 10,
+              fancy_title: "Unread notification #02",
+              slug: "unread-notification-02",
+              data: {
+                topic_title: "Unread notification #02",
+                original_post_id: 20,
+                original_post_type: 1,
+                original_username: "discobot",
+                revision_number: null,
+                display_username: "discobot",
+              },
+            },
+            {
+              id: 81,
+              user_id: 1,
+              notification_type: NOTIFICATION_TYPES.mentioned,
+              read: true,
+              high_priority: false,
+              created_at: "2022-10-25T19:31:13.241Z",
+              post_number: 6,
+              topic_id: 10,
+              fancy_title: "Read notification #01",
+              slug: "read-notification-01",
+              data: {
+                topic_title: "Read notification #01",
+                original_post_id: 20,
+                original_post_type: 1,
+                original_username: "discobot",
+                revision_number: null,
+                display_username: "discobot",
+              },
+            },
+          ],
+          pending_reviewables: [
+            {
+              flagger_username: "sayo2",
+              id: 83,
+              pending: true,
+              topic_fancy_title: "anything hello world 0011",
+              type: "ReviewableQueuedPost",
+              created_at: "2022-09-25T19:31:13.241Z",
+            },
+            {
+              flagger_username: "sayo2",
+              id: 78,
+              pending: true,
+              topic_fancy_title: "anything hello world 0033",
+              type: "ReviewableQueuedPost",
+              created_at: "2021-06-25T19:31:13.241Z",
+            },
+          ],
+        });
+      });
+      await render(template);
+      const items = queryAll("ul li");
+      assert.ok(
+        items[0].textContent.includes("hello world 0011"),
+        "the first pending reviewable is displayed 1st because it's most recent among pending reviewables and unread notifications"
+      );
+      assert.ok(
+        items[1].textContent.includes("Unread notification #01"),
+        "the first unread notification is displayed 2nd because it's the 2nd most recent among pending reviewables and unread notifications"
+      );
+      assert.ok(
+        items[2].textContent.includes("Unread notification #02"),
+        "the second unread notification is displayed 3rd because it's the 3rd most recent among pending reviewables and unread notifications"
+      );
+      assert.ok(
+        items[3].textContent.includes("hello world 0033"),
+        "the second pending reviewable is displayed 4th because it's the 4th most recent among pending reviewables and unread notifications"
+      );
+      assert.ok(
+        items[4].textContent.includes("Read notification #01"),
+        "read notifications come after the pending reviewables and unread notifications"
+      );
+    });
   }
 );
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index ebc2f66d70..6bb987c852 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -12,6 +12,7 @@ import {
   getRawSize,
   inCodeBlock,
   initializeDefaultHomepage,
+  mergeSortedLists,
   setCaretPosition,
   setDefaultHomepage,
   slugify,
@@ -288,6 +289,45 @@ discourseModule("Unit | Utilities", function () {
       }
     });
   });
+
+  test("mergeSortedLists", function (assert) {
+    const comparator = (a, b) => b > a;
+    assert.deepEqual(
+      mergeSortedLists([], [1, 2, 3], comparator),
+      [1, 2, 3],
+      "it doesn't error when the first list is blank"
+    );
+    assert.deepEqual(
+      mergeSortedLists([3, 2, 1], [], comparator),
+      [3, 2, 1],
+      "it doesn't error when the second list is blank"
+    );
+    assert.deepEqual(
+      mergeSortedLists([], [], comparator),
+      [],
+      "it doesn't error when the both lists are blank"
+    );
+    assert.deepEqual(
+      mergeSortedLists([5, 4, 0, -1], [1], comparator),
+      [5, 4, 1, 0, -1],
+      "it correctly merges lists when one list has 1 item only"
+    );
+    assert.deepEqual(
+      mergeSortedLists([2], [1], comparator),
+      [2, 1],
+      "it correctly merges lists when both lists has 1 item each"
+    );
+    assert.deepEqual(
+      mergeSortedLists([1], [1], comparator),
+      [1, 1],
+      "it correctly merges lists when both lists has 1 item and their items are identical"
+    );
+    assert.deepEqual(
+      mergeSortedLists([5, 4, 3, 2, 1], [6, 2, 1], comparator),
+      [6, 5, 4, 3, 2, 2, 1, 1],
+      "it correctly merges lists that share common items"
+    );
+  });
 });
 
 discourseModule("Unit | Utilities | clipboard", function (hooks) {
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index a33964575d..5566dd488e 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -30,8 +30,11 @@ class NotificationsController < ApplicationController
       limit = (params[:limit] || 15).to_i
       limit = 50 if limit > 50
 
+      include_reviewables = false
       if SiteSetting.enable_experimental_sidebar_hamburger
         notifications = Notification.prioritized_list(current_user, count: limit, types: notification_types)
+        # notification_types is blank for the "all notifications" user menu tab
+        include_reviewables = notification_types.blank? && guardian.can_see_review_queue?
       else
         notifications = Notification.recent_report(current_user, limit, notification_types)
       end
@@ -43,26 +46,28 @@ class NotificationsController < ApplicationController
         end
       end
 
-      if !params.has_key?(:silent) && params[:bump_last_seen_reviewable] && !@readonly_mode
+      if !params.has_key?(:silent) && params[:bump_last_seen_reviewable] && !@readonly_mode && include_reviewables
         current_user_id = current_user.id
         Scheduler::Defer.later "bump last seen reviewable for user" do
           # we lookup current_user again in the background thread to avoid
-          # concurrency issues where the objects returned by the current_user
-          # and/or methods are changed by the time the deferred block is
-          # executed
-          user = User.find_by(id: current_user_id)
-          next if user.blank?
-          new_guardian = Guardian.new(user)
-          if new_guardian.can_see_review_queue?
-            user.bump_last_seen_reviewable!
-          end
+          # concurrency issues where the user object returned by the
+          # current_user controller method is changed by the time the deferred
+          # block is executed
+          User.find_by(id: current_user_id)&.bump_last_seen_reviewable!
         end
       end
 
-      render_json_dump(
+      json = {
         notifications: serialize_data(notifications, NotificationSerializer),
         seen_notification_id: current_user.seen_notification_id
-      )
+      }
+      if include_reviewables
+        json[:pending_reviewables] = Reviewable.basic_serializers_for_list(
+          Reviewable.user_menu_list_for(current_user),
+          current_user
+        ).as_json
+      end
+      render_json_dump(json)
     else
       offset = params[:offset].to_i
 
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 06d87927e4..c6f0a35fae 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -71,9 +71,11 @@ class ReviewablesController < ApplicationController
   end
 
   def user_menu_list
-    reviewables = Reviewable.list_for(current_user, limit: 30, status: :pending).to_a
     json = {
-      reviewables: reviewables.map! { |r| r.basic_serializer.new(r, scope: guardian, root: nil).as_json }
+      reviewables: Reviewable.basic_serializers_for_list(
+        Reviewable.user_menu_list_for(current_user),
+        current_user
+      ).as_json
     }
     render_json_dump(json, rest_serializer: true)
   end
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index b8f57b2b1f..b955e77af0 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -534,6 +534,14 @@ class Reviewable < ActiveRecord::Base
     results
   end
 
+  def self.user_menu_list_for(user, limit: 30)
+    list_for(user, limit: limit, status: :pending).to_a
+  end
+
+  def self.basic_serializers_for_list(reviewables, user)
+    reviewables.map { |r| r.basic_serializer.new(r, scope: user.guardian, root: nil) }
+  end
+
   def serializer
     self.class.serializer_for(self)
   end
diff --git a/app/serializers/basic_reviewable_serializer.rb b/app/serializers/basic_reviewable_serializer.rb
index 35d678fd43..a2411c799f 100644
--- a/app/serializers/basic_reviewable_serializer.rb
+++ b/app/serializers/basic_reviewable_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BasicReviewableSerializer < ApplicationSerializer
-  attributes :flagger_username, :id, :type, :pending
+  attributes :flagger_username, :id, :type, :pending, :created_at
 
   def flagger_username
     object.created_by&.username
diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
index 2bade5ac1e..f263fef37d 100644
--- a/spec/requests/notifications_controller_spec.rb
+++ b/spec/requests/notifications_controller_spec.rb
@@ -87,60 +87,6 @@ RSpec.describe NotificationsController do
           Discourse.clear_redis_readonly!
         end
 
-        it "should not bump last seen reviewable in readonly mode" do
-          user.update!(admin: true)
-          Fabricate(:reviewable)
-          Discourse.received_redis_readonly!
-          expect {
-            get "/notifications.json", params: { recent: true }
-            expect(response.status).to eq(200)
-          }.not_to change { user.reload.last_seen_reviewable_id }
-        ensure
-          Discourse.clear_redis_readonly!
-        end
-
-        it "should not bump last seen reviewable if the user can't seen reviewables" do
-          Fabricate(:reviewable)
-          expect {
-            get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
-            expect(response.status).to eq(200)
-          }.not_to change { user.reload.last_seen_reviewable_id }
-        end
-
-        it "should not bump last seen reviewable if the silent param is present" do
-          user.update!(admin: true)
-          Fabricate(:reviewable)
-          expect {
-            get "/notifications.json", params: {
-              recent: true,
-              silent: true,
-              bump_last_seen_reviewable: true
-            }
-            expect(response.status).to eq(200)
-          }.not_to change { user.reload.last_seen_reviewable_id }
-        end
-
-        it "should not bump last seen reviewable if the bump_last_seen_reviewable param is not present" do
-          user.update!(admin: true)
-          Fabricate(:reviewable)
-          expect {
-            get "/notifications.json", params: { recent: true, silent: true }
-            expect(response.status).to eq(200)
-          }.not_to change { user.reload.last_seen_reviewable_id }
-        end
-
-        it "bumps last_seen_reviewable_id" do
-          user.update!(admin: true)
-          expect(user.last_seen_reviewable_id).to eq(nil)
-          reviewable = Fabricate(:reviewable)
-          get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
-          expect(user.reload.last_seen_reviewable_id).to eq(reviewable.id)
-
-          reviewable2 = Fabricate(:reviewable)
-          get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
-          expect(user.reload.last_seen_reviewable_id).to eq(reviewable2.id)
-        end
-
         it "get notifications with all filters" do
           notification = Fabricate(:notification, user: user)
           notification2 = Fabricate(:notification, user: user)
@@ -202,6 +148,7 @@ RSpec.describe NotificationsController do
               created_at: 4.minutes.ago
             )
           end
+          fab!(:pending_reviewable) { Fabricate(:reviewable) }
 
           it "gets notifications list with unread ones at the top when the setting is enabled" do
             SiteSetting.enable_experimental_sidebar_hamburger = true
@@ -228,6 +175,93 @@ RSpec.describe NotificationsController do
               read_high_priority.id
             ])
           end
+
+          it "should not bump last seen reviewable in readonly mode" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: true)
+            Discourse.received_redis_readonly!
+            expect {
+              get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
+              expect(response.status).to eq(200)
+            }.not_to change { user.reload.last_seen_reviewable_id }
+          ensure
+            Discourse.clear_redis_readonly!
+          end
+
+          it "should not bump last seen reviewable if the user can't see reviewables" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            expect {
+              get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
+              expect(response.status).to eq(200)
+            }.not_to change { user.reload.last_seen_reviewable_id }
+          end
+
+          it "should not bump last seen reviewable if the silent param is present" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: true)
+            expect {
+              get "/notifications.json", params: {
+                recent: true,
+                silent: true,
+                bump_last_seen_reviewable: true
+              }
+              expect(response.status).to eq(200)
+            }.not_to change { user.reload.last_seen_reviewable_id }
+          end
+
+          it "should not bump last seen reviewable if the bump_last_seen_reviewable param is not present" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: true)
+            expect {
+              get "/notifications.json", params: { recent: true }
+              expect(response.status).to eq(200)
+            }.not_to change { user.reload.last_seen_reviewable_id }
+          end
+
+          it "bumps last_seen_reviewable_id" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: true)
+            expect(user.last_seen_reviewable_id).to eq(nil)
+            get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
+            expect(user.reload.last_seen_reviewable_id).to eq(pending_reviewable.id)
+
+            reviewable2 = Fabricate(:reviewable)
+            get "/notifications.json", params: { recent: true, bump_last_seen_reviewable: true }
+            expect(user.reload.last_seen_reviewable_id).to eq(reviewable2.id)
+          end
+
+          it "includes pending reviewables when the setting is enabled" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: true)
+            pending_reviewable2 = Fabricate(:reviewable, created_at: 4.minutes.ago)
+            Fabricate(:reviewable, status: Reviewable.statuses[:approved])
+            Fabricate(:reviewable, status: Reviewable.statuses[:rejected])
+
+            get "/notifications.json", params: { recent: true }
+            expect(response.status).to eq(200)
+            expect(response.parsed_body["pending_reviewables"].map { |r| r["id"] }).to eq([
+              pending_reviewable.id,
+              pending_reviewable2.id
+            ])
+          end
+
+          it "doesn't include reviewables when the setting is disabled" do
+            SiteSetting.enable_experimental_sidebar_hamburger = false
+            user.update!(admin: true)
+
+            get "/notifications.json", params: { recent: true }
+            expect(response.status).to eq(200)
+            expect(response.parsed_body.key?("pending_reviewables")).to eq(false)
+          end
+
+          it "doesn't include reviewables if the user can't see the review queue" do
+            SiteSetting.enable_experimental_sidebar_hamburger = true
+            user.update!(admin: false)
+
+            get "/notifications.json", params: { recent: true }
+            expect(response.status).to eq(200)
+            expect(response.parsed_body.key?("pending_reviewables")).to eq(false)
+          end
         end
 
         context "when filter_by_types param is present" do
diff --git a/spec/support/common_basic_reviewable_serializer.rb b/spec/support/common_basic_reviewable_serializer.rb
index c439ddb15b..76680076c4 100644
--- a/spec/support/common_basic_reviewable_serializer.rb
+++ b/spec/support/common_basic_reviewable_serializer.rb
@@ -38,4 +38,12 @@ shared_examples "basic reviewable attributes" do
       expect(subject[:flagger_username]).to eq("gg.osama")
     end
   end
+
+  describe "#created_at" do
+    it "serializes the reviewable's created_at field correctly" do
+      time = 10.minutes.ago
+      reviewable.update!(created_at: time)
+      expect(subject[:created_at]).to eq(time)
+    end
+  end
 end

From 2559c763ad3ccff417b2673d6bb4fe9432565bba Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 17:59:50 +0800
Subject: [PATCH 052/332] DEV: Fix message section link filters displaying
 icons (#18484)

Follow-up to c0037dc0f06f08bd050aedc8aad97d1f05b322ab
---
 .../sidebar/user/messages-section/message-section-link.js | 8 ++++++--
 .../acceptance/sidebar-user-messages-section-test.js      | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
index d1a10fefb0..a28cebdeb7 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js
@@ -73,10 +73,14 @@ export default class MessageSectionLink {
   }
 
   get prefixType() {
-    return "icon";
+    if (this._isInbox) {
+      return "icon";
+    }
   }
 
   get prefixValue() {
-    return "inbox";
+    if (this._isInbox) {
+      return "inbox";
+    }
   }
 }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
index c42ba0d83e..f3ac3f2f4b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
@@ -161,6 +161,13 @@ acceptance(
           ),
           `personal message ${type} link is marked as active`
         );
+
+        assert.notOk(
+          exists(
+            `.sidebar-section-messages .sidebar-section-link-personal-messages-${type} .sidebar-section-link-prefix`
+          ),
+          `prefix is not displayed for ${type} personal message section link`
+        );
       });
     });
 

From 03b7b7d1bc7c978c280e441a610a5ef5c049c60c Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Wed, 5 Oct 2022 08:08:54 -0400
Subject: [PATCH 053/332] DEV: Remove usage of {{action}} modifiers - Take 2
 (#18476)

This PR enables the [`no-action-modifiers`](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-action-modifiers.md) template lint rule and removes all usages of the `{{action}}` modifier in core.

In general, instances of `{{action "x"}}` have been replaced with `{{on "click" (action "x")}}`.

In many cases, such as for `a` elements, we also need to prevent default event handling to avoid unwanted side effects. While the `{{action}}` modifier internally calls `event.preventDefault()`, we need to handle these cases more explicitly. For this purpose, this PR also adds the [ember-event-helpers](https://github.com/buschtoens/ember-event-helpers) dependency so we can use the `prevent-default` handler. For instance:

```
<a href {{on "click" (prevent-default (action "x"))}}>Do X</a>
```

Note that `action` has not in general been refactored away as a helper yet. In general, all event handlers should be methods on the corresponding component and referenced directly (e.g. `{{on "click" this.doSomething}}`). However, the `action` helper is used extensively throughout the codebase and often references methods in the `actions` hash on controllers or routes. Thus this refactor will also be extensive and probably deserves a separate PR.

Note: This work was done to complement #17767 by minimizing the potential impact of the `action` modifier override, which uses private API and arguably should be replaced with an AST transform.

This is a followup to #18333, which had to be reverted because it did not account for the default treatment of modifier keys by the {{action}} modifier.

Commits:
* Enable `no-action-modifiers` template lint rule
* Replace {{action "x"}} with {{on "click" (action "x")}}
* Remove unnecessary action helper usage
* Remove ctl+click tests for user-menu
   These tests now break in Chrome when used with addEventListener. As per the comment, they can probably be safely removed.
* Prevent default event handlers to avoid unwanted side effects
   Uses `event.preventDefault()` in event handlers to prevent default event handling. This had been done automatically by the `action` modifier, but is not always desirable or necessary.
* Restore UserCardContents#showUser action to avoid regression
   By keeping the `showUser` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showUser` argument that's been passed.
* Revert EditCategoryTab#selectTab -> EditCategoryTab#select
   Avoid potential breaking change in themes / plugins
* Restore GroupCardContents#showGroup action to avoid regression
   By keeping the `showGroup` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showGroup` argument that's been passed.
* Restore SecondFactorAddTotp#showSecondFactorKey action to avoid regression
   By keeping the `showSecondFactorKey` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showSecondFactorKey` property that's maintained on the controller.
* Refactor away from `actions` hash in ChooseMessage component
* Modernize EmojiPicker#onCategorySelection usage
* Modernize SearchResultEntry#logClick usage
* Modernize Discovery::Categories#showInserted usage
* Modernize Preferences::Account#resendConfirmationEmail usage
* Modernize MultiSelect::SelectedCategory#onSelectedNameClick usage
* Favor fn over action in SelectedChoice component
* Modernize WizardStep event handlers
* Favor fn over action usage in buttons
* Restore Login#forgotPassword action to avoid possible regression
* Introduce modKeysPressed utility
   Returns an array of modifier keys that are pressed during a given `MouseEvent` or `KeyboardEvent`.
* Don't interfere with click events on links with `href` values when modifier keys are pressed
---
 .template-lintrc.js                           |   1 +
 .../addon/components/admin-editable-field.js  |  14 +-
 .../addon/components/admin-theme-editor.js    |  33 +++--
 .../admin/addon/components/ip-lookup.js       |  12 +-
 .../addon/components/themes-list-item.js      |   9 +-
 .../addon/controllers/admin-badges/show.js    |   6 +
 .../addon/controllers/admin-email-bounced.js  |   7 +
 .../controllers/admin-email-preview-digest.js |  12 +-
 .../addon/controllers/admin-email-rejected.js |   7 +
 .../admin-logs-screened-ip-addresses.js       |  17 ++-
 .../admin-logs-staff-action-logs.js           | 125 ++++++++++--------
 .../admin-web-hooks-show-events.js            |  33 ++---
 .../modals/admin-uploaded-image-list.js       |  11 +-
 .../addon/templates/admin-badges/show.hbs     |   4 +-
 .../components/admin-editable-field.hbs       |   4 +-
 .../components/admin-theme-editor.hbs         |   6 +-
 .../addon/templates/components/ip-lookup.hbs  |   2 +-
 .../templates/components/themes-list-item.hbs |   2 +-
 .../admin/addon/templates/email-bounced.hbs   |   4 +-
 .../addon/templates/email-preview-digest.hbs  |   4 +-
 .../admin/addon/templates/email-rejected.hbs  |   4 +-
 .../templates/logs/screened-ip-addresses.hbs  |   2 +-
 .../templates/logs/staff-action-logs.hbs      |  20 +--
 .../modal/admin-uploaded-image-list.hbs       |   2 +-
 .../addon/templates/web-hooks-show-events.hbs |   2 +-
 .../app/components/categories-only.js         |   3 +-
 .../app/components/category-permission-row.js |  11 +-
 .../app/components/choose-message.js          |  15 +--
 .../app/components/composer-messages.js       |  12 +-
 .../app/components/edit-category-tab.js       |  16 +--
 .../discourse/app/components/emoji-picker.js  |   3 +-
 .../app/components/group-card-contents.js     |  27 +++-
 .../components/group-imap-email-settings.js   |   3 +-
 .../discourse/app/components/group-member.js  |  10 +-
 .../components/group-smtp-email-settings.js   |   3 +-
 .../discourse/app/components/mobile-nav.js    |  41 +++---
 .../app/components/navigation-bar.js          |  43 +++---
 .../app/components/reviewable-item.js         |  47 ++++---
 .../app/components/reviewable-post-edits.js   |  25 ++--
 .../app/components/reviewable-queued-post.js  |   9 +-
 .../app/components/search-result-entry.js     |   7 +-
 .../app/components/second-factor-form.js      |  21 +--
 .../app/components/security-key-form.js       |  13 +-
 .../discourse/app/components/signup-cta.js    |  12 +-
 .../discourse/app/components/tag-info.js      |  71 +++++-----
 .../app/components/topic-list-item.js         |   2 +
 .../app/components/user-card-contents.js      |  21 ++-
 .../discourse/app/controllers/auth-token.js   |  11 +-
 .../app/controllers/avatar-selector.js        |  17 ++-
 .../discourse/app/controllers/composer.js     |  48 ++++---
 .../app/controllers/discovery/categories.js   |  19 +--
 .../app/controllers/discovery/topics.js       |  21 +--
 .../app/controllers/full-page-search.js       |  31 +++--
 .../discourse/app/controllers/history.js      |  29 ++--
 .../discourse/app/controllers/login.js        | 111 +++++++++-------
 .../app/controllers/password-reset.js         |  17 ++-
 .../app/controllers/preferences/account.js    |  28 ++--
 .../controllers/preferences/second-factor.js  |  40 +++---
 .../app/controllers/preferences/security.js   |  98 +++++++-------
 .../app/controllers/second-factor-add-totp.js |   9 +-
 .../app/controllers/second-factor-auth.js     |   3 +-
 .../discourse/app/controllers/tag-show.js     |   3 +-
 .../discourse/app/controllers/tags-index.js   |  37 +++---
 .../discourse/app/controllers/topic.js        |  92 +++++++------
 .../controllers/user-private-messages-tags.js |  34 ++---
 .../app/controllers/user-topics-list.js       |   4 +-
 .../discourse/app/controllers/user.js         |  16 ++-
 .../discourse/app/lib/utilities.js            |   6 +
 .../templates/components/categories-only.hbs  |   2 +-
 .../components/category-permission-row.hbs    |   2 +-
 .../templates/components/choose-message.hbs   |   2 +-
 .../components/edit-category-tab.hbs          |   2 +-
 .../components/emoji-group-buttons.hbs        |  18 +--
 .../app/templates/components/emoji-picker.hbs |   6 +-
 .../templates/components/flag-action-type.hbs |   4 +-
 .../components/group-card-contents.hbs        |   8 +-
 .../components/group-imap-email-settings.hbs  |   2 +-
 .../group-manage-email-settings.hbs           |   4 +-
 .../app/templates/components/group-member.hbs |   2 +-
 .../components/group-smtp-email-settings.hbs  |   2 +-
 .../templates/components/login-buttons.hbs    |   2 +-
 .../templates/components/reviewable-item.hbs  |   2 +-
 .../components/reviewable-post-edits.hbs      |   2 +-
 .../components/reviewable-queued-post.hbs     |   2 +-
 .../components/search-result-entry.hbs        |   2 +-
 .../components/second-factor-form.hbs         |   2 +-
 .../components/security-key-form.hbs          |   2 +-
 .../templates/components/selected-posts.hbs   |   6 +-
 .../app/templates/components/signup-cta.hbs   |   2 +-
 .../app/templates/components/tag-info.hbs     |   6 +-
 .../components/user-card-contents.hbs         |   6 +-
 .../discourse/app/templates/composer.hbs      |  10 +-
 .../templates/composer/dominating-topic.hbs   |   2 +-
 .../app/templates/composer/education.hbs      |   2 +-
 .../app/templates/composer/get-a-room.hbs     |   2 +-
 .../templates/composer/group-mentioned.hbs    |   2 +-
 .../app/templates/composer/similar-topics.hbs |   2 +-
 .../app/templates/discovery/categories.hbs    |   2 +-
 .../app/templates/discovery/topics.hbs        |   2 +-
 .../app/templates/full-page-search.hbs        |   2 +-
 .../mobile/components/categories-only.hbs     |   2 +-
 .../mobile/components/mobile-nav.hbs          |   2 +-
 .../mobile/components/navigation-bar.hbs      |   2 +-
 .../app/templates/mobile/discovery/topics.hbs |   2 +-
 .../app/templates/mobile/modal/login.hbs      |   4 +-
 .../app/templates/modal/auth-token.hbs        |   2 +-
 .../app/templates/modal/avatar-selector.hbs   |   2 +-
 .../discourse/app/templates/modal/history.hbs |   6 +-
 .../app/templates/modal/insert-hyperlink.hbs  |   2 +-
 .../discourse/app/templates/modal/login.hbs   |   4 +-
 .../modal/second-factor-add-totp.hbs          |   2 +-
 .../app/templates/password-reset.hbs          |   2 +-
 .../templates/preferences-second-factor.hbs   |   2 +-
 .../app/templates/preferences/account.hbs     |   2 +-
 .../app/templates/preferences/security.hbs    |   6 +-
 .../app/templates/second-factor-auth.hbs      |   2 +-
 .../discourse/app/templates/tag/show.hbs      |   2 +-
 .../discourse/app/templates/tags/index.hbs    |   4 +-
 .../discourse/app/templates/topic.hbs         |   6 +-
 .../templates/user-private-messages-tags.hbs  |   4 +-
 .../app/templates/user-topics-list.hbs        |   2 +-
 .../discourse/app/templates/user.hbs          |   2 +-
 .../plugin-outlet-connector-class-test.js     |   4 +-
 .../tests/acceptance/user-menu-test.js        |  19 ---
 .../fixtures/concerns/notification-types.js   |   1 +
 .../tests/unit/lib/utilities-test.js          |  52 ++++++++
 .../multi-select/selected-category.hbs        |   2 +-
 .../templates/components/selected-choice.hbs  |   2 +-
 .../addon/components/styling-preview.js       |   6 +-
 .../wizard/addon/components/wizard-step.js    |  14 +-
 .../templates/components/styling-preview.hbs  |   4 +-
 .../templates/components/wizard-step.hbs      |  10 +-
 lib/tasks/javascript.rake                     |   2 +-
 .../discourse-local-dates-create-form.js      |   8 +-
 .../discourse-local-dates-create-form.hbs     |   2 +-
 .../controllers/poll-ui-builder.js            |   6 +
 .../templates/modal/poll-ui-builder.hbs       |   6 +-
 137 files changed, 1013 insertions(+), 735 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index e3fc07b48d..b5095385b2 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,6 +3,7 @@ module.exports = {
   extends: "discourse:recommended",
 
   rules: {
+    "no-action-modifiers": true,
     "no-capital-arguments": false, // TODO: we extensively use `args` argument name
     "no-curly-component-invocation": {
       allow: [
diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
index 993a3ed675..892a3208e8 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
@@ -1,4 +1,6 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   tagName: "",
 
@@ -10,12 +12,14 @@ export default Component.extend({
     this.set("editing", false);
   },
 
-  actions: {
-    edit() {
-      this.set("buffer", this.value);
-      this.toggleProperty("editing");
-    },
+  @action
+  edit(event) {
+    event?.preventDefault();
+    this.set("buffer", this.value);
+    this.toggleProperty("editing");
+  },
 
+  actions: {
     save() {
       // Action has to toggle 'editing' property.
       this.action(this.buffer);
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index 014055c149..de8f063579 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -3,6 +3,7 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { isDocumentRTL } from "discourse/lib/text-direction";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 
 export default Component.extend({
@@ -91,15 +92,26 @@ export default Component.extend({
     return this.theme.getError(target, fieldName);
   },
 
+  @action
+  toggleShowAdvanced(event) {
+    event?.preventDefault();
+    this.toggleProperty("showAdvanced");
+  },
+
+  @action
+  toggleAddField(event) {
+    event?.preventDefault();
+    this.toggleProperty("addingField");
+  },
+
+  @action
+  toggleMaximize(event) {
+    event?.preventDefault();
+    this.toggleProperty("maximized");
+    next(() => this.appEvents.trigger("ace:resize"));
+  },
+
   actions: {
-    toggleShowAdvanced() {
-      this.toggleProperty("showAdvanced");
-    },
-
-    toggleAddField() {
-      this.toggleProperty("addingField");
-    },
-
     cancelAddField() {
       this.set("addingField", false);
     },
@@ -114,11 +126,6 @@ export default Component.extend({
       this.fieldAdded(this.currentTargetName, name);
     },
 
-    toggleMaximize() {
-      this.toggleProperty("maximized");
-      next(() => this.appEvents.trigger("ace:resize"));
-    },
-
     onlyOverriddenChanged(value) {
       this.onlyOverriddenChanged(value);
     },
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js
index 222e04b9ab..02a5240564 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js
@@ -1,6 +1,6 @@
 import AdminUser from "admin/models/admin-user";
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import copyText from "discourse/lib/copy-text";
@@ -21,6 +21,12 @@ export default Component.extend({
     return Math.max(visible, total);
   },
 
+  @action
+  hide(event) {
+    event?.preventDefault();
+    this.set("show", false);
+  },
+
   actions: {
     lookup() {
       this.set("show", true);
@@ -55,10 +61,6 @@ export default Component.extend({
       }
     },
 
-    hide() {
-      this.set("show", false);
-    },
-
     copy() {
       let text = `IP: ${this.ip}\n`;
       const location = this.location;
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js
index e2237e249b..29158c4496 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js
@@ -3,6 +3,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { escape } from "pretty-text/sanitizer";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { action } from "@ember/object";
 
 const MAX_COMPONENTS = 4;
 
@@ -59,9 +60,9 @@ export default Component.extend({
     return childrenCount - MAX_COMPONENTS;
   },
 
-  actions: {
-    toggleChildrenExpanded() {
-      this.toggleProperty("childrenExpanded");
-    },
+  @action
+  toggleChildrenExpanded(event) {
+    event?.preventDefault();
+    this.toggleProperty("childrenExpanded");
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
index 2b38081826..5b098387ef 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
@@ -133,6 +133,12 @@ export default class AdminBadgesShowController extends Controller.extend(
     this.buffered.set("image_url", null);
   }
 
+  @action
+  showPreview(badge, explain, event) {
+    event?.preventDefault();
+    this.send("preview", badge, explain);
+  }
+
   @action
   save() {
     if (!this.saving) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
index 1500549564..c7a8ec98a6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
@@ -2,8 +2,15 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
+  @action
+  handleShowIncomingEmail(id, event) {
+    event?.preventDefault();
+    this.send("showIncomingEmail", id);
+  },
+
   @observes("filter.{status,user,address,type}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
index 50d74d35d8..84f85eea6d 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
@@ -1,7 +1,7 @@
 import { empty, notEmpty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 
@@ -14,6 +14,12 @@ export default Controller.extend({
   showSendEmailForm: notEmpty("model.html_content"),
   htmlEmpty: empty("model.html_content"),
 
+  @action
+  toggleShowHtml(event) {
+    event?.preventDefault();
+    this.toggleProperty("showHtml");
+  },
+
   actions: {
     updateUsername(selected) {
       this.set("username", get(selected, "firstObject"));
@@ -39,10 +45,6 @@ export default Controller.extend({
       });
     },
 
-    toggleShowHtml() {
-      this.toggleProperty("showHtml");
-    },
-
     sendEmail() {
       this.set("sendingEmail", true);
       this.set("sentEmail", false);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
index 89c67f3cf9..6e4ce78656 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
@@ -3,6 +3,7 @@ import { INPUT_DELAY } from "discourse-common/config/environment";
 import IncomingEmail from "admin/models/incoming-email";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
@@ -10,6 +11,12 @@ export default AdminEmailLogsController.extend({
     discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
   },
 
+  @action
+  handleShowIncomingEmail(id, event) {
+    event?.preventDefault();
+    this.send("showIncomingEmail", id);
+  },
+
   actions: {
     loadMore() {
       this.loadLogs(IncomingEmail, true);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
index 0e8b43f9c1..bc11ec51f4 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
@@ -6,6 +6,7 @@ import discourseDebounce from "discourse-common/lib/debounce";
 import { exportEntity } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 import { outputExportResult } from "discourse/lib/export-result";
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
@@ -26,6 +27,15 @@ export default Controller.extend({
     discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
   },
 
+  @action
+  edit(record, event) {
+    event?.preventDefault();
+    if (!record.get("editing")) {
+      this.set("savedIpAddress", record.get("ip_address"));
+    }
+    record.set("editing", true);
+  },
+
   actions: {
     allow(record) {
       record.set("action_name", "do_nothing");
@@ -37,13 +47,6 @@ export default Controller.extend({
       record.save();
     },
 
-    edit(record) {
-      if (!record.get("editing")) {
-        this.set("savedIpAddress", record.get("ip_address"));
-      }
-      record.set("editing", true);
-    },
-
     cancel(record) {
       const savedIpAddress = this.savedIpAddress;
       if (savedIpAddress && record.get("editing")) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index 670d48c17b..a8a297d47c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -31,11 +31,13 @@ export default Controller.extend({
         this.set(
           "userHistoryActions",
           result.extras.user_history_actions
-            .map((action) => ({
-              id: action.id,
-              action_id: action.action_id,
-              name: I18n.t("admin.logs.staff_actions.actions." + action.id),
-              name_raw: action.id,
+            .map((historyAction) => ({
+              id: historyAction.id,
+              action_id: historyAction.action_id,
+              name: I18n.t(
+                "admin.logs.staff_actions.actions." + historyAction.id
+              ),
+              name_raw: historyAction.id,
             }))
             .sort((a, b) => a.name.localeCompare(b.name))
         );
@@ -75,61 +77,74 @@ export default Controller.extend({
     this.scheduleRefresh();
   },
 
-  actions: {
-    filterActionIdChanged(filterActionId) {
-      if (filterActionId) {
-        this.changeFilters({
-          action_name: filterActionId,
-          action_id: this.userHistoryActions.findBy("id", filterActionId)
-            .action_id,
-        });
-      }
-    },
-
-    clearFilter(key) {
-      if (key === "actionFilter") {
-        this.set("filterActionId", null);
-        this.changeFilters({
-          action_name: null,
-          action_id: null,
-          custom_type: null,
-        });
-      } else {
-        this.changeFilters({ [key]: null });
-      }
-    },
-
-    clearAllFilters() {
-      this.set("filterActionId", null);
-      this.resetFilters();
-    },
-
-    filterByAction(logItem) {
+  @action
+  filterActionIdChanged(filterActionId) {
+    if (filterActionId) {
       this.changeFilters({
-        action_name: logItem.get("action_name"),
-        action_id: logItem.get("action"),
-        custom_type: logItem.get("custom_type"),
+        action_name: filterActionId,
+        action_id: this.userHistoryActions.findBy("id", filterActionId)
+          .action_id,
       });
-    },
+    }
+  },
 
-    filterByStaffUser(acting_user) {
-      this.changeFilters({ acting_user: acting_user.username });
-    },
+  @action
+  clearFilter(key, event) {
+    event?.preventDefault();
+    if (key === "actionFilter") {
+      this.set("filterActionId", null);
+      this.changeFilters({
+        action_name: null,
+        action_id: null,
+        custom_type: null,
+      });
+    } else {
+      this.changeFilters({ [key]: null });
+    }
+  },
 
-    filterByTargetUser(target_user) {
-      this.changeFilters({ target_user: target_user.username });
-    },
+  @action
+  clearAllFilters(event) {
+    event?.preventDefault();
+    this.set("filterActionId", null);
+    this.resetFilters();
+  },
 
-    filterBySubject(subject) {
-      this.changeFilters({ subject });
-    },
+  @action
+  filterByAction(logItem, event) {
+    event?.preventDefault();
+    this.changeFilters({
+      action_name: logItem.get("action_name"),
+      action_id: logItem.get("action"),
+      custom_type: logItem.get("custom_type"),
+    });
+  },
 
-    exportStaffActionLogs() {
-      exportEntity("staff_action").then(outputExportResult);
-    },
+  @action
+  filterByStaffUser(acting_user, event) {
+    event?.preventDefault();
+    this.changeFilters({ acting_user: acting_user.username });
+  },
 
-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  filterByTargetUser(target_user, event) {
+    event?.preventDefault();
+    this.changeFilters({ target_user: target_user.username });
+  },
+
+  @action
+  filterBySubject(subject, event) {
+    event?.preventDefault();
+    this.changeFilters({ subject });
+  },
+
+  @action
+  exportStaffActionLogs() {
+    exportEntity("staff_action").then(outputExportResult);
+  },
+
+  @action
+  loadMore() {
+    this.model.loadMore();
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
index 71990f47a3..84b7650ff1 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
@@ -1,5 +1,6 @@
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -43,6 +44,23 @@ export default Controller.extend({
     }
   },
 
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const webHookId = this.get("model.extras.web_hook_id");
+
+    ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
+      type: "GET",
+      data: { ids: this.incomingEventIds },
+    }).then((data) => {
+      const objects = data.map((webHookEvent) =>
+        this.store.createRecord("web-hook-event", webHookEvent)
+      );
+      this.model.unshiftObjects(objects);
+      this.set("incomingEventIds", []);
+    });
+  },
+
   actions: {
     loadMore() {
       this.model.loadMore();
@@ -61,20 +79,5 @@ export default Controller.extend({
         popupAjaxError(error);
       });
     },
-
-    showInserted() {
-      const webHookId = this.get("model.extras.web_hook_id");
-
-      ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
-        type: "GET",
-        data: { ids: this.incomingEventIds },
-      }).then((data) => {
-        const objects = data.map((event) =>
-          this.store.createRecord("web-hook-event", event)
-        );
-        this.model.unshiftObjects(objects);
-        this.set("incomingEventIds", []);
-      });
-    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
index 7ab4cb6984..8a60037a5b 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
@@ -1,5 +1,6 @@
 import { observes, on } from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
@@ -10,15 +11,17 @@ export default Controller.extend(ModalFunctionality, {
     this.set("images", value && value.length ? value.split("|") : []);
   },
 
+  @action
+  remove(url, event) {
+    event?.preventDefault();
+    this.images.removeObject(url);
+  },
+
   actions: {
     uploadDone({ url }) {
       this.images.addObject(url);
     },
 
-    remove(url) {
-      this.images.removeObject(url);
-    },
-
     close() {
       this.save(this.images.join("|"));
       this.send("closeModal");
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index 31b16af4cc..82492beecb 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -88,9 +88,9 @@
       </div>
 
       {{#if this.hasQuery}}
-        <a href {{action "preview" this.buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
+        <a href {{on "click" (fn this.showPreview this.buffered "false")}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{action "preview" this.buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
+        <a href {{on "click" (fn this.showPreview this.buffered "true")}}>{{i18n "admin.badges.preview.plan_text"}}</a>
         {{#if this.preview_loading}}
           {{i18n "loading"}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
index d62cfdbd78..998174f20a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
@@ -3,7 +3,7 @@
   {{#if this.editing}}
     <TextField @value={{this.buffer}} @autofocus="autofocus" @autocomplete="off" />
   {{else}}
-    <a href {{action "edit"}} class="inline-editable-field">
+    <a href {{on "click" this.edit}} class="inline-editable-field">
       <span>{{this.value}}</span>
     </a>
   {{/if}}
@@ -11,7 +11,7 @@
 <div class="controls">
   {{#if this.editing}}
     <DButton @class="btn-default" @action={{action "save"}} @label="admin.user_fields.save" />
-    <a href {{action "edit"}}>{{i18n "cancel"}}</a>
+    <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
   {{else}}
     <DButton @class="btn-default" @action={{action "edit"}} @icon="pencil-alt" />
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
index ec8ed70f30..a8c33e1da2 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
@@ -13,7 +13,7 @@
 
       {{#if this.allowAdvanced}}
         <li>
-          <a {{action "toggleShowAdvanced"}}
+          <a {{on "click" this.toggleShowAdvanced}}
             href
             title={{i18n (concat "admin.customize.theme." (if this.showAdvanced "hide_advanced" "show_advanced"))}}
             class="no-text">
@@ -52,7 +52,7 @@
             <DButton @class="ok" @action={{action "addField" this.newFieldName}} @icon="check" />
             <DButton @class="cancel" @action={{action "cancelAddField"}} @icon="times" />
           {{else}}
-            <a href {{action "toggleAddField" this.currentTargetName}} class="no-text">
+            <a href {{on "click" this.toggleAddField}} class="no-text">
               {{d-icon "plus"}}
             </a>
           {{/if}}
@@ -61,7 +61,7 @@
 
       <li class="spacer"></li>
       <li>
-        <a href {{action "toggleMaximize"}} class="no-text">
+        <a href {{on "click" this.toggleMaximize}} class="no-text">
           {{d-icon this.maximizeIcon}}
         </a>
       </li>
diff --git a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
index f63ab16730..31ec7f35a7 100644
--- a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 {{#if this.show}}
   <div class="location-box">
-    <a href class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
+    <a href class="close pull-right" {{on "click" this.hide}}>{{d-icon "times"}}</a>
     {{#if this.copied}}
       <DButton @class="btn-hover pull-right" @icon="copy" @label="ip_lookup.copied" />
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
index 1710a14454..21678c1a43 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
@@ -31,7 +31,7 @@
       <span class="components">{{html-safe this.childrenString}}</span>
 
       {{#if this.displayHasMore}}
-        <a href {{action "toggleChildrenExpanded"}} class="others-count">
+        <a href {{on "click" this.toggleChildrenExpanded}} class="others-count">
           {{#if this.childrenExpanded}}
             {{i18n "admin.customize.theme.collapse"}}
           {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
index cf6ceb81bc..6a47751d00 100644
--- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
@@ -30,7 +30,7 @@
           <td class="email-address"><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           <td>
             {{#if l.has_bounce_key}}
-              <a href {{action "showIncomingEmail" l.id}}>
+              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}}>
                 {{l.email_type}}
               </a>
             {{else}}
@@ -39,7 +39,7 @@
           </td>
           <td class="email-details">
             {{#if l.has_bounce_key}}
-              <a href {{action "showIncomingEmail" l.id}} title={{i18n "admin.email.details_title"}}>
+              <a href {{on "click" (fn this.handleShowIncomingEmail l.id)}} title={{i18n "admin.email.details_title"}}>
                 {{d-icon "info-circle"}}
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index d2ee4cad4d..b00332840d 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -15,11 +15,11 @@
         {{#if this.showHtml}}
           <span>{{i18n "admin.email.html"}}</span>
           |
-          <a href {{action "toggleShowHtml"}}>
+          <a href {{on "click" this.toggleShowHtml}}>
             {{i18n "admin.email.text"}}
           </a>
         {{else}}
-          <a href {{action "toggleShowHtml"}}>{{i18n "admin.email.html"}}</a> |
+          <a href {{on "click" this.toggleShowHtml}}>{{i18n "admin.email.html"}}</a> |
           <span>{{i18n "admin.email.text"}}</span>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
index 21dcbba21d..19033f5f6f 100644
--- a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
@@ -48,10 +48,10 @@
           </td>
           <td>{{email.subject}}</td>
           <td class="error">
-            <a href {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
+            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}}>{{email.error}}</a>
           </td>
           <td class="email-details">
-            <a href {{action "showIncomingEmail" email.id}} title={{i18n "admin.email.details_title"}}>
+            <a href {{on "click" (fn this.handleShowIncomingEmail email.id)}} title={{i18n "admin.email.details_title"}}>
               {{d-icon "info-circle"}}
             </a>
           </td>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index 63489dcdee..ab20b2316b 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -27,7 +27,7 @@
               {{#if item.editing}}
                 <TextField @value={{item.ip_address}} @autofocus="autofocus" />
               {{else}}
-                <a href {{action "edit" item}} class="inline-editable-field">
+                <a href {{on "click" (fn this.edit item)}} class="inline-editable-field">
                   {{#if item.isRange}}
                     <strong>{{item.ip_address}}</strong>
                   {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index bcee25b439..d2e46867c9 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -1,29 +1,29 @@
 <div class="staff-action-logs-controls">
   {{#if this.filtersExists}}
     <div class="staff-action-logs-filters">
-      <a href {{action "clearAllFilters"}} class="clear-filters filter btn">
+      <a href {{on "click" this.clearAllFilters}} class="clear-filters filter btn">
         <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
       {{#if this.actionFilter}}
-        <a href {{action "clearFilter" "actionFilter"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "actionFilter")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.action"}}</span>: {{this.actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.acting_user}}
-        <a href {{action "clearFilter" "acting_user"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "acting_user")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{this.filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.target_user}}
-        <a href {{action "clearFilter" "target_user"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "target_user")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{this.filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if this.filters.subject}}
-        <a href {{action "clearFilter" "subject"}} class="filter btn">
+        <a href {{on "click" (fn this.clearFilter "subject")}} class="filter btn">
           <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{this.filters.subject}}
           {{d-icon "times-circle"}}
         </a>
@@ -71,16 +71,16 @@
                 </div>
               </td>
               <td class="col value action">
-                <a href {{action "filterByAction" item}}>{{item.actionName}}</a>
+                <a href {{on "click" (fn this.filterByAction item)}}>{{item.actionName}}</a>
               </td>
               <td class="col value subject">
                 <div class="subject">
                   {{#if item.target_user}}
                     <LinkTo @route="adminUser" @model={{item.target_user}}>{{avatar item.target_user imageSize="tiny"}}</LinkTo>
-                    <a href {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
+                    <a href {{on "click" (fn this.filterByTargetUser item.target_user)}}>{{item.target_user.username}}</a>
                   {{/if}}
                   {{#if item.subject}}
-                    <a href {{action "filterBySubject" item.subject}} title={{item.subject}}>{{item.subject}}</a>
+                    <a href {{on "click" (fn this.filterBySubject item.subject)}} title={{item.subject}}>{{item.subject}}</a>
                   {{/if}}
                 </div>
               </td>
@@ -89,10 +89,10 @@
                 <div>
                   {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
-                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{on "click" (fn this.showCustomDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
-                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
+                    <a href {{on "click" (fn this.showDetailsModal item)}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
               </td>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
index a7aefa7371..aca6fef6f4 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
@@ -1,7 +1,7 @@
 <DModalBody @class="uploaded-image-list">
   <div class="selectable-avatars">
     {{#each this.images as |image|}}
-      <a href class="selectable-avatar" {{action "remove" image}}>
+      <a href class="selectable-avatar" {{on "click" (fn this.remove image)}}>
         {{bound-avatar-template image "huge"}}
       </a>
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
index 2b5c768def..c9791f0fc4 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
@@ -21,7 +21,7 @@
           <div class="clearfix"></div>
         </div>
         {{#if this.hasIncoming}}
-          <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
+          <a href tabindex="0" {{on "click" this.showInserted}} class="alert alert-info clickable">
             <CountI18n @key="admin.web_hooks.events.incoming" @count={{this.incomingCount}} />
           </a>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js
index 002ddf82e3..d480f46455 100644
--- a/app/assets/javascripts/discourse/app/components/categories-only.js
+++ b/app/assets/javascripts/discourse/app/components/categories-only.js
@@ -50,7 +50,8 @@ export default Component.extend({
   },
 
   @action
-  toggleShowMuted() {
+  toggleShowMuted(event) {
+    event?.preventDefault();
     this.toggleProperty("showMuted");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.js b/app/assets/javascripts/discourse/app/components/category-permission-row.js
index 2e41aa6e63..46eb3690f9 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.js
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, equal } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
@@ -92,11 +93,13 @@ export default Component.extend({
     this.category.updatePermission(this.group_name, type);
   },
 
-  actions: {
-    removeRow() {
-      this.category.removePermission(this.group_name);
-    },
+  @action
+  removeRow(event) {
+    event?.preventDefault();
+    this.category.removePermission(this.group_name);
+  },
 
+  actions: {
     setPermissionReply() {
       if (this.type <= PermissionType.CREATE_POST) {
         this.updatePermission(PermissionType.READONLY);
diff --git a/app/assets/javascripts/discourse/app/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
index 09d9a9123c..15f0424f60 100644
--- a/app/assets/javascripts/discourse/app/components/choose-message.js
+++ b/app/assets/javascripts/discourse/app/components/choose-message.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
@@ -63,12 +63,11 @@ export default Component.extend({
     );
   },
 
-  actions: {
-    chooseMessage(message) {
-      const messageId = get(message, "id");
-      this.set("selectedTopicId", messageId);
-      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
-      return false;
-    },
+  @action
+  chooseMessage(message, event) {
+    event?.preventDefault();
+    const messageId = get(message, "id");
+    this.set("selectedTopicId", messageId);
+    next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index 40832b5df1..275d1c534c 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,5 +1,5 @@
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import LinkLookup from "discourse/lib/link-lookup";
 import { not } from "@ember/object/computed";
@@ -54,11 +54,13 @@ export default Component.extend({
     this.set("messageCount", messages.get("length"));
   },
 
-  actions: {
-    closeMessage(message) {
-      this._removeMessage(message);
-    },
+  @action
+  closeMessage(message, event) {
+    event?.preventDefault();
+    this._removeMessage(message);
+  },
 
+  actions: {
     hideMessage(message) {
       this._removeMessage(message);
       // kind of hacky but the visibility depends on this
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
index e96720db36..5619e8c753 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -2,6 +2,7 @@ import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 import { empty } from "@ember/object/computed";
 import getURL from "discourse-common/lib/get-url";
 import { propertyEqual } from "discourse/lib/computed";
@@ -49,13 +50,12 @@ export default Component.extend({
     return getURL(`/c/${slugPart}/edit/${this.tab}`);
   },
 
-  actions: {
-    select() {
-      this.set("selectedTab", this.tab);
-
-      if (!this.newCategory) {
-        DiscourseURL.routeTo(this.fullSlug);
-      }
-    },
+  @action
+  select(event) {
+    event?.preventDefault();
+    this.set("selectedTab", this.tab);
+    if (!this.newCategory) {
+      DiscourseURL.routeTo(this.fullSlug);
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index 3e0646f893..8a5dec83a6 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -240,7 +240,8 @@ export default Component.extend({
   },
 
   @action
-  onCategorySelection(sectionName) {
+  onCategorySelection(sectionName, event) {
+    event?.preventDefault();
     const section = document.querySelector(
       `.emoji-picker-emoji-area .section[data-section="${sectionName}"]`
     );
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index cb073a6733..547840d197 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, gt } from "@ember/object/computed";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -6,6 +7,7 @@ import { Promise } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
 import { groupPath } from "discourse/lib/url";
 import { setting } from "discourse/lib/computed";
+import { modKeysPressed } from "discourse/lib/utilities";
 
 const maxMembersToDisplay = 10;
 
@@ -70,11 +72,25 @@ export default Component.extend(CardContentsBase, CleansUp, {
     this._close();
   },
 
-  actions: {
-    close() {
-      this._close();
-    },
+  @action
+  close(event) {
+    event?.preventDefault();
+    this._close();
+  },
 
+  @action
+  handleShowGroup(group, event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    // Invokes `showGroup` argument. Convert to `this.args.showGroup` when
+    // refactoring this to a glimmer component.
+    this.showGroup(group);
+    this._close();
+  },
+
+  actions: {
     cancelFilter() {
       const postStream = this.postStream;
       postStream.cancelFilter();
@@ -90,8 +106,7 @@ export default Component.extend(CardContentsBase, CleansUp, {
     },
 
     showGroup(group) {
-      this.showGroup(group);
-      this._close();
+      this.handleShowGroup(group);
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
index 190a9fb2f9..a437f42d44 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js
@@ -53,7 +53,8 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider) {
+  prefillSettings(provider, event) {
+    event?.preventDefault();
     this.form.setProperties(emailProviderDefaultSettings(provider, "imap"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/group-member.js b/app/assets/javascripts/discourse/app/components/group-member.js
index 64b2570dee..08d1097b42 100644
--- a/app/assets/javascripts/discourse/app/components/group-member.js
+++ b/app/assets/javascripts/discourse/app/components/group-member.js
@@ -1,10 +1,12 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   classNames: ["item"],
 
-  actions: {
-    remove() {
-      this.removeAction(this.member);
-    },
+  @action
+  remove(event) {
+    event?.preventDefault();
+    this.removeAction(this.member);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
index 5456c75a79..d4b4bcb9de 100644
--- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
+++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.js
@@ -43,7 +43,8 @@ export default Component.extend({
   },
 
   @action
-  prefillSettings(provider) {
+  prefillSettings(provider, event) {
+    event?.preventDefault();
     this.form.setProperties(emailProviderDefaultSettings(provider, "smtp"));
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js
index bdbb2cc85a..f0ea3e6138 100644
--- a/app/assets/javascripts/discourse/app/components/mobile-nav.js
+++ b/app/assets/javascripts/discourse/app/components/mobile-nav.js
@@ -1,5 +1,6 @@
 import { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import deprecated from "discourse-common/lib/deprecated";
@@ -56,27 +57,27 @@ export default Component.extend({
     this.router.off("routeDidChange", this, this.currentRouteChanged);
   },
 
-  actions: {
-    toggleExpanded() {
-      this.toggleProperty("expanded");
+  @action
+  toggleExpanded(event) {
+    event?.preventDefault();
+    this.toggleProperty("expanded");
 
-      next(() => {
-        if (this.expanded) {
-          $(window)
-            .off("click.mobile-nav")
-            .on("click.mobile-nav", (e) => {
-              if (!this.element || this.isDestroying || this.isDestroyed) {
-                return;
-              }
+    next(() => {
+      if (this.expanded) {
+        $(window)
+          .off("click.mobile-nav")
+          .on("click.mobile-nav", (e) => {
+            if (!this.element || this.isDestroying || this.isDestroyed) {
+              return;
+            }
 
-              const expander = this.element.querySelector(".expander");
-              if (expander && e.target !== expander) {
-                this.set("expanded", false);
-                $(window).off("click.mobile-nav");
-              }
-            });
-        }
-      });
-    },
+            const expander = this.element.querySelector(".expander");
+            if (expander && e.target !== expander) {
+              this.set("expanded", false);
+              $(window).off("click.mobile-nav");
+            }
+          });
+      }
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index ab9a5b9c71..5ede7b2bf4 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -1,5 +1,6 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import DiscourseURL from "discourse/lib/url";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import { next } from "@ember/runloop";
@@ -61,33 +62,33 @@ export default Component.extend(FilterModeMixin, {
     DiscourseURL.appEvents.off("dom:clean", this, this.ensureDropClosed);
   },
 
-  actions: {
-    toggleDrop() {
-      this.set("expanded", !this.expanded);
+  @action
+  toggleDrop(event) {
+    event?.preventDefault();
+    this.set("expanded", !this.expanded);
 
-      if (this.expanded) {
-        DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
+    if (this.expanded) {
+      DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        next(() => {
-          if (!this.expanded) {
-            return;
-          }
+      next(() => {
+        if (!this.expanded) {
+          return;
+        }
 
-          $(this.element.querySelector(".drop a")).on("click", () => {
-            this.element.querySelector(".drop").style.display = "none";
+        $(this.element.querySelector(".drop a")).on("click", () => {
+          this.element.querySelector(".drop").style.display = "none";
 
-            next(() => {
-              this.ensureDropClosed();
-            });
-            return true;
-          });
-
-          $(window).on("click.navigation-bar", () => {
+          next(() => {
             this.ensureDropClosed();
-            return true;
           });
+          return true;
         });
-      }
-    },
+
+        $(window).on("click.navigation-bar", () => {
+          this.ensureDropClosed();
+          return true;
+        });
+      });
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index ff67e672a8..73c90d665a 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -7,7 +7,7 @@ import { classify, dasherize } from "@ember/string";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { set } from "@ember/object";
+import { action, set } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 let _components = {};
@@ -121,7 +121,7 @@ export default Component.extend({
   },
 
   @bind
-  _performConfirmed(action) {
+  _performConfirmed(performableAction) {
     let reviewable = this.reviewable;
 
     let performAction = () => {
@@ -140,7 +140,7 @@ export default Component.extend({
       });
 
       return ajax(
-        `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
+        `/review/${reviewable.id}/perform/${performableAction.id}?version=${version}`,
         {
           type: "PUT",
           data,
@@ -173,13 +173,16 @@ export default Component.extend({
         .finally(() => this.set("updating", false));
     };
 
-    if (action.client_action) {
-      let actionMethod = this[`client${classify(action.client_action)}`];
+    if (performableAction.client_action) {
+      let actionMethod =
+        this[`client${classify(performableAction.client_action)}`];
       if (actionMethod) {
         return actionMethod.call(this, reviewable, performAction);
       } else {
         // eslint-disable-next-line no-console
-        console.error(`No handler for ${action.client_action} found`);
+        console.error(
+          `No handler for ${performableAction.client_action} found`
+        );
         return;
       }
     } else {
@@ -209,14 +212,16 @@ export default Component.extend({
     }
   },
 
-  actions: {
-    explainReviewable(reviewable) {
-      showModal("explain-reviewable", {
-        title: "review.explain.title",
-        model: reviewable,
-      });
-    },
+  @action
+  explainReviewable(reviewable, event) {
+    event?.preventDefault();
+    showModal("explain-reviewable", {
+      title: "review.explain.title",
+      model: reviewable,
+    });
+  },
 
+  actions: {
     edit() {
       this.set("editing", true);
       this.set("_updates", { payload: {} });
@@ -259,18 +264,18 @@ export default Component.extend({
       set(this._updates, fieldId, event.target.value);
     },
 
-    perform(action) {
+    perform(performableAction) {
       if (this.updating) {
         return;
       }
 
-      let msg = action.get("confirm_message");
-      let requireRejectReason = action.get("require_reject_reason");
-      let customModal = action.get("custom_modal");
+      let msg = performableAction.get("confirm_message");
+      let requireRejectReason = performableAction.get("require_reject_reason");
+      let customModal = performableAction.get("custom_modal");
       if (msg) {
         bootbox.confirm(msg, (answer) => {
           if (answer) {
-            return this._performConfirmed(action);
+            return this._performConfirmed(performableAction);
           }
         });
       } else if (requireRejectReason) {
@@ -279,7 +284,7 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action,
+          action: performableAction,
         });
       } else if (customModal) {
         showModal(customModal, {
@@ -287,10 +292,10 @@ export default Component.extend({
           model: this.reviewable,
         }).setProperties({
           performConfirmed: this._performConfirmed,
-          action,
+          action: performableAction,
         });
       } else {
-        return this._performConfirmed(action);
+        return this._performConfirmed(performableAction);
       }
     },
   },
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
index 84c27f152f..75b8692a49 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import { longDate } from "discourse/lib/formatter";
@@ -18,18 +19,18 @@ export default Component.extend({
     return longDate(updatedAt);
   },
 
-  actions: {
-    showEditHistory() {
-      let postId = this.get("reviewable.post_id");
-      this.store.find("post", postId).then((post) => {
-        let historyController = showModal("history", {
-          model: post,
-          modalClass: "history-modal",
-        });
-        historyController.refresh(postId, "latest");
-        historyController.set("post", post);
-        historyController.set("topicController", null);
+  @action
+  showEditHistory(event) {
+    event?.preventDefault();
+    let postId = this.get("reviewable.post_id");
+    this.store.find("post", postId).then((post) => {
+      let historyController = showModal("history", {
+        model: post,
+        modalClass: "history-modal",
       });
-    },
+      historyController.refresh(postId, "latest");
+      historyController.set("post", post);
+      historyController.set("topicController", null);
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
index e40ab39ef7..d06ddf3c1c 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
@@ -1,10 +1,11 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
-  actions: {
-    showRawEmail() {
-      showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
-    },
+  @action
+  showRawEmail(event) {
+    event?.preventDefault();
+    showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.js b/app/assets/javascripts/discourse/app/components/search-result-entry.js
index 9312174ed1..cf13405a65 100644
--- a/app/assets/javascripts/discourse/app/components/search-result-entry.js
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.js
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import { logSearchLinkClick } from "discourse/lib/search";
+import { modKeysPressed } from "discourse/lib/utilities";
 
 export default Component.extend({
   tagName: "div",
@@ -10,7 +11,11 @@ export default Component.extend({
   role: "listitem",
 
   @action
-  logClick(topicId) {
+  logClick(topicId, event) {
+    // Avoid click logging when any modifier keys are pressed.
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
     if (this.searchLogId && topicId) {
       logSearchLinkClick({
         searchLogId: this.searchLogId,
diff --git a/app/assets/javascripts/discourse/app/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js
index 3f0c40b381..e208a5f314 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-form.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-form.js
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -48,15 +49,15 @@ export default Component.extend({
     );
   },
 
-  actions: {
-    toggleSecondFactorMethod() {
-      const secondFactorMethod = this.secondFactorMethod;
-      this.set("secondFactorToken", "");
-      if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
-        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
-      } else {
-        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
-      }
-    },
+  @action
+  toggleSecondFactorMethod(event) {
+    event?.preventDefault();
+    const secondFactorMethod = this.secondFactorMethod;
+    this.set("secondFactorToken", "");
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
+      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
+    } else {
+      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/security-key-form.js b/app/assets/javascripts/discourse/app/components/security-key-form.js
index bd6d03f9f4..dcc0725113 100644
--- a/app/assets/javascripts/discourse/app/components/security-key-form.js
+++ b/app/assets/javascripts/discourse/app/components/security-key-form.js
@@ -1,12 +1,13 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
 export default Component.extend({
-  actions: {
-    useAnotherMethod() {
-      this.set("showSecurityKey", false);
-      this.set("showSecondFactor", true);
-      this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
-    },
+  @action
+  useAnotherMethod(event) {
+    event?.preventDefault();
+    this.set("showSecurityKey", false);
+    this.set("showSecondFactor", true);
+    this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js
index 5ea99dffe9..a4d80fd611 100644
--- a/app/assets/javascripts/discourse/app/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/app/components/signup-cta.js
@@ -1,15 +1,19 @@
 import Component from "@ember/component";
 import discourseLater from "discourse-common/lib/later";
+import { action } from "@ember/object";
 import { on } from "@ember/object/evented";
 
 export default Component.extend({
   action: "showCreateAccount",
 
+  @action
+  neverShow(event) {
+    event?.preventDefault();
+    this.keyValueStore.setItem("anon-cta-never", "t");
+    this.session.set("showSignupCta", false);
+  },
+
   actions: {
-    neverShow() {
-      this.keyValueStore.setItem("anon-cta-never", "t");
-      this.session.set("showSignupCta", false);
-    },
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", Date.now());
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 6cb2a35dba..21da9a92f1 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -7,6 +7,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
 
 export default Component.extend({
   dialog: service(),
@@ -76,19 +77,49 @@ export default Component.extend({
       .catch(popupAjaxError);
   },
 
+  @action
+  edit(event) {
+    event?.preventDefault();
+    this.setProperties({
+      editing: true,
+      newTagName: this.tag.id,
+      newTagDescription: this.tagInfo.description,
+    });
+  },
+
+  @action
+  unlinkSynonym(tag, event) {
+    event?.preventDefault();
+    ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
+      type: "DELETE",
+    })
+      .then(() => this.tagInfo.synonyms.removeObject(tag))
+      .catch(popupAjaxError);
+  },
+
+  @action
+  deleteSynonym(tag, event) {
+    event?.preventDefault();
+    bootbox.confirm(
+      I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
+      (result) => {
+        if (!result) {
+          return;
+        }
+
+        tag
+          .destroyRecord()
+          .then(() => this.tagInfo.synonyms.removeObject(tag))
+          .catch(popupAjaxError);
+      }
+    );
+  },
+
   actions: {
     toggleEditControls() {
       this.toggleProperty("showEditControls");
     },
 
-    edit() {
-      this.setProperties({
-        editing: true,
-        newTagName: this.tag.id,
-        newTagDescription: this.tagInfo.description,
-      });
-    },
-
     cancelEditing() {
       this.set("editing", false);
     },
@@ -114,30 +145,6 @@ export default Component.extend({
       this.deleteAction(this.tagInfo);
     },
 
-    unlinkSynonym(tag) {
-      ajax(`/tag/${this.tagInfo.name}/synonyms/${tag.id}`, {
-        type: "DELETE",
-      })
-        .then(() => this.tagInfo.synonyms.removeObject(tag))
-        .catch(popupAjaxError);
-    },
-
-    deleteSynonym(tag) {
-      bootbox.confirm(
-        I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
-        (result) => {
-          if (!result) {
-            return;
-          }
-
-          tag
-            .destroyRecord()
-            .then(() => this.tagInfo.synonyms.removeObject(tag))
-            .catch(popupAjaxError);
-        }
-      );
-    },
-
     addSynonyms() {
       bootbox.confirm(
         I18n.t("tagging.add_synonyms_explanation", {
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 972e824173..2d6ce3e18f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -251,6 +251,7 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
+      e.preventDefault();
       return this.navigateToTopic(topic, e.target.getAttribute("href"));
     }
 
@@ -264,6 +265,7 @@ export default Component.extend({
       if (wantsNewWindow(e)) {
         return true;
       }
+      e.preventDefault();
       return this.navigateToTopic(topic, topic.lastUnreadUrl);
     }
 
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 930f77a8c1..34e3147745 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,4 +1,4 @@
-import EmberObject, { set } from "@ember/object";
+import EmberObject, { action, set } from "@ember/object";
 import { alias, and, gt, gte, not, or } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -14,7 +14,7 @@ import { isEmpty } from "@ember/utils";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 import { dasherize } from "@ember/string";
 import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
+import { escapeExpression, modKeysPressed } from "discourse/lib/utilities";
 
 export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   elementId: "user-card",
@@ -220,6 +220,18 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     this._close();
   },
 
+  @action
+  handleShowUser(user, event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    // Invokes `showUser` argument. Convert to `this.args.showUser` when
+    // refactoring this to a glimmer component.
+    this.showUser(user);
+    this._close();
+  },
+
   actions: {
     close() {
       this._close();
@@ -247,9 +259,8 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
       this._close();
     },
 
-    showUser(username) {
-      this.showUser(username);
-      this._close();
+    showUser(user) {
+      this.handleShowUser(user);
     },
 
     checkEmail(user) {
diff --git a/app/assets/javascripts/discourse/app/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
index 2d8c91157a..52ddce5f4d 100644
--- a/app/assets/javascripts/discourse/app/controllers/auth-token.js
+++ b/app/assets/javascripts/discourse/app/controllers/auth-token.js
@@ -1,6 +1,7 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
+import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { userPath } from "discourse/lib/url";
 
@@ -17,11 +18,13 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
-  actions: {
-    toggleExpanded() {
-      this.set("expanded", !this.expanded);
-    },
+  @action
+  toggleExpanded(event) {
+    event?.preventDefault();
+    this.set("expanded", !this.expanded);
+  },
 
+  actions: {
     highlightSecure() {
       this.send("closeModal");
 
diff --git a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
index 8373b7a106..d63f464c2a 100644
--- a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
@@ -132,6 +133,15 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @action
+  selectAvatar(url, event) {
+    event?.preventDefault();
+    this.user
+      .selectAvatar(url)
+      .then(() => window.location.reload())
+      .catch(popupAjaxError);
+  },
+
   actions: {
     uploadComplete() {
       this.set("selected", "custom");
@@ -159,13 +169,6 @@ export default Controller.extend(ModalFunctionality, {
         .finally(() => this.set("gravatarRefreshDisabled", false));
     },
 
-    selectAvatar(url) {
-      this.user
-        .selectAvatar(url)
-        .then(() => window.location.reload())
-        .catch(popupAjaxError);
-    },
-
     saveAvatarSelection() {
       const selectedUploadId = this.selectedUploadId;
       const type = this.selected;
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 3463f6f1d7..a25874f18d 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -23,7 +23,7 @@ import { buildQuote } from "discourse/lib/quote";
 import deprecated from "discourse-common/lib/deprecated";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
+import { escapeExpression, modKeysPressed } from "discourse/lib/utilities";
 import { getOwner } from "discourse-common/lib/get-owner";
 import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
@@ -508,11 +508,35 @@ export default Controller.extend({
     this.set("model.showFullScreenExitPrompt", false);
   },
 
-  actions: {
-    togglePreview() {
-      this.toggleProperty("showPreview");
-    },
+  @action
+  async cancel(event) {
+    event?.preventDefault();
+    await this.cancelComposer();
+  },
 
+  @action
+  cancelUpload(event) {
+    event?.preventDefault();
+    this.set("model.uploadCancelled", true);
+  },
+
+  @action
+  togglePreview(event) {
+    event?.preventDefault();
+    this.toggleProperty("showPreview");
+  },
+
+  @action
+  viewNewReply(event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    DiscourseURL.routeTo(this.get("model.createdPost.url"));
+    this.close();
+  },
+
+  actions: {
     closeComposer() {
       this.close();
     },
@@ -543,10 +567,6 @@ export default Controller.extend({
       });
     },
 
-    cancelUpload() {
-      this.set("model.uploadCancelled", true);
-    },
-
     onPopupMenuAction(menuAction) {
       this.send(menuAction);
     },
@@ -707,10 +727,6 @@ export default Controller.extend({
       this.set("model.loading", false);
     },
 
-    async cancel() {
-      await this.cancelComposer();
-    },
-
     save(ignore, event) {
       this.save(false, {
         jump:
@@ -1275,12 +1291,6 @@ export default Controller.extend({
     }
   },
 
-  viewNewReply() {
-    DiscourseURL.routeTo(this.get("model.createdPost.url"));
-    this.close();
-    return false;
-  },
-
   async destroyDraft(draftSequence = null) {
     const key = this.get("model.draftKey");
     if (!key) {
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
index c46f41c1c8..1e07f67cb9 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
@@ -1,5 +1,6 @@
 import DiscoveryController from "discourse/controllers/discovery";
 import { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
 import { dasherize } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
@@ -50,17 +51,19 @@ export default DiscoveryController.extend({
         : style;
     return dasherize(componentName);
   },
+
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const tracker = this.topicTrackingState;
+    // Move inserted into topics
+    this.model.loadBefore(tracker.get("newIncoming"), true);
+    tracker.resetTracking();
+  },
+
   actions: {
     refresh() {
       this.send("triggerRefresh");
     },
-    showInserted() {
-      const tracker = this.topicTrackingState;
-
-      // Move inserted into topics
-      this.model.loadBefore(tracker.get("newIncoming"), true);
-      tracker.resetTracking();
-      return false;
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index a0037f4da5..3e90fd42a8 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -63,6 +63,17 @@ const controllerOpts = {
     return this._isFilterPage(filter, "new") && topicsLength > 0;
   },
 
+  // Show newly inserted topics
+  @action
+  showInserted(event) {
+    event?.preventDefault();
+    const tracker = this.topicTrackingState;
+
+    // Move inserted into topics
+    this.model.loadBefore(tracker.get("newIncoming"), true);
+    tracker.resetTracking();
+  },
+
   actions: {
     changeSort() {
       deprecated(
@@ -72,16 +83,6 @@ const controllerOpts = {
       return routeAction("changeSort", this.router._router, ...arguments)();
     },
 
-    // Show newly inserted topics
-    showInserted() {
-      const tracker = this.topicTrackingState;
-
-      // Move inserted into topics
-      this.model.loadBefore(tracker.get("newIncoming"), true);
-      tracker.resetTracking();
-      return false;
-    },
-
     refresh(options = { skipResettingParams: [] }) {
       const filter = this.get("model.filter");
       this.send("resetParams", options.skipResettingParams);
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index e082ca9d29..a7cf017c6a 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -14,6 +14,7 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { escapeExpression } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
+import { action } from "@ember/object";
 import { gt, or } from "@ember/object/computed";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTransient } from "discourse/lib/page-tracker";
@@ -391,22 +392,24 @@ export default Controller.extend({
     }
   },
 
-  actions: {
-    createTopic(searchTerm) {
-      let topicCategory;
-      if (searchTerm.includes("category:")) {
-        const match = searchTerm.match(/category:(\S*)/);
-        if (match && match[1]) {
-          topicCategory = match[1];
-        }
+  @action
+  createTopic(searchTerm, event) {
+    event?.preventDefault();
+    let topicCategory;
+    if (searchTerm.includes("category:")) {
+      const match = searchTerm.match(/category:(\S*)/);
+      if (match && match[1]) {
+        topicCategory = match[1];
       }
-      this.composer.open({
-        action: Composer.CREATE_TOPIC,
-        draftKey: Composer.NEW_TOPIC_KEY,
-        topicCategory,
-      });
-    },
+    }
+    this.composer.open({
+      action: Composer.CREATE_TOPIC,
+      draftKey: Composer.NEW_TOPIC_KEY,
+      topicCategory,
+    });
+  },
 
+  actions: {
     selectAll() {
       this.selected.addObjects(this.get("model.posts").mapBy("topic"));
 
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 2540c78b54..00e64f86da 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, equal, gt, not, or } from "@ember/object/computed";
 import discourseComputed, {
   observes,
@@ -313,6 +314,24 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  @action
+  displayInline(event) {
+    event?.preventDefault();
+    this.set("viewMode", "inline");
+  },
+
+  @action
+  displaySideBySide(event) {
+    event?.preventDefault();
+    this.set("viewMode", "side_by_side");
+  },
+
+  @action
+  displaySideBySideMarkdown(event) {
+    event?.preventDefault();
+    this.set("viewMode", "side_by_side_markdown");
+  },
+
   actions: {
     loadFirstVersion() {
       this.refresh(this.get("model.post_id"), this.get("model.first_revision"));
@@ -345,15 +364,5 @@ export default Controller.extend(ModalFunctionality, {
     revertToVersion() {
       this.revert(this.post, this.get("model.current_revision"));
     },
-
-    displayInline() {
-      this.set("viewMode", "inline");
-    },
-    displaySideBySide() {
-      this.set("viewMode", "side_by_side");
-    },
-    displaySideBySideMarkdown() {
-      this.set("viewMode", "side_by_side_markdown");
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 1a5a4ecc7f..401c85f354 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -3,7 +3,7 @@ import { alias, not, or, readOnly } from "@ember/object/computed";
 import { areCookiesEnabled, escapeExpression } from "discourse/lib/utilities";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { next, schedule } from "@ember/runloop";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -133,7 +133,66 @@ export default Controller.extend(ModalFunctionality, {
     return canLoginLocalWithEmail;
   },
 
+  @action
+  emailLogin(event) {
+    event?.preventDefault();
+
+    if (this.processingEmailLink) {
+      return;
+    }
+
+    if (isEmpty(this.loginName)) {
+      this.flash(I18n.t("login.blank_username"), "info");
+      return;
+    }
+
+    this.set("processingEmailLink", true);
+
+    ajax("/u/email-login", {
+      data: { login: this.loginName.trim() },
+      type: "POST",
+    })
+      .then((data) => {
+        const loginName = escapeExpression(this.loginName);
+        const isEmail = loginName.match(/@/);
+        let key = `email_login.complete_${isEmail ? "email" : "username"}`;
+        if (data.user_found === false) {
+          this.flash(
+            I18n.t(`${key}_not_found`, {
+              email: loginName,
+              username: loginName,
+            }),
+            "error"
+          );
+        } else {
+          let postfix = data.hide_taken ? "" : "_found";
+          this.flash(
+            I18n.t(`${key}${postfix}`, {
+              email: loginName,
+              username: loginName,
+            })
+          );
+        }
+      })
+      .catch((e) => this.flash(extractError(e), "error"))
+      .finally(() => this.set("processingEmailLink", false));
+  },
+
+  @action
+  handleForgotPassword(event) {
+    event?.preventDefault();
+    const forgotPasswordController = this.forgotPassword;
+    if (forgotPasswordController) {
+      forgotPasswordController.set("accountEmailOrUsername", this.loginName);
+    }
+    this.send("showForgotPassword");
+  },
+
   actions: {
+    forgotPassword() {
+      this.handleForgotPassword();
+    },
+
     login() {
       if (this.loginDisabled) {
         return;
@@ -297,56 +356,6 @@ export default Controller.extend(ModalFunctionality, {
       this.send("showCreateAccount");
     },
 
-    forgotPassword() {
-      const forgotPasswordController = this.forgotPassword;
-      if (forgotPasswordController) {
-        forgotPasswordController.set("accountEmailOrUsername", this.loginName);
-      }
-      this.send("showForgotPassword");
-    },
-
-    emailLogin() {
-      if (this.processingEmailLink) {
-        return;
-      }
-
-      if (isEmpty(this.loginName)) {
-        this.flash(I18n.t("login.blank_username"), "info");
-        return;
-      }
-
-      this.set("processingEmailLink", true);
-
-      ajax("/u/email-login", {
-        data: { login: this.loginName.trim() },
-        type: "POST",
-      })
-        .then((data) => {
-          const loginName = escapeExpression(this.loginName);
-          const isEmail = loginName.match(/@/);
-          let key = `email_login.complete_${isEmail ? "email" : "username"}`;
-          if (data.user_found === false) {
-            this.flash(
-              I18n.t(`${key}_not_found`, {
-                email: loginName,
-                username: loginName,
-              }),
-              "error"
-            );
-          } else {
-            let postfix = data.hide_taken ? "" : "_found";
-            this.flash(
-              I18n.t(`${key}${postfix}`, {
-                email: loginName,
-                username: loginName,
-              })
-            );
-          }
-        })
-        .catch((e) => this.flash(extractError(e), "error"))
-        .finally(() => this.set("processingEmailLink", false));
-    },
-
     authenticateSecurityKey() {
       getWebauthnCredential(
         this.securityKeyChallenge,
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index bae85083a8..472a69005d 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,4 +1,5 @@
 import DiscourseURL, { userPath } from "discourse/lib/url";
+import { action } from "@ember/object";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -8,6 +9,7 @@ import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
+import { modKeysPressed } from "discourse/lib/utilities";
 
 export default Controller.extend(PasswordValidation, {
   isDeveloper: alias("model.is_developer"),
@@ -46,6 +48,16 @@ export default Controller.extend(PasswordValidation, {
 
   lockImageUrl: getURL("/images/lock.svg"),
 
+  @action
+  done(event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    this.set("redirected", true);
+    DiscourseURL.redirectTo(this.redirectTo || "/");
+  },
+
   actions: {
     submit() {
       ajax({
@@ -126,10 +138,5 @@ export default Controller.extend(PasswordValidation, {
         }
       );
     },
-
-    done() {
-      this.set("redirected", true);
-      DiscourseURL.redirectTo(this.redirectTo || "/");
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 6c3051d452..94ba197cfd 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -2,7 +2,7 @@ import { gt, not, or } from "@ember/object/computed";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
@@ -132,6 +132,20 @@ export default Controller.extend(CanCheckEmails, {
     return findAll().length > 0;
   },
 
+  @action
+  resendConfirmationEmail(email, event) {
+    event?.preventDefault();
+    email.set("resending", true);
+    this.model
+      .addEmail(email.email)
+      .then(() => {
+        email.set("resent", true);
+      })
+      .finally(() => {
+        email.set("resending", false);
+      });
+  },
+
   actions: {
     save() {
       this.set("saved", false);
@@ -157,18 +171,6 @@ export default Controller.extend(CanCheckEmails, {
       this.model.destroyEmail(email);
     },
 
-    resendConfirmationEmail(email) {
-      email.set("resending", true);
-      this.model
-        .addEmail(email.email)
-        .then(() => {
-          email.set("resent", true);
-        })
-        .finally(() => {
-          email.set("resending", false);
-        });
-    },
-
     delete() {
       this.dialog.alert({
         message: I18n.t("user.delete_account_confirm"),
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index 946903a568..fc5293054a 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -3,6 +3,7 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -91,6 +92,27 @@ export default Controller.extend(CanCheckEmails, {
     this.set("dirty", true);
   },
 
+  @action
+  resetPassword(event) {
+    event?.preventDefault();
+
+    this.setProperties({
+      resetPasswordLoading: true,
+      resetPasswordProgress: "",
+    });
+
+    return this.model
+      .changePassword()
+      .then(() => {
+        this.set(
+          "resetPasswordProgress",
+          I18n.t("user.change_password.success")
+        );
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("resetPasswordLoading", false));
+  },
+
   actions: {
     confirmPassword() {
       if (!this.password) {
@@ -101,24 +123,6 @@ export default Controller.extend(CanCheckEmails, {
       this.set("password", null);
     },
 
-    resetPassword() {
-      this.setProperties({
-        resetPasswordLoading: true,
-        resetPasswordProgress: "",
-      });
-
-      return this.model
-        .changePassword()
-        .then(() => {
-          this.set(
-            "resetPasswordProgress",
-            I18n.t("user.change_password.success")
-          );
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("resetPasswordLoading", false));
-    },
-
     disableAllSecondFactors() {
       if (this.loading) {
         return;
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/security.js b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
index c1e7dc52c0..800d597c65 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/security.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -51,6 +52,56 @@ export default Controller.extend(CanCheckEmails, {
     DEFAULT_AUTH_TOKENS_COUNT
   ),
 
+  @action
+  changePassword(event) {
+    event?.preventDefault();
+    if (!this.passwordProgress) {
+      this.set("passwordProgress", I18n.t("user.change_password.in_progress"));
+      return this.model
+        .changePassword()
+        .then(() => {
+          // password changed
+          this.setProperties({
+            changePasswordProgress: false,
+            passwordProgress: I18n.t("user.change_password.success"),
+          });
+        })
+        .catch(() => {
+          // password failed to change
+          this.setProperties({
+            changePasswordProgress: false,
+            passwordProgress: I18n.t("user.change_password.error"),
+          });
+        });
+    }
+  },
+
+  @action
+  toggleShowAllAuthTokens(event) {
+    event?.preventDefault();
+    this.toggleProperty("showAllAuthTokens");
+  },
+
+  @action
+  revokeAuthToken(token, event) {
+    event?.preventDefault();
+    ajax(
+      userPath(
+        `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+      ),
+      {
+        type: "POST",
+        data: token ? { token_id: token.id } : {},
+      }
+    )
+      .then(() => {
+        if (!token) {
+          logout();
+        } // All sessions revoked
+      })
+      .catch(popupAjaxError);
+  },
+
   actions: {
     save() {
       this.set("saved", false);
@@ -60,53 +111,6 @@ export default Controller.extend(CanCheckEmails, {
         .catch(popupAjaxError);
     },
 
-    changePassword() {
-      if (!this.passwordProgress) {
-        this.set(
-          "passwordProgress",
-          I18n.t("user.change_password.in_progress")
-        );
-        return this.model
-          .changePassword()
-          .then(() => {
-            // password changed
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.success"),
-            });
-          })
-          .catch(() => {
-            // password failed to change
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.error"),
-            });
-          });
-      }
-    },
-
-    toggleShowAllAuthTokens() {
-      this.toggleProperty("showAllAuthTokens");
-    },
-
-    revokeAuthToken(token) {
-      ajax(
-        userPath(
-          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
-        ),
-        {
-          type: "POST",
-          data: token ? { token_id: token.id } : {},
-        }
-      )
-        .then(() => {
-          if (!token) {
-            logout();
-          } // All sessions revoked
-        })
-        .catch(popupAjaxError);
-    },
-
     showToken(token) {
       showModal("auth-token", { model: token });
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
index bdc1f3511d..2ed9127535 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -40,9 +41,15 @@ export default Controller.extend(ModalFunctionality, {
       .finally(() => this.set("loading", false));
   },
 
+  @action
+  enableShowSecondFactorKey(event) {
+    event?.preventDefault();
+    this.set("showSecondFactorKey", true);
+  },
+
   actions: {
     showSecondFactorKey() {
-      this.set("showSecondFactorKey", true);
+      this.enableShowSecondFactorKey();
     },
 
     enableSecondFactor() {
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
index 8e88afdf95..f4199f9ee9 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-auth.js
@@ -212,7 +212,8 @@ export default Controller.extend({
   },
 
   @action
-  useAnotherMethod(newMethod) {
+  useAnotherMethod(newMethod, event) {
+    event?.preventDefault();
     this.set("userSelectedMethod", newMethod);
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index 619c5e860d..2f9c493516 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -110,7 +110,8 @@ export default DiscoverySortableController.extend(
     },
 
     @action
-    showInserted() {
+    showInserted(event) {
+      event?.preventDefault();
       const tracker = this.topicTrackingState;
       this.list.loadBefore(tracker.newIncoming, true);
       tracker.resetTracking();
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index ec56d24003..eff2f1d30b 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -41,23 +42,27 @@ export default Controller.extend({
     };
   },
 
+  @action
+  sortByCount(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["totalCount:desc", "id"],
+      sortedByCount: true,
+      sortedByName: false,
+    });
+  },
+
+  @action
+  sortById(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["id"],
+      sortedByCount: false,
+      sortedByName: true,
+    });
+  },
+
   actions: {
-    sortByCount() {
-      this.setProperties({
-        sortProperties: ["totalCount:desc", "id"],
-        sortedByCount: true,
-        sortedByName: false,
-      });
-    },
-
-    sortById() {
-      this.setProperties({
-        sortProperties: ["id"],
-        sortedByCount: false,
-        sortedByName: true,
-      });
-    },
-
     showUploader() {
       showModal("tag-upload");
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index aace5530cb..7b1da2f654 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -19,7 +19,7 @@ import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { buildQuote } from "discourse/lib/quote";
 import { deepMerge } from "discourse-common/lib/object";
-import { escapeExpression } from "discourse/lib/utilities";
+import { escapeExpression, modKeysPressed } from "discourse/lib/utilities";
 import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
@@ -313,6 +313,58 @@ export default Controller.extend(bufferedProperty("model"), {
       });
   },
 
+  @action
+  editTopic(event) {
+    event?.preventDefault();
+    if (this.get("model.details.can_edit")) {
+      this.set("editingTopic", true);
+    }
+  },
+
+  @action
+  jumpTop(event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
+      skipIfOnScreen: false,
+      keepFilter: true,
+    });
+  },
+
+  @action
+  removeFeaturedLink(event) {
+    event?.preventDefault();
+    this.set("buffered.featured_link", null);
+  },
+
+  @action
+  selectAll(event) {
+    event?.preventDefault();
+    const smallActionsPostIds = this._smallActionPostIds();
+    this.set("selectedPostIds", [
+      ...this.get("model.postStream.stream").filter(
+        (postId) => !smallActionsPostIds.has(postId)
+      ),
+    ]);
+    this._forceRefreshPostStream();
+  },
+
+  @action
+  deselectAll(event) {
+    event?.preventDefault();
+    this.set("selectedPostIds", []);
+    this._forceRefreshPostStream();
+  },
+
+  @action
+  toggleMultiSelect(event) {
+    event?.preventDefault();
+    this.toggleProperty("multiSelect");
+    this._forceRefreshPostStream();
+  },
+
   actions: {
     topicCategoryChanged(categoryId) {
       this.set("buffered.category_id", categoryId);
@@ -822,13 +874,6 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostNumber(postNumber);
     },
 
-    jumpTop() {
-      DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
-        skipIfOnScreen: false,
-        keepFilter: true,
-      });
-    },
-
     jumpBottom() {
       // When a topic only has one lengthy post
       const jumpEnd = this.model.highest_post_number === 1 ? true : false;
@@ -859,26 +904,6 @@ export default Controller.extend(bufferedProperty("model"), {
       this._jumpToPostId(postId);
     },
 
-    toggleMultiSelect() {
-      this.toggleProperty("multiSelect");
-      this._forceRefreshPostStream();
-    },
-
-    selectAll() {
-      const smallActionsPostIds = this._smallActionPostIds();
-      this.set("selectedPostIds", [
-        ...this.get("model.postStream.stream").filter(
-          (postId) => !smallActionsPostIds.has(postId)
-        ),
-      ]);
-      this._forceRefreshPostStream();
-    },
-
-    deselectAll() {
-      this.set("selectedPostIds", []);
-      this._forceRefreshPostStream();
-    },
-
     togglePostSelection(post) {
       const selected = this.selectedPostIds;
       selected.includes(post.id)
@@ -973,13 +998,6 @@ export default Controller.extend(bufferedProperty("model"), {
         .then(() => this.updateQueryParams);
     },
 
-    editTopic() {
-      if (this.get("model.details.can_edit")) {
-        this.set("editingTopic", true);
-      }
-      return false;
-    },
-
     cancelEditingTopic() {
       this.set("editingTopic", false);
       this.rollbackBuffer();
@@ -1159,10 +1177,6 @@ export default Controller.extend(bufferedProperty("model"), {
         .catch(popupAjaxError);
     },
 
-    removeFeaturedLink() {
-      this.set("buffered.featured_link", null);
-    },
-
     resetBumpDate() {
       this.model.resetBumpDate();
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
index 9d4f536866..b73149358f 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
@@ -1,25 +1,29 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
+
 export default Controller.extend({
   sortProperties: ["count:desc", "id"],
   tagsForUser: null,
   sortedByCount: true,
   sortedByName: false,
 
-  actions: {
-    sortByCount() {
-      this.setProperties({
-        sortProperties: ["count:desc", "id"],
-        sortedByCount: true,
-        sortedByName: false,
-      });
-    },
+  @action
+  sortByCount(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["count:desc", "id"],
+      sortedByCount: true,
+      sortedByName: false,
+    });
+  },
 
-    sortById() {
-      this.setProperties({
-        sortProperties: ["id"],
-        sortedByCount: false,
-        sortedByName: true,
-      });
-    },
+  @action
+  sortById(event) {
+    event?.preventDefault();
+    this.setProperties({
+      sortProperties: ["id"],
+      sortedByCount: false,
+      sortedByName: true,
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
index 021502f615..a40ab97f4e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
@@ -81,10 +81,10 @@ export default Controller.extend(BulkTopicSelection, {
   },
 
   @action
-  showInserted() {
+  showInserted(event) {
+    event?.preventDefault();
     this.model.loadBefore(this.pmTopicTrackingState.newIncoming);
     this.pmTopicTrackingState.resetIncomingTracking();
-    return false;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 4c8ba40cbc..8f2d24beb1 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -211,6 +211,15 @@ export default Controller.extend(CanCheckEmails, {
     }
   },
 
+  @action
+  showSuspensions(event) {
+    event?.preventDefault();
+    this.adminTools.showActionLogs(this, {
+      target_user: this.get("model.username"),
+      action_name: "suspend_user",
+    });
+  },
+
   actions: {
     collapseProfile() {
       this.set("forceExpand", false);
@@ -220,13 +229,6 @@ export default Controller.extend(CanCheckEmails, {
       this.set("forceExpand", true);
     },
 
-    showSuspensions() {
-      this.adminTools.showActionLogs(this, {
-        target_user: this.get("model.username"),
-        action_name: "suspend_user",
-      });
-    },
-
     adminDelete() {
       const userId = this.get("model.id");
       const location = document.location.pathname;
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index d2ae39cdea..9f5b02fac4 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -489,6 +489,12 @@ export function inCodeBlock(text, pos) {
   return lastOpenBlock !== -1 && pos >= end + lastOpenBlock;
 }
 
+// Return an array of modifier keys that are pressed during a given `MouseEvent`
+// or `KeyboardEvent`.
+export function modKeysPressed(event) {
+  return ["alt", "shift", "meta", "ctrl"].filter((key) => event[`${key}Key`]);
+}
+
 export function translateModKey(string) {
   const { isApple } = helperContext().capabilities;
   // Apple device users are used to glyphs for shortcut keys
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
index 338e4b1cf5..6f3be0d4a9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
@@ -20,7 +20,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
+      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
index 16e062fda2..4acbfc6298 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
@@ -1,6 +1,6 @@
 <span class="group-name">
   <span class="group-name-label">{{this.group_name}}</span>
-  <a class="remove-permission" href {{action "removeRow"}}>
+  <a class="remove-permission" href {{on "click" this.removeRow}}>
     {{d-icon "far-trash-alt"}}
   </a>
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
index ce6c36f17d..c7d07e87f2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
@@ -11,7 +11,7 @@
     {{#each this.messages as |m|}}
       <div class="controls existing-message">
         <label class="radio">
-          <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
+          <input id="choose-message-{{m.id}}" {{on "click" (fn this.chooseMessage m)}} type="radio" name="choose_message_id">
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
index 836736abf7..f59b10dd5b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class={{if this.active "active"}}>{{this.title}}</a>
+<a href {{on "click" this.select}} class={{if this.active "active"}}>{{this.title}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
index f7e48e3951..d0eac567ac 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
@@ -1,30 +1,30 @@
 {{!-- DO NOT EDIT THIS FILE!!! --}}
 {{!-- Update it by running `rake javascript:update_constants` --}}
 
-<button type="button" data-section="smileys_&_emotion" {{action this.onCategorySelection "smileys_&_emotion"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="smileys_&_emotion" {{on "click" (fn this.onCategorySelection "smileys_&_emotion")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":grinning:"}}
 </button>
-<button type="button" data-section="people_&_body" {{action this.onCategorySelection "people_&_body"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="people_&_body" {{on "click" (fn this.onCategorySelection "people_&_body")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":wave:"}}
 </button>
-<button type="button" data-section="animals_&_nature" {{action this.onCategorySelection "animals_&_nature"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="animals_&_nature" {{on "click" (fn this.onCategorySelection "animals_&_nature")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":evergreen_tree:"}}
 </button>
-<button type="button" data-section="food_&_drink" {{action this.onCategorySelection "food_&_drink"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="food_&_drink" {{on "click" (fn this.onCategorySelection "food_&_drink")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":hamburger:"}}
 </button>
-<button type="button" data-section="travel_&_places" {{action this.onCategorySelection "travel_&_places"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="travel_&_places" {{on "click" (fn this.onCategorySelection "travel_&_places")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":airplane:"}}
 </button>
-<button type="button" data-section="activities" {{action this.onCategorySelection "activities"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="activities" {{on "click" (fn this.onCategorySelection "activities")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":soccer:"}}
 </button>
-<button type="button" data-section="objects" {{action this.onCategorySelection "objects"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="objects" {{on "click" (fn this.onCategorySelection "objects")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":eyeglasses:"}}
 </button>
-<button type="button" data-section="symbols" {{action this.onCategorySelection "symbols"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="symbols" {{on "click" (fn this.onCategorySelection "symbols")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":white_check_mark:"}}
 </button>
-<button type="button" data-section="flags" {{action this.onCategorySelection "flags"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="flags" {{on "click" (fn this.onCategorySelection "flags")}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":checkered_flag:"}}
 </button>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index d35c0e5e2f..cba02e4d65 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -4,15 +4,15 @@
     {{!-- template-lint-enable no-invalid-interactive no-down-event-binding --}}
     <div class="emoji-picker-category-buttons">
       {{#if this.recentEmojis.length}}
-        <button type="button" data-section="recent" {{action "onCategorySelection" "recent"}} class="btn btn-default category-button emoji">
+        <button type="button" data-section="recent" {{on "click" (fn this.onCategorySelection "recent")}} class="btn btn-default category-button emoji">
           {{replace-emoji ":star:"}}
         </button>
       {{/if}}
 
-      <EmojiGroupButtons @onCategorySelection={{action "onCategorySelection"}} @tagName="" />
+      <EmojiGroupButtons @onCategorySelection={{this.onCategorySelection}} @tagName="" />
 
       {{#each-in this.customEmojis as |group emojis|}}
-        <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
+        <button type="button" data-section={{concat "custom-" group}} {{on "click" (fn this.onCategorySelection (concat "custom-" group))}} class="btn btn-default category-button emoji">
           {{replace-emoji (concat ":" emojis.firstObject.code ":")}}
         </button>
       {{/each-in}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
index ba18d20f35..6e41deadef 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
@@ -2,7 +2,7 @@
   <h3>{{this.formattedName}}</h3>
   <div class="controls">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
 
       <div class="flag-action-type-details">
         <span class="description">{{html-safe this.flag.description}}</span>
@@ -19,7 +19,7 @@
 {{else}}
   <div class="controls {{this.flag.name_key}}">
     <label class="radio">
-      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{on "click" (action "changePostActionType" this.flag)}} type="radio" name="post_action_type_index">
       <div class="flag-action-type-details">
         <strong>{{this.formattedName}}</strong>
         {{#if this.showDescription}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
index a47f02deca..f93472eaeb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
@@ -13,14 +13,14 @@
     {{else}}
       <div class="card-row first-row">
         <div class="group-card-avatar">
-          <a href={{this.groupPath}} {{action "showGroup" this.group}} class="card-huge-avatar">
+          <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="card-huge-avatar">
             <AvatarFlair @flairName={{this.group.name}} @flairUrl={{this.group.flair_url}} @flairBgColor={{this.group.flair_bg_color}} @flairColor={{this.group.flair_color}} />
           </a>
         </div>
         <div class="names">
           <span>
             <h1 class={{this.group.name}}>
-              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="group-page-link">{{this.group.name}}</a>
+              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="group-page-link">{{this.group.name}}</a>
             </h1>
             {{#if this.group.full_name}}
               <h2 class="full-name">{{this.group.full_name}}</h2>
@@ -53,10 +53,10 @@
         <div class="card-row third-row">
           <div class="members metadata">
             {{#each this.group.members as |user|}}
-              <a {{action "close"}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+              <a {{on "click" this.close}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
             {{/each}}
             {{#if this.showMoreMembers}}
-              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="more-members-link">
+              <a href={{this.groupPath}} {{on "click" (fn this.handleShowGroup this.group)}} class="more-members-link">
                 <span class="more-members-count">+{{this.moreMembersCount}} {{i18n "more"}}</span>
               </a>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
index 0033afdf8a..e86851cb2c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
@@ -34,7 +34,7 @@
 
   <div class="control-group">
     <div class="group-imap-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_imap_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index 709ab0615e..7c59effdfd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" (action "smtpEnabledChange")}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" (action "imapEnabledChange")}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
index 78f084e8ff..703a39658a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
@@ -3,7 +3,7 @@
 </a>
 <span>{{this.member.username}}</span>
 {{#unless this.automatic}}
-  <a href {{action "remove"}} class="remove">
+  <a href {{on "click" this.remove}} class="remove">
     {{d-icon "times"}}
   </a>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
index 4263b72514..68623cda2b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
@@ -40,7 +40,7 @@
 
   <div class="control-group">
     <div class="group-smtp-prefill-options">
-      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{action "prefillSettings" "gmail"}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
+      {{i18n "groups.manage.email.prefill.title"}} <a id="prefill_smtp_gmail" href {{on "click" (fn this.prefillSettings "gmail")}}>{{i18n "groups.manage.email.prefill.gmail"}}</a>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
index ab36ebbfa0..b7a0ffeba7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each this.buttons as |b|}}
-  <button type="button" class="btn btn-social {{b.name}}" {{action this.externalLogin b}} aria-label={{b.screenReaderTitle}} tabindex="3">
+  <button type="button" class="btn btn-social {{b.name}}" {{on "click" (action this.externalLogin b)}} aria-label={{b.screenReaderTitle}} tabindex="3">
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index f98826d61b..d5bfb00f08 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -10,7 +10,7 @@
     <span class="status">
       {{reviewable-status this.reviewable.status}}
     </span>
-    <a href {{action "explainReviewable" this.reviewable}} title={{i18n "review.explain.why"}} class="explain">
+    <a href {{on "click" (fn this.explainReviewable this.reviewable)}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
index 16df22dbb5..349953e988 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
@@ -1,5 +1,5 @@
 {{#if this.hasEdits}}
-  <a href {{action "showEditHistory"}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
+  <a href {{on "click" this.showEditHistory}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
     {{d-icon "pencil-alt"}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
index 5c18aab0cd..39b8e7dd3a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
@@ -6,7 +6,7 @@
   {{category-badge this.reviewable.category}}
   <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
   {{#if this.reviewable.payload.via_email}}
-    <a href {{action "showRawEmail"}} class="show-raw-email">
+    <a href {{on "click" this.showRawEmail}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
index 25a563daa0..6e49ebe210 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
@@ -10,7 +10,7 @@
       <TrackSelected @selectedList={{this.selected}} @selectedId={{this.post.topic}} @class="bulk-select" />
     {{/if}}
 
-    <a href={{this.post.url}} {{action "logClick" this.post.topic_id}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
+    <a href={{this.post.url}} {{on "click" (fn this.logClick this.post.topic_id)}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
       {{raw "topic-status" topic=this.post.topic showPrivateMessageIcon=true}}
       <span class="topic-title">
         {{#if this.post.useTopicTitleHeadline}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
index b5f1fbfbe2..714d1b4e92 100644
--- a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
@@ -7,7 +7,7 @@
   {{yield}}
   {{#if this.showToggleMethodLink}}
     <p>
-      <a href="" class="toggle-second-factor-method" {{action "toggleSecondFactorMethod"}}>{{ i18n this.linkText }}</a>
+      <a href class="toggle-second-factor-method" {{on "click" this.toggleSecondFactorMethod}}>{{ i18n this.linkText }}</a>
     </p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
index f0f70b3c6c..f321e2ca05 100644
--- a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
@@ -2,7 +2,7 @@
   <DButton @action={{this.action}} @icon="key" @id="security-key-authenticate-button" @label="login.security_key_authenticate" @type="button" @class="btn btn-large btn-primary" />
   <p>
     {{#if this.otherMethodAllowed}}
-      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
+      <a href class="toggle-second-factor-method" {{on "click" this.useAnotherMethod}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
index 09afc7c50a..206ff4ae21 100644
--- a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
@@ -4,7 +4,7 @@
 
 {{#if this.canSelectAll}}
   <p>
-    <a class="select-all" href {{action this.selectAll}}>
+    <a class="select-all" href {{on "click" this.selectAll}}>
       {{i18n "topic.multi_select.select_all"}}
     </a>
   </p>
@@ -12,7 +12,7 @@
 
 {{#if this.canDeselectAll}}
   <p>
-    <a href {{action this.deselectAll}}>
+    <a href {{on "click" this.deselectAll}}>
       {{i18n "topic.multi_select.deselect_all"}}
     </a>
   </p>
@@ -35,7 +35,7 @@
 {{/if}}
 
 <p class="cancel">
-  <a href {{action this.toggleMultiSelect}}>
+  <a href {{on "click" this.toggleMultiSelect}}>
     {{i18n "topic.multi_select.cancel"}}
   </a>
 </p>
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
index cf640feb23..f6d4148d83 100644
--- a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
@@ -10,7 +10,7 @@
     <div class="buttons">
       <DButton @action={{route-action "showCreateAccount"}} @label="signup_cta.sign_up" @icon="user" @class="btn-primary" />
       <DButton @action={{action "hideForSession"}} @label="signup_cta.hide_session" @class="no-icon" />
-      <a href {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
+      <a href {{on "click" this.neverShow}}>{{i18n "signup_cta.hide_forever"}}</a>
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index 4e1c273767..b85e1bfa28 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -17,7 +17,7 @@
         <div class="tag-name-wrapper">
           {{discourse-tag this.tagInfo.name tagName="div"}}
           {{#if this.canAdminTag}}
-            <a href {{action "edit"}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
+            <a href {{on "click" this.edit}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
           {{/if}}
         </div>
         <div class="tag-description-wrapper">
@@ -56,10 +56,10 @@
             <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
               {{#if this.editSynonymsMode}}
-                <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
+                <a href {{on "click" (fn this.unlinkSynonym tag)}} class="unlink-synonym">
                   {{d-icon "unlink" title="tagging.remove_synonym"}}
                 </a>
-                <a href {{action "deleteSynonym" tag}} class="delete-synonym">
+                <a href {{on "click" (fn this.deleteSynonym tag)}} class="delete-synonym">
                   {{d-icon "far-trash-alt" title="tagging.delete_tag"}}
                 </a>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index f2614399f2..eb422a5e39 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -26,7 +26,7 @@
           {{#if this.user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar this.user "huge"}}</span>
           {{else}}
-            <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
+            <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
 
           <UserAvatarFlair @user={{this.user}} />
@@ -40,7 +40,7 @@
                 {{if this.nameFirst this.user.name (format-username this.user.username)}}
               </span>
             {{else}}
-              <a href={{this.user.path}} {{action "showUser" this.user}} class="user-profile-link">
+              <a href={{this.user.path}} {{on "click" (fn this.handleShowUser this.user)}} class="user-profile-link">
                 <span id="discourse-user-card-title" class="name-username-wrapper">
                   {{if this.nameFirst this.user.name (format-username this.user.username)}}
                 </span>
@@ -48,7 +48,7 @@
               </a>
             {{/if}}
           </h1>
-          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(action "showUser" this.user)}} />
+          <PluginOutlet @name="user-card-after-username" @connectorTagName="div" @args={{hash user=this.user showUser=(fn this.handleShowUser this.user)}} />
           {{#if this.nameFirst}}
             <h2 class="username">{{this.user.username}}</h2>
           {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 132e37cff6..64967f9982 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -101,7 +101,7 @@
             <ComposerSaveButton @action={{action "save"}} @icon={{this.saveIcon}} @label={{this.saveLabel}} @forwardEvent={{true}} @disableSubmit={{this.disableSubmit}} />
 
             {{#if this.site.mobileView}}
-              <a href {{action "cancel"}} title={{i18n "cancel"}} class="cancel">
+              <a href {{on "click" this.cancel}} title={{i18n "cancel"}} class="cancel">
                 {{#if this.canEdit}}
                   {{d-icon "times"}}
                 {{else}}
@@ -109,7 +109,7 @@
                 {{/if}}
               </a>
             {{else}}
-              <a href {{action "cancel"}} class="cancel" >{{i18n "close"}}</a>
+              <a href {{on "click" this.cancel}} class="cancel" >{{i18n "close"}}</a>
             {{/if}}
 
             {{#if this.site.mobileView}}
@@ -133,7 +133,7 @@
                 {{/if}}
 
                 {{#if this.isCancellable}}
-                  <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
+                  <a href id="cancel-file-upload" {{on "click" this.cancelUpload}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
@@ -165,7 +165,7 @@
               </a>
             {{/if}}
 
-            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{action "togglePreview"}} aria-label={{i18n "preview"}}>
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{on "click" this.togglePreview}} aria-label={{i18n "preview"}}>
               {{d-icon "desktop"}}
             </a>
 
@@ -180,7 +180,7 @@
     {{else}}
       <div class="saving-text">
         {{#if this.model.createdPost}}
-          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
+          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{on "click" this.viewNewReply}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
           {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
index 248e6c05a4..6edf2f0dc3 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
index 1c83813b00..b1d56bdaff 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
index 308dbeefc9..f5ab696290 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
index 49a28605b6..7547ea9aa9 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 510da64e49..4b7b4be309 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action this.closeMessage this.message}} class="close" aria-label={{i18n "composer.esc_label"}}>
+<a href {{on "click" (fn this.closeMessage this.message)}} class="close" aria-label={{i18n "composer.esc_label"}}>
   {{i18n "composer.esc"}} {{d-icon "times"}}
 </a>
 
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 4187cda09d..51734fa801 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -3,7 +3,7 @@
 <DiscoveryCategories @refresh={{action "refresh"}}>
   {{#if (and this.topicTrackingState.hasIncoming this.isCategoriesRoute)}}
     <div class="show-more {{if this.hasTopics "has-topics"}}">
-      <div role="button" class="alert alert-info clickable" {{action "showInserted"}}>
+      <div role="button" class="alert alert-info clickable" {{on "click" this.showInserted}}>
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 7deb8d1edc..3b6018bae9 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -20,7 +20,7 @@
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
       <div class="show-more {{if this.hasTopics "has-topics"}}">
-        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index de59e86dae..23926dd460 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -101,7 +101,7 @@
                     <div class="no-results-suggestion">
                       {{i18n "search.cant_find"}}
                       {{#if this.canCreateTopic}}
-                        <a href {{action "createTopic" this.searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                        <a href {{on "click" (fn this.createTopic this.searchTerm)}}>{{i18n "search.start_new_topic"}}</a>
                         {{#unless this.siteSettings.login_required}}
                           {{i18n "search.or_search_google"}}
                         {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
index 53f0ee38c6..a5382ff98c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
@@ -9,7 +9,7 @@
 
   {{#if this.mutedCategories}}
     <div class="muted-categories">
-      <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
+      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
         {{#if this.mutedToggleIcon}}
           {{d-icon this.mutedToggleIcon}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
index b062e88d04..6c7e389d6c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
@@ -1,6 +1,6 @@
 {{#if this.selectedHtml}}
   <li>
-    <a href {{action "toggleExpanded"}} class="expander">
+    <a href {{on "click" this.toggleExpanded}} class="expander">
       <span class="selection">{{html-safe this.selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index 72e29f165f..06bddeb0fa 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -1,5 +1,5 @@
 <li class="navigation-toggle">
-  <a href {{action "toggleDrop"}} class="toggle-link">
+  <a href {{on "click" this.toggleDrop}} class="toggle-link">
     {{this.selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index c91dcd6405..1e6cf38bcc 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -7,7 +7,7 @@
     </div>
   {{else}}
     {{#if this.topicTrackingState.hasIncoming}}
-      <a href {{action "showInserted"}} class="alert alert-info clickable">
+      <a href {{on "click" this.showInserted}} class="alert alert-info clickable">
         <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 8bd68ee20e..9ac8b5d77a 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -16,7 +16,7 @@
             <Input @value={{this.loginName}} class={{value-entered this.loginName}} @type="email" id="login-account-name" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" />
             <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
             {{#if this.showLoginWithEmailLink}}
-              <a href id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
+              <a href id="email-login-link" {{on "click" this.emailLogin}}>
                 {{i18n "email_login.login_link"}}
               </a>
             {{/if}}
@@ -24,7 +24,7 @@
           <div class="input-group">
             <Input @value={{this.loginPassword}} class={{value-entered this.loginPassword}} @type="password" id="login-account-password" maxlength="200" disabled={{this.showSecondFactor}} />
             <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-            <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+            <a href id="forgot-password-link" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
           </div>
         </div>
         <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @class={{this.secondFactorClass}} @backupEnabled={{this.backupEnabled}} @isLogin={{true}}>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
index 86310ecef2..c0cc595e83 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
@@ -17,7 +17,7 @@
     <div>
       <h3>
         {{i18n "user.auth_tokens.latest_post"}}
-        <a href {{action "toggleExpanded"}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
+        <a href {{on "click" this.toggleExpanded}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
       </h3>
 
       {{#if this.expanded}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index d8447cfc13..115a78dde5 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -2,7 +2,7 @@
   {{#if this.showSelectableAvatars}}
     <div class="selectable-avatars">
       {{#each this.selectableAvatars as |avatar|}}
-        <a href class="selectable-avatar" {{action "selectAvatar" avatar}}>
+        <a href class="selectable-avatar" {{on "click" (fn this.selectAvatar avatar)}}>
           {{bound-avatar-template avatar "huge"}}
         </a>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index 38f30da9dd..0f48b08226 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -30,19 +30,19 @@
       <div id="display-modes">
         <ul class="nav nav-pills">
           <li>
-            <a href class={{this.inlineClass}} {{action "displayInline"}} title={{i18n "post.revisions.displays.inline.title"}}>
+            <a href class={{this.inlineClass}} {{on "click" this.displayInline}} title={{i18n "post.revisions.displays.inline.title"}}>
               {{d-icon "far-square"}}
               {{i18n "post.revisions.displays.inline.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideClass}} {{action "displaySideBySide"}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
+            <a href class={{this.sideBySideClass}} {{on "click" this.displaySideBySide}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side.button"}}
             </a>
           </li>
           <li>
-            <a href class={{this.sideBySideMarkdownClass}} {{action "displaySideBySideMarkdown"}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
+            <a href class={{this.sideBySideMarkdownClass}} {{on "click" this.displaySideBySideMarkdown}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
             </a>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index 52250bd825..f93cea0807 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="composer.link_dialog_title" @class="insert-link">
-  <form id="insert-hyperlink-form" {{action "ok" on="submit"}}>
+  <form id="insert-hyperlink-form" {{on "submit" (action "ok")}}>
     <div class="inputs">
       <TextField @value={{this.linkUrl}} @placeholderKey="composer.link_url_placeholder" @class="link-url" @key-up={{action "search"}} @autofocus="autofocus" />
       {{#if this.searchLoading}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
index 7503af7c15..d7465134af 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
@@ -14,7 +14,7 @@
               <Input @value={{this.loginName}} @type="email" id="login-account-name" class={{value-entered this.loginName}} autocomplete="username" autocorrect="off" autocapitalize="off" disabled={{this.showSecondFactor}} autofocus="autofocus" tabindex="1" />
               <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
               {{#if this.showLoginWithEmailLink}}
-                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
+                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{on "click" this.emailLogin}}>
                   {{i18n "email_login.login_link"}}
                 </a>
               {{/if}}
@@ -22,7 +22,7 @@
             <div class="input-group">
               <PasswordField @value={{this.loginPassword}} @type="password" class={{value-entered this.loginPassword}} id="login-account-password" autocomplete="current-password" maxlength="200" @capsLockOn={{this.capsLockOn}} disabled={{this.disableLoginFields}} tabindex="1" />
               <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
-              <a href id="forgot-password-link" tabindex="3" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+              <a href id="forgot-password-link" tabindex="3" {{on "click" this.handleForgotPassword}}>{{i18n "forgot_password.action"}}</a>
               <div class="caps-lock-warning {{unless this.capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
index ed5c02023f..d94537761a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
@@ -23,7 +23,7 @@
           {{#if this.showSecondFactorKey}}
             {{this.secondFactorKey}}
           {{else}}
-            <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
+            <a href {{on "click" this.enableShowSecondFactorKey}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
         </p>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index 4ce19d4867..fb74ee2874 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n "login.not_approved"}}</p>
       {{else}}
         {{#unless this.redirected}}
-          <a class="btn" href={{this.redirectHref}} {{action "done"}}>{{this.continueButtonText}}</a>
+          <a class="btn" href={{this.redirectHref}} {{on "click" this.done}}>{{this.continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index debb8266e5..166a2c81d9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -120,7 +120,7 @@
             <div class="controls" style="margin-top: 5px">
               {{this.resetPasswordProgress}}
               {{#unless this.resetPasswordLoading}}
-                <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
+                <a href class="instructions" {{on "click" this.resetPassword}}>{{ i18n "user.second_factor.forgot_password" }}</a>
               {{/unless}}
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 77e3995a23..40ae04547a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -53,7 +53,7 @@
                   {{else if email.resent}}
                     <span>{{i18n "user.email.resent_label"}}</span>
                   {{else}}
-                    <a {{action "resendConfirmationEmail" email}} href>{{i18n "user.email.resend_label"}}</a>
+                    <a {{on "click" (fn this.resendConfirmationEmail email)}} href>{{i18n "user.email.resend_label"}}</a>
                   {{/if}}
                 {{/unless}}
               </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index 76e2d3f63a..78459f73e7 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -2,7 +2,7 @@
   <div class="control-group pref-password">
     <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
-      <a href {{action "changePassword"}} class="btn btn-default">
+      <a href {{on "click" this.changePassword}} class="btn btn-default">
         {{d-icon "envelope"}}
         {{#if this.model.no_password}}
           {{i18n "user.change_password.set_password"}}
@@ -58,7 +58,7 @@
     </div>
 
     {{#if this.canShowAllAuthTokens}}
-      <a href {{action "toggleShowAllAuthTokens"}}>
+      <a href {{on "click" this.toggleShowAllAuthTokens}}>
         {{#if this.showAllAuthTokens}}
           {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
@@ -67,7 +67,7 @@
       </a>
     {{/if}}
 
-    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
+    <a href {{on "click" (fn this.revokeAuthToken null)}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
index e1e99c3826..8c38d50493 100644
--- a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
+++ b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
@@ -25,7 +25,7 @@
           <span>&middot;</span>
         {{/if}}
         <span>
-          <a href="" class="toggle-second-factor-method {{method.class}}" {{action "useAnotherMethod" method.id}}>
+          <a href class="toggle-second-factor-method {{method.class}}" {{on "click" (fn this.useAnotherMethod method.id)}}>
             {{i18n method.translationKey}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index afc2d8e4dd..de725a87a4 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -40,7 +40,7 @@
               {{else}}
                 {{#if this.topicTrackingState.hasIncoming}}
                   <div class="show-more {{if this.hasTopics "has-topics"}}">
-                    <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+                    <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
                       <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
                     </a>
                   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index a6c07e90f1..932bcf36ec 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -15,8 +15,8 @@
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{on "click" this.sortByCount}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{on "click" this.sortById}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 41fa19fd1d..85186edfe2 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -41,7 +41,7 @@
               <DButton @action={{action "cancelEditingTopic"}} @class="btn-default cancel-edit" @icon="times" @ariaLabel="composer.cancel" />
 
               {{#if this.canRemoveTopicFeaturedLink}}
-                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
+                <a href {{on "click" this.removeFeaturedLink}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{this.featuredLinkDomain}}
                 </a>
@@ -61,13 +61,13 @@
 
             {{#if this.model.details.loaded}}
               <TopicStatus @topic={{this.model}} />
-              <a href={{this.model.url}} {{action "jumpTop"}} class="fancy-title">
+              <a href={{this.model.url}} {{on "click" this.jumpTop}} class="fancy-title">
                 {{html-safe this.model.fancyTitle}}
               </a>
             {{/if}}
 
             {{#if this.model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
+              <a href {{on "click" this.editTopic}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
 
             <PluginOutlet @name="topic-title-suffix" @tagName="" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
index e4d7d361b4..c33c0d3bd1 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
@@ -7,12 +7,12 @@
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
   <span class="tag-sort-count {{if this.sortedByCount "active"}}">
-    <a href {{action "sortByCount"}}>
+    <a href {{on "click" this.sortByCount}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
   <span class="tag-sort-name {{if this.sortedByName "active"}}">
-    <a href {{action "sortById"}}>
+    <a href {{on "click" this.sortById}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
   </span>
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index dc086f0c10..6e72246280 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -9,7 +9,7 @@
 
     {{#if (gt this.incomingCount 0)}}
       <div class="show-mores">
-        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
+        <a tabindex="0" href {{on "click" this.showInserted}} class="alert alert-info clickable">
           <CountI18n @key="topic_count_" @suffix="latest" @count={{this.incomingCount}} />
         </a>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index fa522ce8b2..d036d2111e 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -32,7 +32,7 @@
             {{/if}}
             {{#if this.model.number_of_suspensions}}
               <div>
-                <a href {{action "showSuspensions"}}>
+                <a href {{on "click" this.showSuspensions}}>
                   <span class="suspensions">{{this.model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index 8f44b4d76e..09f3e59226 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -52,12 +52,12 @@ acceptance("Plugin Outlet - Connector Class", function (needs) {
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hello`
     ] = hbs`<span class='hello-username'>{{model.username}}</span>
-        <button class='say-hello' {{action "sayHello"}}></button>
+        <button class='say-hello' {{on "click" (action "sayHello")}}></button>
         <span class='hello-result'>{{hello}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hi`
-    ] = hbs`<button class='say-hi' {{action "sayHi"}}></button>
+    ] = hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
         <span class='hi-result'>{{hi}}</span>`;
     // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index 09f9a135f7..b9bf541d09 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -148,25 +148,6 @@ acceptance("User menu", function (needs) {
       exists(".user-menu"),
       "clicking on the same item again closes the menu"
     );
-
-    await click(".d-header-icons .current-user");
-    await click("#user-menu-button-review-queue");
-    // this may not be ideal because it actually attempts to open a new tab
-    // which gets blocked by the browser, but otherwise it seems harmless and
-    // doesn't cause the test to fail. if it causes problems for you, feel free
-    // to remove the ctrl+click tests.
-    await click("#quick-access-review-queue li.reviewable.reviewed a", {
-      ctrlKey: true,
-    });
-    assert.strictEqual(
-      currentURL(),
-      "/review/17",
-      "ctrl-clicking on an item doesn't navigate to a new page"
-    );
-    assert.ok(
-      exists(".user-menu"),
-      "ctrl-clicking on an item doesn't close the menu"
-    );
   });
 
   test("tabs have title attributes", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
index d5ca5e5197..a75d7721a1 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE!!!
 // Update it by running `rake javascript:update_constants`
 
+
 export const NOTIFICATION_TYPES = {
   mentioned: 1,
   replied: 2,
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index 6bb987c852..c2b0c40dd8 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -13,6 +13,7 @@ import {
   inCodeBlock,
   initializeDefaultHomepage,
   mergeSortedLists,
+  modKeysPressed,
   setCaretPosition,
   setDefaultHomepage,
   slugify,
@@ -25,6 +26,9 @@ import {
   chromeTest,
   discourseModule,
 } from "discourse/tests/helpers/qunit-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { click, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
 
 discourseModule("Unit | Utilities", function () {
   test("escapeExpression", function (assert) {
@@ -328,6 +332,54 @@ discourseModule("Unit | Utilities", function () {
       "it correctly merges lists that share common items"
     );
   });
+
+  discourseModule("modKeysPressed", function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("returns an array of modifier keys pressed during keyboard or mouse event", async function (assert) {
+      let i = 0;
+
+      this.handleClick = (event) => {
+        if (i === 0) {
+          assert.deepEqual(modKeysPressed(event), []);
+        } else if (i === 1) {
+          assert.deepEqual(modKeysPressed(event), ["alt"]);
+        } else if (i === 2) {
+          assert.deepEqual(modKeysPressed(event), ["shift"]);
+        } else if (i === 3) {
+          assert.deepEqual(modKeysPressed(event), ["meta"]);
+        } else if (i === 4) {
+          assert.deepEqual(modKeysPressed(event), ["ctrl"]);
+        } else if (i === 5) {
+          assert.deepEqual(modKeysPressed(event), [
+            "alt",
+            "shift",
+            "meta",
+            "ctrl",
+          ]);
+        }
+      };
+
+      await render(hbs`<button id="btn" {{on "click" this.handleClick}} />`);
+
+      await click("#btn");
+      i++;
+      await click("#btn", { altKey: true });
+      i++;
+      await click("#btn", { shiftKey: true });
+      i++;
+      await click("#btn", { metaKey: true });
+      i++;
+      await click("#btn", { ctrlKey: true });
+      i++;
+      await click("#btn", {
+        altKey: true,
+        shiftKey: true,
+        metaKey: true,
+        ctrlKey: true,
+      });
+    });
+  });
 });
 
 discourseModule("Unit | Utilities | clipboard", function (hooks) {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
index ddad59ca69..f3b1ffe139 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,4 @@
-<div {{action "onSelectedNameClick"}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
+<div {{on "click" this.onSelectedNameClick}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
   <div class="body">
     {{this.badge}}
     {{d-icon "times"}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
index 8e21aee4b5..c3a26a8e0e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
@@ -1,4 +1,4 @@
-<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{action this.selectKit.deselect this.item}} class="btn btn-default selected-choice {{this.extraClass}}">
+<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{on "click" (fn this.selectKit.deselect this.item)}} class="btn btn-default selected-choice {{this.extraClass}}">
   {{d-icon "times"}}
   {{#if (has-block)}}
     {{yield}}
diff --git a/app/assets/javascripts/wizard/addon/components/styling-preview.js b/app/assets/javascripts/wizard/addon/components/styling-preview.js
index cfe53afb0c..e44bc99846 100644
--- a/app/assets/javascripts/wizard/addon/components/styling-preview.js
+++ b/app/assets/javascripts/wizard/addon/components/styling-preview.js
@@ -205,12 +205,14 @@ export default createPreviewComponent(628, 322, {
   },
 
   @action
-  setPreviewHomepage() {
+  setPreviewHomepage(event) {
+    event?.preventDefault();
     this.set("previewTopic", false);
   },
 
   @action
-  setPreviewTopic() {
+  setPreviewTopic(event) {
+    event?.preventDefault();
     this.set("previewTopic", true);
   },
 });
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-step.js b/app/assets/javascripts/wizard/addon/components/wizard-step.js
index 4e77594618..64999e25b0 100644
--- a/app/assets/javascripts/wizard/addon/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/addon/components/wizard-step.js
@@ -134,12 +134,14 @@ export default Component.extend({
   },
 
   @action
-  quit() {
+  quit(event) {
+    event?.preventDefault();
     this.router.transitionTo("discovery.latest");
   },
 
   @action
-  exitEarly() {
+  exitEarly(event) {
+    event?.preventDefault();
     const step = this.step;
     step.validate();
 
@@ -156,7 +158,9 @@ export default Component.extend({
   },
 
   @action
-  backStep() {
+  backStep(event) {
+    event?.preventDefault();
+
     if (this.saving) {
       return;
     }
@@ -165,7 +169,9 @@ export default Component.extend({
   },
 
   @action
-  nextStep() {
+  nextStep(event) {
+    event?.preventDefault();
+
     if (this.saving) {
       return;
     }
diff --git a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
index 4d49d4febd..3c9b1736c9 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
@@ -9,10 +9,10 @@
 </div>
 
 <div class="preview-nav">
-  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{action "setPreviewTopic"}}>
+  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{on "click" this.setPreviewTopic}}>
     {{i18n "wizard.previews.topic_preview"}}
   </a>
-  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{action "setPreviewHomepage"}}>
+  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{on "click" this.setPreviewHomepage}}>
     {{i18n "wizard.previews.homepage_preview"}}
   </a>
 </div>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
index 96fd2e985d..3026476686 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
@@ -49,31 +49,31 @@
   <div class="wizard-container__buttons">
 
     {{#if this.showNextButton}}
-      <button {{action "nextStep"}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
+      <button {{on "click" this.nextStep}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
         {{i18n this.nextButtonLabel}}
       </button>
     {{/if}}
 
     {{#if this.showFinishButton}}
-      <button {{action "exitEarly"}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
+      <button {{on "click" this.exitEarly}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
         {{i18n "wizard.jump_in"}}
       </button>
     {{/if}}
 
     {{#if this.showJumpInButton}}
-      <button {{action "quit"}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
+      <button {{on "click" this.quit}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
         {{i18n this.jumpInButtonLabel}}
       </button>
     {{/if}}
   </div>
 
   <div class="wizard-container__step-progress">
-    <a href {{action "backStep"}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
+    <a href {{on "click" this.backStep}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
 
     <span class="wizard-container__step-text">{{bound-i18n "wizard.step-text"}}</span>
     <span class="wizard-container__step-count">{{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}</span>
 
-    <a href {{action "nextStep"}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
+    <a href {{on "click" this.nextStep}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
 
   </div>
 
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index a09212713c..5b473f6e5e 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -210,7 +210,7 @@ task 'javascript:update_constants' => :environment do
 
   emoji_buttons = groups_json.map do |group|
     <<~HTML
-			<button type="button" data-section="#{group["name"]}" {{action this.onCategorySelection "#{group["name"]}"}} class="btn btn-default category-button emoji">
+			<button type="button" data-section="#{group["name"]}" {{on "click" (fn this.onCategorySelection "#{group["name"]}")}} class="btn btn-default category-button emoji">
 				 {{replace-emoji ":#{group["tabicon"]}:"}}
 			</button>
     HTML
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 400489e895..426f2ab4d6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -1,7 +1,7 @@
 /* global Pikaday:true */
 import computed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { Promise } from "rsvp";
@@ -306,6 +306,12 @@ export default Component.extend({
     return dateTime.isValid() ? dateTime.format("LLLL") : emptyText;
   },
 
+  @action
+  updateFormat(format, event) {
+    event?.preventDefault();
+    this.format = format;
+  },
+
   actions: {
     setTime(event) {
       this._setTimeIfValid(event.target.value, "time");
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 390e4ece95..d18cf61fab 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -115,7 +115,7 @@
           <ul class="formats">
             {{#each this.previewedFormats as |previewedFormat|}}
               <li class="format">
-                <a class="moment-format" href {{action (mut this.format) previewedFormat.format}}>
+                <a class="moment-format" href {{on "click" (fn this.updateFormat previewedFormat.format)}}>
                   {{previewedFormat.format}}
                 </a>
                 <span class="previewed-format">
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
index 04a51d762e..5b4f34f446 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
@@ -398,4 +398,10 @@ export default Controller.extend(ModalFunctionality, {
   removeOption(option) {
     this.pollOptions.removeObject(option);
   },
+
+  @action
+  updatePollType(pollType, event) {
+    event?.preventDefault();
+    this.pollType = pollType;
+  },
 });
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 6bfd6cb1ba..e2f24afa90 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,15 +1,15 @@
 <DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
   <div class="input-group poll-type">
-    <a href {{action (mut this.pollType) "regular"}} class="poll-type-value {{if this.isRegular "active"}}">
+    <a href {{on "click" (fn this.updatePollType "regular")}} class="poll-type-value {{if this.isRegular "active"}}">
       {{i18n "poll.ui_builder.poll_type.regular"}}
     </a>
 
-    <a href {{action (mut this.pollType) "multiple"}} class="poll-type-value {{if this.isMultiple "active"}}">
+    <a href {{on "click" (fn this.updatePollType "multiple")}} class="poll-type-value {{if this.isMultiple "active"}}">
       {{i18n "poll.ui_builder.poll_type.multiple"}}
     </a>
 
     {{#if this.showNumber}}
-      <a href {{action (mut this.pollType) "number"}} class="poll-type-value {{if this.isNumber "active"}}">
+      <a href {{on "click" (fn this.updatePollType "number")}} class="poll-type-value {{if this.isNumber "active"}}">
         {{i18n "poll.ui_builder.poll_type.number"}}
       </a>
     {{/if}}

From e8b1021cb6925b4469dad86d6c0b2cc21058c458 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 5 Oct 2022 13:19:04 +0100
Subject: [PATCH 054/332] DEV: Add faraday and faraday-retry as explicit
 dependencies (#18473)

`Faraday` is very commonly used in official and third-party plugins, and we will likely be increasing our use of it in core. This commit adds it as a direct dependency and adds the official faraday-retry gem which is very commonly used (e.g. by Octokit).
---
 Gemfile      | 3 +++
 Gemfile.lock | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index e29c6737be..baca43e5b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -272,6 +272,9 @@ gem 'maxminddb'
 
 gem 'rails_failover', require: false
 
+gem 'faraday'
+gem 'faraday-retry'
+
 # workaround for faraday-net_http, see
 # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765
 gem 'net-http'
diff --git a/Gemfile.lock b/Gemfile.lock
index 65aa42ae53..7347c11499 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -152,6 +152,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.0)
+    faraday-retry (2.0.0)
+      faraday (~> 2.0)
     fast_blank (1.0.1)
     fast_xs (0.8.0)
     fastimage (2.2.6)
@@ -551,6 +553,8 @@ DEPENDENCIES
   fabrication
   faker (~> 2.16)
   fakeweb
+  faraday
+  faraday-retry
   fast_blank
   fast_xs
   fastimage
@@ -645,4 +649,4 @@ DEPENDENCIES
   yaml-lint
 
 BUNDLED WITH
-   2.3.18
+   2.3.22

From fbb9f983b123526251cb8c93f163957a6e3f5284 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 5 Oct 2022 15:16:10 +0200
Subject: [PATCH 055/332] DEV: removes legacy code (#18486)

No methods from https://api.rubyonrails.org/classes/ActionView/Helpers/SanitizeHelper.html seem to be used in models/topic.rb
---
 app/models/topic.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 50eda089fd..924b38f88c 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -3,7 +3,6 @@
 class Topic < ActiveRecord::Base
   class UserExists < StandardError; end
   class NotAllowed < StandardError; end
-  include ActionView::Helpers::SanitizeHelper
   include RateLimiter::OnCreateRecord
   include HasCustomFields
   include Trashable

From e812e10c3b3dc0eb201340efea0b978dd319aa42 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Wed, 5 Oct 2022 09:32:10 -0400
Subject: [PATCH 056/332] Update translations (#18470)

---
 config/locales/client.ar.yml    |  4 ++++
 config/locales/client.be.yml    |  3 +++
 config/locales/client.bg.yml    |  4 ++++
 config/locales/client.bs_BA.yml |  4 ++++
 config/locales/client.ca.yml    |  4 ++++
 config/locales/client.cs.yml    |  1 +
 config/locales/client.da.yml    |  4 ++++
 config/locales/client.de.yml    |  8 ++++++++
 config/locales/client.el.yml    |  4 ++++
 config/locales/client.es.yml    |  4 ++++
 config/locales/client.et.yml    |  4 ++++
 config/locales/client.fa_IR.yml |  5 +++++
 config/locales/client.fi.yml    |  4 ++++
 config/locales/client.fr.yml    |  6 ++++++
 config/locales/client.gl.yml    |  4 ++++
 config/locales/client.he.yml    | 18 +++++++++++++++++
 config/locales/client.hr.yml    |  4 ++++
 config/locales/client.hu.yml    |  4 ++++
 config/locales/client.hy.yml    |  4 ++++
 config/locales/client.id.yml    |  3 +++
 config/locales/client.it.yml    |  5 +++++
 config/locales/client.ja.yml    |  4 ++++
 config/locales/client.ko.yml    |  4 ++++
 config/locales/client.lt.yml    |  4 ++++
 config/locales/client.lv.yml    |  4 ++++
 config/locales/client.nb_NO.yml |  4 ++++
 config/locales/client.nl.yml    |  4 ++++
 config/locales/client.pl_PL.yml |  4 ++++
 config/locales/client.pt.yml    |  4 ++++
 config/locales/client.pt_BR.yml | 35 +++++++++++++++++++++++++++++++++
 config/locales/client.ro.yml    |  4 ++++
 config/locales/client.ru.yml    | 14 +++++++++++--
 config/locales/client.sk.yml    |  1 +
 config/locales/client.sl.yml    |  4 ++++
 config/locales/client.sq.yml    |  1 +
 config/locales/client.sv.yml    | 13 ++++++++++++
 config/locales/client.sw.yml    |  1 +
 config/locales/client.th.yml    |  4 ++++
 config/locales/client.tr_TR.yml |  4 ++++
 config/locales/client.uk.yml    |  4 ++++
 config/locales/client.ur.yml    |  4 ++++
 config/locales/client.vi.yml    |  4 ++++
 config/locales/client.zh_CN.yml | 10 ++++++++++
 config/locales/client.zh_TW.yml |  4 ++++
 config/locales/server.ar.yml    |  5 -----
 config/locales/server.da.yml    |  2 --
 config/locales/server.de.yml    | 18 ++++++++++++-----
 config/locales/server.el.yml    |  1 -
 config/locales/server.es.yml    |  5 -----
 config/locales/server.fa_IR.yml |  5 +++++
 config/locales/server.fi.yml    |  5 -----
 config/locales/server.fr.yml    |  6 +-----
 config/locales/server.gl.yml    |  5 -----
 config/locales/server.he.yml    | 23 +++++++++++++++++-----
 config/locales/server.hr.yml    |  1 -
 config/locales/server.it.yml    |  6 +-----
 config/locales/server.ja.yml    |  5 -----
 config/locales/server.ko.yml    |  5 -----
 config/locales/server.lt.yml    |  1 -
 config/locales/server.nl.yml    |  3 ---
 config/locales/server.pl_PL.yml |  5 -----
 config/locales/server.pt.yml    |  2 --
 config/locales/server.pt_BR.yml |  5 -----
 config/locales/server.ru.yml    | 18 ++++++++++++-----
 config/locales/server.sv.yml    |  7 ++-----
 config/locales/server.tr_TR.yml |  2 --
 config/locales/server.uk.yml    |  5 -----
 config/locales/server.ur.yml    |  2 --
 config/locales/server.zh_CN.yml | 12 ++++++-----
 69 files changed, 298 insertions(+), 96 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 7348ebaa1e..e133872fca 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -1369,6 +1369,7 @@ ar:
         move_to_archive: "أرشفة"
         failed_to_move: "فشل نقل الرسائل المحدَّدة (قد تكون شبكتك متوقفة)"
         tags: "الوسوم"
+        all_tags: "كل الوسوم"
         warnings: "تحذيرات رسمية"
         read_more_in_group: "هل ترغب في قراءة المزيد؟ تصفح الرسائل الأخرى في %{groupLink}."
         read_more: "هل ترغب في قراءة المزيد؟ تصفح الرسائل الأخرى في <a href='%{basePath}/u/%{username}/messages'>الرسائل الشخصية</a>."
@@ -4329,6 +4330,9 @@ ar:
               content: "المستخدمون"
             my_posts:
               content: "منشوراتي"
+            review:
+              content: "المراجعة"
+              title: "المراجعة"
   admin_js:
     type_to_filter: "اكتب للتصفية..."
     admin:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 875f64ca22..6b70c28a2b 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -1381,6 +1381,9 @@ be:
               content: "карыстальнікаў"
             my_posts:
               content: "мае паведамленні"
+            review:
+              content: "Патрабуе перагляду"
+              title: "патрабуе перагляду"
   admin_js:
     admin:
       moderator: "Мадэратар"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index dfd8828f01..16a818da9b 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -1133,6 +1133,7 @@ bg:
         move_to_archive: "Архив"
         failed_to_move: "Грешка при преместването на съобщенията (може би интернета ви спря?)"
         tags: "Етикети"
+        all_tags: "Всички тагове"
         warnings: "Официални предупреждения"
         read_more_in_group: "Искате ли да прочетете повече? Разгледайте други съобщения в %{groupLink}."
         read_more: "Искате ли да прочетете повече? Разгледайте други съобщения в <a href='%{basePath}/u/%{username}/messages'>лични съобщения</a>."
@@ -3036,6 +3037,9 @@ bg:
               content: "Потребители"
             my_posts:
               content: "Моите публикации"
+            review:
+              content: "Преглед"
+              title: "преглед"
   admin_js:
     type_to_filter: "филтрирай..."
     admin:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 8e46e299a1..faa364b12e 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -1043,6 +1043,7 @@ bs_BA:
         move_to_archive: "Arhiva"
         failed_to_move: "Greška u pomjeranju označenih poruka (vjerovatni mrežni problemi)"
         tags: "Oznake"
+        all_tags: "Sve oznake"
       preferences_nav:
         account: "Račun"
         security: "Security"
@@ -3118,6 +3119,9 @@ bs_BA:
               content: "Users"
             my_posts:
               content: "Moje objave"
+            review:
+              content: "Pregled"
+              title: "pregled"
   admin_js:
     type_to_filter: "kucaj da sortiraš..."
     admin:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index c7c06a26b0..2cae2caf73 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -1009,6 +1009,7 @@ ca:
         move_to_archive: "Arxiva"
         failed_to_move: "Error en moure els missatges seleccionats (potser ha caigut la xarxa)."
         tags: "Etiquetes"
+        all_tags: "Totes les etiquetes"
       preferences_nav:
         account: "Compte"
         security: "Seguretat"
@@ -2936,6 +2937,9 @@ ca:
               content: "Usuaris"
             my_posts:
               content: "Les meves publicacions"
+            review:
+              content: "Revisa"
+              title: "revisa"
   admin_js:
     type_to_filter: "escriu per a filtrar..."
     admin:
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 53c62c66db..c5633763e1 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -1013,6 +1013,7 @@ cs:
         move_to_archive: "Archivovat"
         failed_to_move: "Nepodařilo se přesunout vybrané zprávy (možná vám spadlo připojení)"
         tags: "Štítek"
+        all_tags: "Všechny štítky"
       preferences_nav:
         account: "Účet"
         security: "Zabezpečení"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 51e7c3f1f2..aa6a5cb7f2 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -1150,6 +1150,7 @@ da:
         move_to_archive: "Arkiv"
         failed_to_move: "Kunne ikke flytte valgte beskeder (måske er dit netværket nede)"
         tags: "Mærker"
+        all_tags: "Alle Mærker"
         warnings: "Officielle Advarsler"
       preferences_nav:
         account: "Konto"
@@ -3600,6 +3601,9 @@ da:
               content: "Brugere"
             my_posts:
               content: "Mine indlæg"
+            review:
+              content: "Anmeldelse"
+              title: "anmeldelse"
   admin_js:
     type_to_filter: "skriv for at filtrere…"
     admin:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index b3bf810df4..7d71cfe274 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -1198,6 +1198,7 @@ de:
         move_to_archive: "Archivieren"
         failed_to_move: "Die ausgewählten Nachrichten konnten nicht verschoben werden. Vielleicht gibt es ein Netzwerkproblem."
         tags: "Schlagwörter"
+        all_tags: "Alle Schlagwörter"
         warnings: "Offizielle Warnungen"
         read_more_in_group: "Möchtest Du mehr lesen? Entdecke andere Nachrichten in %{groupLink}."
         read_more: "Möchtest Du mehr lesen? Durchsuche andere Nachrichten in <a href='%{basePath}/u/%{username}/messages'>persönliche Nachrichten</a>."
@@ -2077,6 +2078,9 @@ de:
         body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       slow_mode:
         error: "Dieses Thema befindet sich im langsamen Modus. Du hast bereits kürzlich gepostet. Du kannst erneut in %{timeLeft} posten."
+      user_not_seen_in_a_while:
+        single: "Die Person, der du eine Nachricht sendest, <b>%{usernames}</b>, wurde hier schon lange nicht mehr gesehen - %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhält. Du solltest nach alternativen Methoden suchen, um %{usernames}zu kontaktieren."
+        multiple: "Die folgenden Personen, die du anschreibst: <b>%{usernames}</b>, wurden hier schon sehr lange nicht mehr gesehen - %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhalten. Du solltest nach alternativen Methoden suchen, um sie zu kontaktieren."
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
       composer_actions:
         reply: Antworten
@@ -3868,6 +3872,10 @@ de:
               draft_count:
                 one: "%{count} Entwurf"
                 other: "%{count} Entwürfe"
+            review:
+              content: "Überprüfen"
+              title: "überprüfen"
+              pending_count: "%{count} ausstehend"
     welcome_topic_banner:
       title: "Erstelle dein Willkommensthema"
       description: 'Dein Willkommensthema ist das erste, was Neuankömmlinge lesen werden. Sieh es als deinen einseitigen "Elevator Pitch" oder "Mission Statement" an.'
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index a9a0f8685b..fb81c20d34 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -1011,6 +1011,7 @@ el:
         move_to_archive: "Αρχειοθέτηση"
         failed_to_move: "Αποτυχία μετακίνησης των επιλεγμένων μηνυμάτων (πιθανόν δεν υπάρχει σύνδεση στο δίκτυο)"
         tags: "Ετικέτες"
+        all_tags: "Όλες οι Ετικέτες"
       preferences_nav:
         account: "Λογαριασμός"
         security: "Ασφάλεια"
@@ -3108,6 +3109,9 @@ el:
               content: "Χρήστες"
             my_posts:
               content: "Οι αναρτήσεις μου"
+            review:
+              content: "Ανασκόπηση"
+              title: "ανασκόπηση"
   admin_js:
     type_to_filter: "γράψε εδώ για φιλτράρισμα..."
     admin:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 50925a1c04..c9a916e0ee 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -1198,6 +1198,7 @@ es:
         move_to_archive: "Archivar"
         failed_to_move: "No se han podido mover los mensajes seleccionados (podrías estar teniendo problemas de conexión)"
         tags: "Etiquetas"
+        all_tags: "Todas las etiquetas"
         warnings: "Advertencias oficiales"
         read_more_in_group: "¿Quieres leer más? Consulta otros mensajes de %{groupLink}."
         read_more: "¿Quieres seguir leyendo? Echa un vistazo a otros mensajes en tus <a href='%{basePath}/u/%{username}/messages'>mensajes personales</a>."
@@ -3831,6 +3832,9 @@ es:
               draft_count:
                 one: "%{count} borrador"
                 other: "%{count} borradores"
+            review:
+              content: "Revisión"
+              title: "revisión"
     welcome_topic_banner:
       title: "Crea tu tema de bienvenida"
       description: 'Tu tema de bienvenid es lo primero que la gente nueva leerá al llegar. Piensa en este párrafo como si fuera un "discurso breve" o una "declaración de motivos"'
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 5cdfbe9a12..b97bc737e5 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -873,6 +873,7 @@ et:
         move_to_archive: "Arhiiv"
         failed_to_move: "Valitud sõnumite teisaldamine ebaõnnestus (võrguühendus võib olla häiritud)"
         tags: "Sildid"
+        all_tags: "Kõik sildid"
       preferences_nav:
         account: "Konto"
         security: "Turve"
@@ -2578,6 +2579,9 @@ et:
               content: "Kasutajad"
             my_posts:
               content: "Minu"
+            review:
+              content: "Vaata üle"
+              title: "vaata üle"
   admin_js:
     type_to_filter: "filtreerimiseks trüki..."
     admin:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 7034f30563..e30c29a203 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -1117,6 +1117,7 @@ fa_IR:
         move_to_archive: "بایگانی"
         failed_to_move: "انتقال پیام‌های انتخاب شده با اشکال مواجه شد (شاید اتصال شما در دسترس نیست)"
         tags: "برچسب‌ها"
+        all_tags: "تمام برچسب‌ها"
         warnings: "هشدارهای رسمی"
       preferences_nav:
         account: "حساب کاربری"
@@ -3351,6 +3352,10 @@ fa_IR:
               draft_count:
                 one: "%{count} پیش‌نویس"
                 other: "%{count} پیش‌نویس"
+            review:
+              content: "بازنگری"
+              title: "بازنگری"
+              pending_count: "%{count} در انتظار"
     until: "تا وقتی که:"
   admin_js:
     type_to_filter: "بنویسید تا فیلتر کنید..."
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 1d5f886707..074728fcd4 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -1130,6 +1130,7 @@ fi:
         move_to_archive: "Arkisto"
         failed_to_move: "Valittujen viestien siirto epäonnistui (vika saattaa olla verkkoyhteydessäsi)"
         tags: "Tunnisteet"
+        all_tags: "Kaikki tunnisteet"
         warnings: "Viralliset varoitukset"
       preferences_nav:
         account: "Tili"
@@ -3505,6 +3506,9 @@ fi:
               content: "Käyttäjät"
             my_posts:
               content: "Viestini"
+            review:
+              content: "Käsittele"
+              title: "käsittele"
   admin_js:
     type_to_filter: "kirjoita suodattaaksesi..."
     admin:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 471ee8cfff..8951186479 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -1198,6 +1198,7 @@ fr:
         move_to_archive: "Archiver"
         failed_to_move: "Impossible de déplacer les messages sélectionnés (votre connexion est peut-être en panne)"
         tags: "Étiquettes"
+        all_tags: "Toutes les étiquettes"
         warnings: "Avertissements officiels"
         read_more_in_group: "Envie d'en lire encore&nbsp;? Consultez d'autres messages dans %{groupLink}."
         read_more: "Envie d'en lire encore&nbsp;? Consultez d'autres messages dans vos <a href='%{basePath}/u/%{username}/messages'>messages personnels</a>."
@@ -1970,6 +1971,8 @@ fr:
       similar_topics: "Votre sujet est similaire à…"
       drafts_offline: "brouillons hors ligne"
       edit_conflict: "conflit de modification"
+      esc: "Échap"
+      esc_label: "Cliquer ou presser la touche Échap pour fermer"
       group_mentioned_limit:
         one: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe comprend plus de membres que le nombre limite de mentions de %{count} utilisateur configuré par l'administrateur. Personne ne sera notifié."
         other: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe comprend plus de membres que le nombre limite de mentions de %{count} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
@@ -3826,6 +3829,9 @@ fr:
               draft_count:
                 one: "%{count} brouillon"
                 other: "%{count} brouillons"
+            review:
+              content: "À examiner"
+              title: "à examiner"
     until: "Jusqu'à :"
   admin_js:
     type_to_filter: "commencez votre saisie pour filtrer…"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 59f447e8c8..c7d51de282 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -1084,6 +1084,7 @@ gl:
         move_to_archive: "Arquivo"
         failed_to_move: "Produciuse un fallo ao mover as mensaxes seleccionadas (quizais a rede está caída)"
         tags: "Etiquetas"
+        all_tags: "Todas as etiquetas"
       preferences_nav:
         account: "Conta"
         security: "Seguranza"
@@ -3396,6 +3397,9 @@ gl:
               content: "Usuarios"
             my_posts:
               content: "As miñas publicacións"
+            review:
+              content: "Revisar"
+              title: "revisar"
   admin_js:
     type_to_filter: "escriba para filtrar..."
     admin:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 1c2c5a41dc..f2f17a997b 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -1316,6 +1316,7 @@ he:
         move_to_archive: "ארכיון"
         failed_to_move: "העברת ההודעות שנבחרו נכשלה (אולי אין תקשורת)"
         tags: "תגיות"
+        all_tags: "כל התגיות"
         warnings: "אזהרות רשמיות"
         read_more_in_group: "מעניין אותך לקרוא עוד? אפשר לעיין בהודעות אחרות ב־%{groupLink}."
         read_more: "מעניין אותך לקרוא עוד? אפשר לעיין בהודעות אחרות ב<a href='%{basePath}/u/%{username}/messages'>הודעות הפרטיות</a>."
@@ -1828,6 +1829,8 @@ he:
       enabled: "אתר זה נמצא במצב קריאה בלבד. אנא המשיכו לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע אינם מאופשרים."
       login_disabled: "הכניסה מושבתת בזמן שהאתר במצב קריאה בלבד."
       logout_disabled: "היציאה מושבתת בזמן שהאתר במצב של קריאה בלבד."
+    staff_writes_only_mode:
+      enabled: "אתר זה נמצא במצב סגל בלבד. אפשר להמשיך לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע מוגבלות לחברי הסגל בלבד."
     too_few_topics_and_posts_notice_MF: >-
       הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{currentPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
     too_few_topics_notice_MF: >-
@@ -1861,6 +1864,7 @@ he:
       hide_forever: "לא תודה"
       hidden_for_session: "סבבה, השאלה תופיע מחר. תמיד ניתן להשתמש ב‚כניסה’ גם כדי ליצור חשבון."
       intro: "שלום! נראה שאתם נהנים מהדיון, אבל לא נרשמתם לחשבון עדיין."
+      value_prop: "נמאס לך לעיין באותם הפוסטים? יצירת חשבון תאפשר לך לחזור בדיוק לנקודה בה עזבת בפעם האחרונה. חשבון מאפשר לך גם לקבל התראות על תגובות חדשות, לשמור סימניות ולהשתמש בלייקים כדי להודות לאחרים. כולנו יכולים לפעול ביחד כדי שהקהילה הזאת תהיה מצוינת. :heart:"
     summary:
       enabled_description: "אתם צופים בסיכום נושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה."
       description:
@@ -2128,6 +2132,8 @@ he:
       similar_topics: "הנושא שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
       edit_conflict: "עריכת סתירה"
+      esc: "esc"
+      esc_label: "יש ללחוץ עם העכבר או על Esc כדי להתעלם"
       group_mentioned_limit:
         one: "<b>זהירות!</b> ציינת את <a href='%{group_link}'>%{group}</a>, אך בקבוצה זו יש יותר חברים מההגבלה שהוגדרה על ידי הנהלת המערכת של עד משתמש %{count}. אף אחד לא יקבל הודעה."
         two: "<b>זהירות!</b> ציינת את <a href='%{group_link}'>%{group}</a>, אך בקבוצה זו יש יותר חברים מההגבלה שהוגדרה על ידי הנהלת המערכת של עד %{count} משתמשים. אף אחד לא יקבל הודעה."
@@ -2244,6 +2250,9 @@ he:
         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: השב
@@ -2562,6 +2571,11 @@ he:
         bookmarks: "סימניות"
         review_queue: "תור סקירה"
         other_notifications: "התראות אחרות"
+        other_notifications_with_unread:
+          one: "התראות אחרות - התראה %{count} שלא נקראה"
+          two: "התראות אחרות - %{count} התראות שלא נקראו"
+          many: "התראות אחרות - %{count} התראות שלא נקראו"
+          other: "התראות אחרות - %{count} התראות שלא נקראו"
         profile: "פרופיל"
       reviewable:
         view_all: "הצגת כל הפריטים לסקירה"
@@ -4184,6 +4198,10 @@ he:
                 two: "%{count} טיוטות"
                 many: "%{count} טיוטות"
                 other: "%{count} טיוטות"
+            review:
+              content: "סקירה"
+              title: "סקירה"
+              pending_count: "%{count} ממתינים"
     welcome_topic_banner:
       title: "כאן ניתן ליצור את נושא קבלת הפנים שלך"
       description: 'נושא קבלת הפנים שלך הוא הדבר הראשון שמצטרפים חדשים יקראו. אפשר לחשוב על זה כעל „נאום מעלית” או „הצהרת כוונות” במשפט אחד'
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index 198bf4681e..b2d1feb868 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -1248,6 +1248,7 @@ hr:
         move_to_archive: "Arhiva"
         failed_to_move: "Neuspješno premještanje odabranih poruka (možda vam je mreža nedostupna)"
         tags: "Oznake"
+        all_tags: "Sve oznake"
         warnings: "Službena upozorenja"
         read_more_in_group: "Želite li pročitati više? Pregledajte ostale poruke u %{groupLink}."
         read_more: "Želite li pročitati više? Pregledajte ostale poruke u <a href='%{basePath}/u/%{username}/messages'>osobnim porukama</a>."
@@ -3939,6 +3940,9 @@ hr:
               content: "Korisnika"
             my_posts:
               content: "Moje objave"
+            review:
+              content: "Osvrt"
+              title: "osvrt"
   admin_js:
     type_to_filter: "upiši za filtriranje"
     admin:
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d81350ca85..38275b9bda 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -1192,6 +1192,7 @@ hu:
         move_to_archive: "Archiválás"
         failed_to_move: "A kijelölt üzenetek áthelyezése nem sikerült (lehet, hogy nincs hálózat)"
         tags: "Címkék"
+        all_tags: "Összes címke"
         warnings: "Hivatalos figyelmeztetések"
         read_more_in_group: "Szeretne többet olvasni? Nézzen meg más témákat itt: %{groupLink}."
         read_more: "Szeretne többet olvasni? Böngésszen a többi üzenet között a <a href='%{basePath}/u/%{username}/messages'>személyes üzenetekben</a>."
@@ -3442,6 +3443,9 @@ hu:
               content: "Felhasználók"
             my_posts:
               content: "Saját bejegyzéseim"
+            review:
+              content: "Áttekintés"
+              title: "áttekintés"
     welcome_topic_banner:
       title: "Hozzon létre üdvözlő témát"
       description: 'Az üdvözlő téma az első, amit az újonnan érkezők olvasnak. Gondoljon rá úgy mint egy bekezdésnyi bemutatkozóra vagy „küldetésnyilatkozatra”.'
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index e5d2a34e46..477505b7ed 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -925,6 +925,7 @@ hy:
         move_to_archive: "Արխիվացնել"
         failed_to_move: "Չհաջողվեց տեղափոխել ընտրված հաղորդագրությունները (հնարավոր է՝ համացանցի հետ կապված խնդիր կա)"
         tags: "Թեգեր"
+        all_tags: "Բոլոր Թեգերը"
       preferences_nav:
         account: "Հաշիվ"
         security: "Անվտանգություն"
@@ -2919,6 +2920,9 @@ hy:
               content: "Օգտատերեր"
             my_posts:
               content: "Իմ Գրառումները"
+            review:
+              content: "Վերանայում"
+              title: "վերանայում"
   admin_js:
     type_to_filter: "գրեք ֆիլտրելու համար..."
     admin:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 03c79e3808..bba1c9703d 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -1829,6 +1829,9 @@ id:
               content: "Grup"
             users:
               content: "Pengguna"
+            review:
+              content: "Ulasan"
+              title: "ulasan"
   admin_js:
     type_to_filter: "ketik untuk memfilter..."
     admin:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 0dc84bcd40..69514e68b3 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -1197,6 +1197,7 @@ it:
         move_to_archive: "Archivia"
         failed_to_move: "Errore nello spostare i messaggi selezionati (forse la tua connessione non è attiva)"
         tags: "Etichette"
+        all_tags: "Tutte le Etichette"
         warnings: "Avvertimenti ufficiali"
         read_more_in_group: "Vuoi continuare a leggere? Sfoglia altri messaggi in %{groupLink}."
         read_more: "Vuoi saperne di più? Leggi altri messaggi in <a href='%{basePath}/u/%{username}/messages'>messaggi personali</a>."
@@ -3815,6 +3816,10 @@ it:
               draft_count:
                 one: "%{count} bozza"
                 other: "%{count} bozze"
+            review:
+              content: "Revisiona"
+              title: "revisiona"
+              pending_count: "%{count} in attesa"
     welcome_topic_banner:
       title: "Crea il tuo argomento di benvenuto"
       button_title: "Inizia a modificare"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 56d1991d24..c5cfc6a957 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -1105,6 +1105,7 @@ ja:
         move_to_archive: "アーカイブ"
         failed_to_move: "選択されたメッセージを移動できませんでした (ネットワークがダウンしている可能性があります)"
         tags: "タグ"
+        all_tags: "すべてのタグ"
         warnings: "運営スタッフからの警告"
         read_more_in_group: "もっと読みますか？%{groupLink} での他のメッセージを閲覧できます。"
         read_more: "もっと読みますか？<a href='%{basePath}/u/%{username}/messages'>個人メッセージ</a>で他のメッセージを閲覧できます。"
@@ -3442,6 +3443,9 @@ ja:
               content: "自分の投稿"
               draft_count:
                 other: "%{count} 下書き"
+            review:
+              content: "レビュー"
+              title: "レビュー"
   admin_js:
     type_to_filter: "フィルタの種類..."
     admin:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index c5eddf30b1..53ae3209fd 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -1106,6 +1106,7 @@ ko:
         move_to_archive: "보관"
         failed_to_move: "선택한 메시지를 이동하지 못했습니다(네트워크가 다운되었을 수 있음)"
         tags: "태그"
+        all_tags: "모든 태그"
         warnings: "공식 경고"
         read_more_in_group: "더 읽고 싶으신가요? %{groupLink}에서 다른 메시지를 찾아보세요."
       preferences_nav:
@@ -3505,6 +3506,9 @@ ko:
               content: "내 글"
               draft_count:
                 other: "초안 %{count}"
+            review:
+              content: "검토"
+              title: "검토"
   admin_js:
     type_to_filter: "필터링하려면 입력..."
     admin:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 9ce8fe1442..181a56d1e1 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -1153,6 +1153,7 @@ lt:
         move_to_archive: "Archyvuoti"
         failed_to_move: "Įvyko klaida! (patikrinkite interneto ryšį)"
         tags: "Gairės"
+        all_tags: "Visos žymos"
         warnings: "Oficialūs įspėjimai"
         read_more_in_group: "Norite skaityti daugiau? Naršykite kitus pranešimus %{groupLink}."
       preferences_nav:
@@ -3553,6 +3554,9 @@ lt:
               content: "Vartotojai"
             my_posts:
               content: "Mano Įrašai"
+            review:
+              content: "Peržiūra"
+              title: "peržiūra"
   admin_js:
     type_to_filter: "įrašyk kažką dėl filtro..."
     admin:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 95222f93a6..c81ba54aed 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -1075,6 +1075,7 @@ lv:
         move_to_archive: "Arhivēt"
         failed_to_move: "Neizdevās pārvietot izvēlētas ziņas (varbūt pazudis pieslēgums internetam)"
         tags: "Birkas"
+        all_tags: "Visi tagi"
         warnings: "Oficiālie brīdinājumi"
       preferences_nav:
         account: "Konts"
@@ -2854,6 +2855,9 @@ lv:
               content: "Lietotāji"
             my_posts:
               content: "Mani ieraksti"
+            review:
+              content: "Pārskats"
+              title: "pārskats"
   admin_js:
     type_to_filter: "ievadiet, lai atlasītu..."
     admin:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 4a822cb4fe..212dd97141 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -1122,6 +1122,7 @@ nb_NO:
         move_to_archive: "Arkiver"
         failed_to_move: "Kunne ikke flytte valgte meldinger (kanskje nettforbindelsen din er nede)"
         tags: "Stikkord"
+        all_tags: "Alle stikkord"
         warnings: "Offisielle advarsler"
       preferences_nav:
         account: "Konto"
@@ -3463,6 +3464,9 @@ nb_NO:
               content: "Brukere"
             my_posts:
               content: "Mine innlegg"
+            review:
+              content: "Gjennomgang"
+              title: "gjennomgang"
   admin_js:
     type_to_filter: "skriv for å filtrere…"
     admin:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 130e176622..d2b7c9c648 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -1128,6 +1128,7 @@ nl:
         move_to_archive: "Archiveren"
         failed_to_move: "Het verplaatsen van geselecteerde berichten is niet gelukt (misschien is uw netwerkverbinding verbroken)"
         tags: "Tags"
+        all_tags: "Alle tags"
         warnings: "Officiële waarschuwingen"
       preferences_nav:
         account: "Account"
@@ -3535,6 +3536,9 @@ nl:
               content: "Gebruikers"
             my_posts:
               content: "Mijn berichten"
+            review:
+              content: "Beoordelen"
+              title: "beoordelen"
   admin_js:
     type_to_filter: "typ om te filteren..."
     admin:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 63088c9ec2..98fd595382 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -1311,6 +1311,7 @@ pl_PL:
         move_to_archive: "Archiwum"
         failed_to_move: "Nie udało się przenieść zaznaczonych wiadomości (prawdopodobnie wystąpił problem z Twoim połączeniem)"
         tags: "Tagi"
+        all_tags: "Wszystkie tagi"
         warnings: "Oficjalne ostrzeżenia"
         read_more_in_group: "Chcesz przeczytać więcej? Przeglądaj inne wiadomości w %{groupLink}."
         read_more: "Chcesz przeczytać więcej? Przeglądaj inne wiadomości w <a href='%{basePath}/u/%{username}/messages'>wiadomościach osobistych</a>."
@@ -4150,6 +4151,9 @@ pl_PL:
                 few: "%{count} szkice"
                 many: "%{count} szkice"
                 other: "%{count} szkice"
+            review:
+              content: "Sprawdź"
+              title: "sprawdź"
     welcome_topic_banner:
       title: "Stwórz swój temat powitalny"
       description: 'Twój temat powitalny jest pierwszą rzeczą, którą przeczytają nowicjusze. Postaraj się w jednym akapicie wyrazić najważniejsze informacje, jakie chcesz przekazać nowym użytkownikom forum.'
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 59358c59e8..ef1d8ccd2f 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -1145,6 +1145,7 @@ pt:
         move_to_archive: "Arquivo"
         failed_to_move: "Falha ao mover as mensagens selecionadas (talvez a sua rede esteja em baixo)"
         tags: "Etiquetas"
+        all_tags: "Todas as Etiquetas"
         warnings: "Avisos Oficiais"
       preferences_nav:
         account: "Conta"
@@ -3472,6 +3473,9 @@ pt:
               content: "Utilizadores"
             my_posts:
               content: "As Minhas publicações"
+            review:
+              content: "Revisão"
+              title: "revisão"
   admin_js:
     type_to_filter: "digite para filtrar..."
     admin:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index a90849d4ca..2d924cd622 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -307,11 +307,13 @@ pt_BR:
         unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico."
     bookmarks:
       created: "Você marcou esta postagem como favorita. %{name}"
+      created_generic: "Você favoritou isso. %{name}"
       create: "Criar favorito"
       edit: "Editar favorito"
       not_bookmarked: "marcar postagem como favorita"
       remove_reminder_keep_bookmark: "Remover lembrete e manter favorito"
       created_with_reminder: "Você marcou esta postagem com um lembrete em %{date}. %{name}"
+      created_with_reminder_generic: "Você marcou isso como lembrete em %{date}. %{name}"
       remove: "Remover favorito"
       delete: "Excluir favorito"
       confirm_delete: "Tem certeza de que deseja excluir este favorito? O lembrete também será excluído."
@@ -322,7 +324,11 @@ pt_BR:
       list_permission_denied: "Você não tem permissão para visualizar os favoritos deste usuário(a)."
       no_user_bookmarks: "Você não tem postagens favoritas. Os favoritos permitem que você consulte rapidamente postagens específicas."
       auto_delete_preference:
+        label: "Após ser notificado"
+        never: "Manter Marcador"
         when_reminder_sent: "Excluir favorito"
+        on_owner_reply: "Excluir marcador, após responder"
+        clear_reminder: "Manter marcador e limpar lembretes"
       search_placeholder: "Pesquisar os favoritos por nome, título do tópico ou conteúdo da postagem"
       search: "Pesquisar"
       reminders:
@@ -728,6 +734,7 @@ pt_BR:
             allow_unknown_sender_topic_replies: "Permita que remetentes desconhecidos respondam a tópicos."
             allow_unknown_sender_topic_replies_hint: "Permite que remetentes desconhecidos(as) respondam a tópicos de grupo. Se não estiver ativado, será criado um novo tópico para respostas de endereços de e-mail de usuários(as) não convidados para o tópico."
             from_alias: "De Alias"
+            from_alias_hint: "Nome alternativo para ser utilizado como endereço de origem para enviar emails SMTP. Observe que isso pode não ser compatível com todos os provedores de email, consulte a documentação do seu provedor."
           mailboxes:
             synchronized: "Caixa de mensagens sincronizada"
             none_found: "Nenhuma caixa de mensagens foi encontrada nesta conta de e-mail."
@@ -1086,6 +1093,7 @@ pt_BR:
       enable_quoting: "Ativar resposta citando o texto destacado"
       enable_defer: "Ativar adiamento para marcar tópicos como não lidos"
       experimental_sidebar:
+        enable: "Ativar barra lateral experimental"
         options: "Opções"
         categories_section: "Seção de Categorias"
         categories_section_instruction: "As categorias selecionadas serão exibidas na seção de categorias do painel lateral."
@@ -1187,6 +1195,7 @@ pt_BR:
         move_to_archive: "Arquivar"
         failed_to_move: "Falha ao mover as mensagens selecionadas (talvez você esteja sem conexão com a internet)"
         tags: "Etiquetas"
+        all_tags: "Todas as etiquetas"
         warnings: "Avisos oficiais"
         read_more_in_group: "Quer ler mais? Veja outras mensagens em %{groupLink}."
         read_more: "Quer ler mais? Veja outras mensagens em <a href='%{basePath}/u/%{username}/messages'>mensagens pessoais</a>."
@@ -1566,7 +1575,9 @@ pt_BR:
         title: "Resumo"
         stats: "Estatísticas"
         time_read: "tempo de leitura"
+        time_read_title: "%{duration} (todo o período)"
         recent_time_read: "tempo de leitura recente"
+        recent_time_read_title: "%{duration} (nos últimos 60 dias)"
         topic_count:
           one: "tópico criado"
           other: "tópicos criados"
@@ -1638,6 +1649,9 @@ pt_BR:
         the_topic: "o tópico"
     user_status:
       save: "Salvar"
+      set_custom_status: "Definir status customizados"
+      what_are_you_doing: "O que você está fazendo?"
+      remove_status: "Remover status"
     loading: "Carregando..."
     errors:
       prev_page: "ao tentar carregar"
@@ -1697,6 +1711,7 @@ pt_BR:
       other: respostas
     signup_cta:
       sign_up: "Cadastrar-se"
+      hide_session: "Talvez mais tarde"
       hide_forever: "não, obrigado(a)"
       hidden_for_session: "Ok, vamos perguntar amanhã. Você sempre pode usar \"Entrar\" para criar uma conta também."
       intro: "Olá! Parece que você está gostando da discussão, mas ainda não cadastou uma conta."
@@ -1951,6 +1966,7 @@ pt_BR:
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos off-line"
       edit_conflict: "editar conflito"
+      esc: "esc"
       group_mentioned_limit:
         one: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuário(a). Ninguém será notificado(a)."
         other: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuários(as). Ninguém será notificado(a)."
@@ -2085,6 +2101,7 @@ pt_BR:
       ignore: "Ignorar"
       image_alt_text:
         aria_label: Texto alternativo para imagem
+      delete_image_button: Excluir Imagem
     notifications:
       tooltip:
         regular:
@@ -2126,6 +2143,7 @@ pt_BR:
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
       invited_to_topic: "<span>%{username}</span> %{description}"
       invitee_accepted: "<span>%{username}</span> aceitou o seu convite"
+      invitee_accepted_your_invitation: "aceitou seu convite"
       moved_post: "<span>%{username}</span> moveu %{description}"
       linked: "<span>%{username}</span> %{description}"
       granted_badge: "Ganhou \"%{description}'"
@@ -2225,6 +2243,8 @@ pt_BR:
       in: "em"
       in_this_topic: "neste tópico"
       in_this_topic_tooltip: "mudar para pesquisa de todos os tópicos"
+      in_messages: "nas mensagens"
+      in_messages_tooltip: "mudar para pesquisa de tópicos regulares"
       in_topics_posts: "em todos os tópicos e postagens"
       enter_hint: "ou pressione Enter"
       in_posts_by: "em postagens por %{username}"
@@ -2320,11 +2340,19 @@ pt_BR:
     current_user: "ir para a sua página do(a) usuário(a)"
     view_all: "exibir tudo %{tab}"
     user_menu:
+      generic_no_items: "Não há itens nesta lista."
+      view_all_notifications: "ver todas as notificações"
+      view_all_bookmarks: "ver todos os favoritos"
+      view_all_messages: "ver todas as mensagens pessoais"
       tabs:
+        all_notifications: "Todas as notificações"
         replies: "Respostas"
         mentions: "Menções"
         likes: "Curtidas"
+        messages: "Mensagens pessoais"
         bookmarks: "Favoritos"
+        review_queue: "Fila de revisão"
+        other_notifications: "Outras notificações"
         profile: "Perfil"
     topics:
       new_messages_marker: "último acesso"
@@ -3012,6 +3040,9 @@ pt_BR:
         viewing_summary: "visualizando um resumo deste tópico"
         post_number: "%{username}, postagem #%{post_number}"
         show_all: "Exibir tudo"
+      share:
+        title: "Compartilhar Publicação #%{post_number}"
+        instructions: "Compartilhar o link desta publicação:"
     category:
       none: "(sem categoria)"
       all: "Todas as categorias"
@@ -3724,6 +3755,9 @@ pt_BR:
             my_posts:
               content: "Minhas postagens"
               title: "Minhas publicações"
+            review:
+              content: "Revisar"
+              title: "revisar"
     welcome_topic_banner:
       title: "Crie seu tópico de Boas-Vindas"
       button_title: "Começar a Editar"
@@ -4815,6 +4849,7 @@ pt_BR:
         suspended: "Suspenso(a)?"
         staged: "Encenado(a)?"
         show_admin_profile: "Administrador(a)"
+        manage_user: "Gerenciar usuário"
         show_public_profile: "Exibir perfil público"
         impersonate: "Representar"
         action_logs: "Registro de atividades"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 9c40386aeb..838224bafc 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1107,6 +1107,7 @@ ro:
         move_to_archive: "Arhivează"
         failed_to_move: "Mutarea mesajelor selectate a eșuat (poate că v-a căzut rețeaua)"
         tags: "Etichete"
+        all_tags: "Toate etichetele"
       preferences_nav:
         account: "Cont"
         security: "Securitate"
@@ -2978,6 +2979,9 @@ ro:
               content: "Utilizatori"
             my_posts:
               content: "Postările mele"
+            review:
+              content: "Revizuire"
+              title: "revizuire"
   admin_js:
     type_to_filter: "tastează pentru a filtra..."
     admin:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 392a60eb4d..7bc8b2d310 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -1316,6 +1316,7 @@ ru:
         move_to_archive: "Архив"
         failed_to_move: "Невозможно переместить выделенные сообщения (возможно, у вас проблемы с сетевым подключением)"
         tags: "Теги"
+        all_tags: "Все теги"
         warnings: "Официальные предупреждения"
         read_more_in_group: "Хотите узнать больше? Просмотрите другие сообщения в группе %{groupLink}."
         read_more: "Хотите узнать больше? Просмотрите другие сообщения в разделе <a href='%{basePath}/u/%{username}/messages'>'Личные сообщения'</a>."
@@ -2131,6 +2132,8 @@ ru:
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохранённые офлайн"
       edit_conflict: "редактировать конфликт"
+      esc: "Esc"
+      esc_label: "Нажмите клавишу 'Esc' для закрытия"
       group_mentioned_limit:
         one: "<b>Внимание!</b> Вы упомянули <a href='%{group_link}'>%{group}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на %{count} пользователя. Никто не получит уведомление."
         few: "<b>Внимание!</b> Вы упомянули <a href='%{group_link}'>%{group}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на %{count} пользователей. Никто не получит уведомление."
@@ -2247,6 +2250,9 @@ ru:
         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: Ответить
@@ -3568,7 +3574,7 @@ ru:
         appearance: "Внешний вид"
         email: "Email"
       list_filters:
-        all: "Все темы"
+        all: "Все непрочитанные темы"
         none: "Без подразделов"
       colors_disabled: "Вы не можете выбирать цвета, поскольку не указан стиль раздела."
     flagging:
@@ -4170,7 +4176,7 @@ ru:
         few: "%{count} новых"
         many: "%{count} новых"
         other: "%{count} непрочитанных"
-      toggle_section: "Переключить секцию"
+      toggle_section: "Свернуть / развернуть секцию"
       more: "Ещё..."
       all_categories: "Все разделы"
       all_tags: "Все теги"
@@ -4230,6 +4236,10 @@ ru:
                 few: "%{count} черновика"
                 many: "%{count} черновиков"
                 other: "%{count} черновиков"
+            review:
+              content: "Премодерация"
+              title: "Премодерация сообщений"
+              pending_count: "В ожидании: %{count}"
     welcome_topic_banner:
       title: "Создать приветственную тему"
       description: 'Ваша приветственная тема — это первое, что прочитают новички. Постарайтесь одним абзацем выразить наиболее важную информацию, которую вы хотите донести до новых пользователей форума.'
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index c425e3d007..d8c9edf79d 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -817,6 +817,7 @@ sk:
         move_to_archive: "Archív"
         failed_to_move: "Zlyhalo presunutie označených správ (možno je chyba vo vašom pripojení)"
         tags: "Štítky"
+        all_tags: "Všetky štítky"
       preferences_nav:
         account: "Účet"
         security: "Bezpečnosť"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 3fa7687027..8c55a77a2d 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -1118,6 +1118,7 @@ sl:
         move_to_archive: "Arhiv"
         failed_to_move: "Premik izbranih sporočil ni uspel (mogoče je vaša povezava prekinjena)"
         tags: "Oznake"
+        all_tags: "Vse oznake"
       preferences_nav:
         account: "Račun"
         security: "Varnost"
@@ -3429,6 +3430,9 @@ sl:
             my_posts:
               content: "Moji prispevki"
               title: "Moji prispevki"
+            review:
+              content: "Pregled"
+              title: "pregled"
   admin_js:
     type_to_filter: "vnesite za filter..."
     admin:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 4d3bfedd9d..4f6bcb9919 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -620,6 +620,7 @@ sq:
         move_to_archive: "Arkivo"
         failed_to_move: "Nuk i transferuam dot mesazhet e zgjedhura (ka mundësi që të jeni shkëputur nga rrjeti)"
         tags: "Etiketat"
+        all_tags: "Të gjitha etiketat"
       preferences_nav:
         account: "Llogaria"
         security: "Siguria"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index d6b2d23e57..11d8a5257a 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -1197,6 +1197,7 @@ sv:
         move_to_archive: "Arkiv"
         failed_to_move: "Misslyckades med att flytta de markerade meddelandena (kanske ligger ditt nätverk nere)"
         tags: "Taggar"
+        all_tags: "Alla taggar"
         warnings: "Officiella varningar"
         read_more_in_group: "Vill du läsa mer? Bläddra bland andra meddelanden i %{groupLink}."
         read_more: "Vill du läsa mer? Bläddra bland andra meddelanden i <a href='%{basePath}/u/%{username}/messages'>personliga meddelanden</a>."
@@ -1686,6 +1687,8 @@ sv:
       enabled: "Webbplatsen är i skrivskyddat läge. Du kan fortsätta bläddra på sidan, men att skriva inlägg, gilla och andra interaktioner är inaktiverat för tillfället."
       login_disabled: "Det går inte att logga in medan webbplatsen är i skrivskyddat läge."
       logout_disabled: "Det går inte att logga ut medan webbplatsen är i skrivskyddat läge."
+    staff_writes_only_mode:
+      enabled: "Webbplatsen är i läget endast för personal. Du kan fortsätta bläddra på sidan, men att skriva inlägg, gilla och andra åtgärder är begränsat till personal."
     too_few_topics_and_posts_notice_MF: >-
       Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">inleda diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> ämne} other {finns <strong>#</strong> ämnen}} och {currentPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone {requiredTopics, plural, one {<strong>#</strong> ämne} other {<strong>#</strong> ämnen}} och {requiredPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Enbart personal kan se detta meddelande.
     too_few_topics_notice_MF: >-
@@ -1717,6 +1720,7 @@ sv:
       hide_forever: "nej tack"
       hidden_for_session: "Ok, vi frågar dig imorgon. Du kan alltid använda 'Logga in' för att skapa ett konto, också."
       intro: "Hejsan! Det verkar som du gillar diskussionen, men du har ännu inte registrerat dig för ett konto."
+      value_prop: "Trött på att bläddra igenom samma inlägg? När du skapar ett konto kommer du alltid tillbaka där du slutade. Med ett konto kan du också bli aviserad om nya svar, spara bokmärken och använda gillningar för att tacka andra. Vi kan alla arbeta tillsammans för att göra denna gemenskap fantastisk. :heart:"
     summary:
       enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta."
       description:
@@ -1970,6 +1974,8 @@ sv:
       similar_topics: "Ditt ämne liknar..."
       drafts_offline: "utkast offline"
       edit_conflict: "redigera konflikt"
+      esc: "esc"
+      esc_label: "Klicka eller tryck på Esc för att avfärda"
       group_mentioned_limit:
         one: "<b>Varning!</b> Du nämnde <a href='%{group_link}'>%{group}</a> och denna grupp har fler medlemmar än vad administratorn tillåter för omnämningar. Begränsningsregeln för omnämnanden är satt till %{count} användare. Ingen kommer därför att aviseras."
         other: "<b>Varning!</b> Du nämnde <a href='%{group_link}'>%{group}</a> och denna grupp har fler medlemmar än vad administratorn tillåter för omnämningar. Begränsningsregeln för omnämnanden är satt till %{count} användare. Ingen kommer därför att aviseras."
@@ -2072,6 +2078,9 @@ sv:
         body: "Just nu skickas det här meddelandet bara till dig själv!"
       slow_mode:
         error: "Detta ämne är i långsamt läge. Du publicerade nyligen, och kan publicera igen om %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "Personen du skickar meddelanden till, <b>%{usernames}</b>, har inte setts här på väldigt länge – %{time_ago}. De kanske inte får ditt meddelande. Kanske vill du söka efter alternativa metoder för att kontakta %{usernames}?"
+        multiple: "Följande personer du skickar meddelanden till, <b>%{usernames}</b>, har inte setts här på väldigt länge – %{time_ago}. De kanske inte får ditt meddelande. Kanske vill du söka efter alternativa metoder för att kontakta dem?"
       admin_options_title: "Valfria personalinställningar för detta ämne"
       composer_actions:
         reply: Svara
@@ -3863,6 +3872,10 @@ sv:
               draft_count:
                 one: "%{count} utkast"
                 other: "%{count} utkast"
+            review:
+              content: "Granska"
+              title: "granska"
+              pending_count: "%{count} väntande"
     welcome_topic_banner:
       title: "Skapa ditt välkomstämne"
       description: 'Ditt välkomstämne är det första som nykomlingar läser. Tänk på det som din "snabbpresentation" eller "målbeskrivning" i ett enda stycke.'
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index bed55f4098..9f50754618 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -721,6 +721,7 @@ sw:
         move_to_archive: "Hifadhi"
         failed_to_move: "Uhamishaji wa ujumbe uliochaguliwa umeshindikana (laba hauna mtandao wa intaneti uko chini)"
         tags: "Lebo"
+        all_tags: "Lebo Zote"
       preferences_nav:
         account: "Akaunti"
         security: "Ulinzi"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 8b116e0d02..273b180cb7 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -851,6 +851,7 @@ th:
         move_to_archive: "เก็บเข้าคลัง"
         failed_to_move: "เกิดความผิดพลาดในการย้ายข้อความที่เลือก (เครือข่ายของคุณอาจล่ม)"
         tags: "แท็ก"
+        all_tags: "แท็กทั้งหมด"
       preferences_nav:
         account: "บัญชี"
         security: "ความปลอดภัย"
@@ -2491,6 +2492,9 @@ th:
               content: "โพสต์ของฉัน"
               draft_count:
                 other: "%{count}แบบร่าง"
+            review:
+              content: "รีวิว"
+              title: "รีวิว"
   admin_js:
     type_to_filter: "พิมพ์เพื่อกรอง..."
     admin:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 3a8ac69170..8e24491f40 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -1175,6 +1175,7 @@ tr_TR:
         move_to_archive: "Arşiv"
         failed_to_move: "Seçilen iletilerin taşınması başarısız oldu (muhtemelen şebeke çöktü)"
         tags: "Etiketler"
+        all_tags: "Tüm Etiketler"
         warnings: "Resmi Uyarılar"
         read_more_in_group: "Daha fazla okumak ister misin? %{groupLink} bağlantısındaki diğer iletilere göz atın."
         read_more: "Daha fazla okumak isterseniz <a href='%{basePath}/u/%{username}/messages'>kişisel iletiler altında</a> diğer iletilere göz atın."
@@ -3757,6 +3758,9 @@ tr_TR:
               draft_count:
                 one: "%{count} taslak"
                 other: "%{count} taslak"
+            review:
+              content: "Gözden geçirmeler"
+              title: "gözden geçirmeler"
     welcome_topic_banner:
       title: "Hoş Geldiniz konulu gönderinizi oluşturun"
       description: 'Hoş geldiniz konulu gönderiniz, yeni katılanların okuyacağı ilk şeydir. Bunu bir paragraf “kısa bir sunum” veya “misyon anlatımınız” olarak düşünün'
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index f9bcf6d379..bbfb58e17c 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -1316,6 +1316,7 @@ uk:
         move_to_archive: "Архівувати"
         failed_to_move: "Не вдалося перемістити обрані повідомлення (можливо, у вас мережа зникла)"
         tags: "Теги"
+        all_tags: "Усі мітки"
         warnings: "Офіційні попередження"
         read_more_in_group: "Бажаєте дізнатися більше? Перегляньте інші повідомлення в %{groupLink}."
         read_more: "Хочете прочитати більше? Перегляньте інші повідомлення в <a href='%{basePath}/u/%{username}/messages'>особистих повідомленнях</a>."
@@ -4228,6 +4229,9 @@ uk:
                 few: "%{count} чернетки"
                 many: "%{count} чернетки"
                 other: "%{count} чернетки"
+            review:
+              content: "Переглянути"
+              title: "переглянути"
     welcome_topic_banner:
       title: "Створіть тему привітання"
       description: 'Ваша привітальна тема – це перше, що прочитають новачки. Думайте про це як про «початкову презентацію» або «заяву про місію» з одного абзацу.'
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 197a58ed2e..a3cf73c860 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -1165,6 +1165,7 @@ ur:
         move_to_archive: "آر کائیو"
         failed_to_move: "منتخب شدہ پیغامات کو منتقل کرنے میں ناکامی (شاید آپ کے نیٹ ورک بند ہے)"
         tags: "ٹیگز"
+        all_tags: "تمام ٹیگز"
         warnings: "آفیشل انتباہات"
         read_more_in_group: "مزید پڑھنا چاہتے ہیں؟ دوسرے پیغامات کو %{groupLink}میں براؤز کریں۔"
         read_more: "مزید پڑھنا چاہتے ہیں؟ دوسرے پیغامات کو <a href='%{basePath}/u/%{username}/messages'>ذاتی پیغامات</a>میں براؤز کریں۔"
@@ -3681,6 +3682,9 @@ ur:
               content: "صارفین"
             my_posts:
               content: "میری پوسٹ"
+            review:
+              content: "جائزہ لیں"
+              title: "جائزہ لیں"
   admin_js:
     type_to_filter: "فِلٹر کرنے کے لئے ٹائپ کریں..."
     admin:
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 357c5e6322..abe6c9798b 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -1136,6 +1136,7 @@ vi:
         move_to_archive: "Lưu trữ"
         failed_to_move: "Lỗi khi chuyển các tin nhắn đã chọn (có thể do lỗi mạng)"
         tags: "Thẻ"
+        all_tags: "Tất cả thẻ"
         warnings: "Cảnh báo chính thức"
         read_more_in_group: "Muốn đọc thêm? Duyệt các tin nhắn khác bằng %{groupLink}."
         read_more: "Muốn đọc thêm? Duyệt các tin nhắn khác trong <a href='%{basePath}/u/%{username}/messages'>tin nhắn cá nhân</a>."
@@ -3652,6 +3653,9 @@ vi:
               title: "Bài viết của tôi"
               draft_count:
                 other: "%{count} bản nháp"
+            review:
+              content: "Review"
+              title: "review"
     until: "Cho đến khi:"
   admin_js:
     type_to_filter: "gõ để lọc..."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 32d2928ddd..0399c49fba 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -1139,6 +1139,7 @@ zh_CN:
         move_to_archive: "归档"
         failed_to_move: "无法移动所选消息（可能您的网络已掉线）"
         tags: "标签"
+        all_tags: "所有标签"
         warnings: "官方警告"
         read_more_in_group: "想阅读更多？浏览%{groupLink}或中的其他话题。"
         read_more: "想阅读更多内容？ 请在 <a href='%{basePath}/u/%{username}/messages/personal'>个人私信</a>中浏览其他消息。"
@@ -1894,6 +1895,8 @@ zh_CN:
       similar_topics: "您的话题类似于…"
       drafts_offline: "离线草稿"
       edit_conflict: "编辑冲突"
+      esc: "esc"
+      esc_label: "单击或按 Esc 关闭"
       group_mentioned_limit:
         other: "<b>警告</b>！您提及了 <a href='%{group_link}'> %{group} </a>，但是此群组的成员数量超过了管理员配置的 %{count} 个用户的最大可提及数量限制。没有人会收到通知。"
       group_mentioned:
@@ -1989,6 +1992,9 @@ zh_CN:
         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: 回复
@@ -3684,6 +3690,10 @@ zh_CN:
               title: "我的帖子"
               draft_count:
                 other: "%{count} 草稿"
+            review:
+              content: "审核"
+              title: "审核"
+              pending_count: "%{count} 待处理"
     welcome_topic_banner:
       title: "创建你的欢迎话题"
       description: '你的欢迎话题是新来的人首先会读到的东西。可以把它看作是你的一段 "电梯推销 "或 "使命宣言"。'
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index fd948efa44..d033c32566 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -1038,6 +1038,7 @@ zh_TW:
         move_to_archive: "封存"
         failed_to_move: "移動所選郵件失敗（請檢查網路連線）"
         tags: "標籤"
+        all_tags: "所有標籤"
         read_more: "想看更多？到<a href='%{basePath}/u/%{username}/messages'>個人訊息</a>瀏覽其他訊息。"
       preferences_nav:
         account: "帳號"
@@ -2851,6 +2852,9 @@ zh_TW:
               content: "我的貼文"
               draft_count:
                 other: "%{count}草稿"
+            review:
+              content: "審核"
+              title: "審核"
   admin_js:
     type_to_filter: "輸入要搜尋的文字..."
     admin:
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index aa8c4a628f..f12f5f29f9 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -133,7 +133,6 @@ ar:
         unsubscribe_not_allowed: "يحدث ذلك عندما يكون إلغاء الاشتراك عبر البريد الإلكتروني غير مسموح به لهذا المستخدم."
         email_not_allowed: "يحدث عندما لا يكون عنوان البريد الإلكتروني مُدرَجًا في قائمة السماح أو موجودًا في قائمة الحظر."
       unrecognized_error: "خطأ غير معروف"
-    secure_media_placeholder: "محجوبة: الوسائط الآمنة مفعَّلة في هذا الموقع، قم بزيارة الموضوع أو انقر على \"عرض الوسائط\" لعرض الوسائط المُرفَقة."
     view_redacted_media: "عرض الوسائط"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -227,7 +226,6 @@ ar:
       page_publishing_requirements: "لا يمكن تفعيل نشر الصفحة في حال تفعيل الوسائط الآمنة."
       s3_backup_requires_s3_settings: "لا يمكنك استخدام S3 كمكان للنسخ الاحتياطي ما لم تُدخِل \"%{setting_name}\"."
       s3_bucket_reused: "لا يمكنك استخدام الحاوية نفسها لـ \"s3_upload_bucket\" و\"s3_backup_bucket\" معًا. اختر حاويةً أخرى أو استخدم مسارًا مختلفًا لكل حاوية."
-      secure_media_requirements: "يجب تفعيل التحميل إلى S3 قبل تفعيل الوسائط الآمنة."
       share_quote_facebook_requirements: "يجب عليك ضبط معرِّف تطبيق Facebook لتفعيل مشاركة الاقتباسات على Facebook."
       second_factor_cannot_enforce_with_socials: "لا يمكنك فرض المصادقة الثنائية عند تفعيل عمليات تسجيل الدخول بحسابات التواصل الاجتماعي. يجب عليك أولًا إيقاف تسجيل الدخول عبر: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "لا يمكنك فرض المصادقة الثنائية في حال إيقاف عمليات تسجيل الدخول المحلية."
@@ -2159,9 +2157,6 @@ ar:
     delete_merged_stub_topics_after_days: "عدد الأيام التي يجب انتظارها قبل حذف الموضوعات البديلة المدمجة بالكامل تلقائيًا. اضبط القيمة على 0 لعدم حذف الموضوعات البديلة أبدًا."
     bootstrap_mode_min_users: "الحد الأدنى لعدد المستخدمين المطلوب لإيقاف وضع التمهيد (اضبط القيمة على 0 للإيقاف)"
     prevent_anons_from_downloading_files: "منع المستخدمين المجهولين من تنزيل المرفقات"
-    secure_media: 'يقيِّد من الوصول إلى جميع التحميلات (الصور والفيديوهات والملفات الصوتية والنصوص وملفات pdf وzip وغيرها). إذا تم تفعيل "تسجيل الدخول مطلوب"، سيتمكن المستخدمون الذين سجَّلوا الدخول فقط من الوصول إلى التحميلات. بخلاف ذلك، سيتم تقييد الوصول على تحميلات الوسائط في الرسائل الخاصة والفئات الخاصة. تحذير: هذا الإعداد معقَّد ويتطلب فهمًا إداريًا عميقًا. راجع <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the موضوع الوسائط الآمنة على Meta</a> لمعرفة التفاصيل.'
-    secure_media_allow_embed_images_in_emails: "يسمح بتضمين الصور الآمنة التي عادةً ما يتم تنقيحها في الرسائل الإلكترونية، إذا كان حجمها أصغر من الإعداد `secure media max email embed image size kb`."
-    secure_media_max_email_embed_image_size_kb: "اقتطاع حجم الصور الآمنة التي سيتم تضمينها في الرسائل الإلكترونية إذا تم تفعيل الإعداد `secure media allow embed in emails`. سيكون هذا الإعداد بلا أي تأثير دون تفعيله."
     slug_generation_method: "اختيار طريقة إنشاء المسار. سيُنشئ الخيار \"ترميز\" سلسلة ترميز النسبة المئوية، بينما سيوقف الخيار \"لا يوجد\" المسار تمامًا."
     enable_emoji: "تفعيل الرموز التعبيرية"
     enable_emoji_shortcuts: "سيتم تحويل نصوص الوجوه المبتسمة الشائعة مثل :) p: :( إلى رموز تعبيرية"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 3d5bc0ab8c..310d8e9012 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -122,7 +122,6 @@ da:
         unsubscribe_not_allowed: "Det sker, når afmelding via e-mail ikke er tilladt for denne bruger."
         email_not_allowed: "Det sker, når emailadressen ikke er på tilladelseslisten eller er på blokeringslisten."
       unrecognized_error: "Ikke-genkendt Fejl"
-    secure_media_placeholder: "Bortredigeret: Dette websted har aktiveret sikre medier, gå til emnet, eller klik på Vis medier for at se det vedhæftede medie."
     view_redacted_media: "Vis Medie"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -192,7 +191,6 @@ da:
       page_publishing_requirements: "Sideudgivelse kan ikke aktiveres, hvis sikre medier er aktiveret."
       s3_backup_requires_s3_settings: "Du kan ikke bruge S3 som backupplacering, medmindre du har angivet '%{setting_name}'."
       s3_bucket_reused: "Du kan ikke bruge den samme spand til 's3_upload_bucket' og 's3_backup_bucket'. Vælg en anden spand, eller brug en anden sti til hver spand."
-      secure_media_requirements: "S3-overførsler skal være aktiveret, før sikre medier aktiveres."
       share_quote_facebook_requirements: "Du skal indstille et Facebook-app-id for at aktivere citatdeling for Facebook."
       second_factor_cannot_enforce_with_socials: "Du kan ikke gennemtvinge 2FA med sociale logins aktiveret. Du skal først deaktivere login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan ikke gennemtvinge 2FA, hvis lokale logins er deaktiveret."
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 4263a2bdd7..f856903866 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -130,7 +130,7 @@ de:
         unsubscribe_not_allowed: "Passiert, wenn die Abbestellung per E-Mail für diesen Benutzer nicht erlaubt ist."
         email_not_allowed: "Passiert, wenn die E-Mail-Adresse nicht auf der Positivliste oder auf der Negativliste ist."
       unrecognized_error: "Unbekannter Fehler"
-    secure_media_placeholder: "Geschwärzt: Auf dieser Website sind sichere Medien aktiviert, besuche das Thema oder klicke auf „Medien anzeigen“, um die angehängten Medien zu sehen."
+    secure_uploads_placeholder: "Redigiert: Auf dieser Website sind sichere Uploads aktiviert, besuche das Thema oder klicke auf „Medien anzeigen“, um die angehängten Uploads zu sehen."
     view_redacted_media: "Medien anzeigen"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -200,7 +200,7 @@ de:
       page_publishing_requirements: "Die Veröffentlichung von Seiten kann nicht aktiviert werden, wenn sichere Medien aktiviert sind."
       s3_backup_requires_s3_settings: "Du kannst S3 nicht als Backup-Ort verwenden, solange du „%{setting_name}“ nicht festgelegt hast."
       s3_bucket_reused: "Du kannst nicht denselben Bucket für „s3_upload_bucket“ und „s3_backup_bucket“ verwenden. Bitte verwende einen anderen Bucket oder verwende für jeden Bucket einen anderen Pfad."
-      secure_media_requirements: "S3-Uploads müssen vor dem Aktivieren sicherer Medien aktiviert sein."
+      secure_uploads_requirements: "S3-Uploads müssen vor dem Aktivieren sicherer Uploads aktiviert sein."
       share_quote_facebook_requirements: "Du musst eine Facebook-App-ID festlegen, um das Teilen von Zitaten für Facebook zu aktivieren."
       second_factor_cannot_enforce_with_socials: "Du kannst 2FA nicht erzwingen, wenn die Anmeldung über soziale Netzwerke aktiviert ist. Du musst zuerst die Anmeldung über %{auth_provider_names} deaktivieren"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kannst 2FA nicht erzwingen, wenn lokale Anmeldungen deaktiviert sind."
@@ -247,6 +247,9 @@ de:
       invalid_access: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen."
     requires_groups: "Die Einladung wurde nicht gespeichert, weil auf das angegebene Thema nicht zugegriffen werden kann. Füge eine der folgenden Gruppen hinzu: %{groups}."
     domain_not_allowed: "Diese E-Mail-Adresse kann nicht verwendet werden, um diese Einladung einzulösen."
+    max_redemptions_allowed_one: "für E-Mail-Einladungen sollte es 1 sein."
+    redemption_count_less_than_max: "sollte weniger als %{max_redemptions_allowed} sein."
+    email_xor_domain: "E-Mail- und Domänenfelder sind nicht gleichzeitig erlaubt"
   bulk_invite:
     file_should_be_csv: "Die hochgeladene Datei sollte im CSV-Format vorliegen."
     max_rows: "Die ersten %{max_bulk_invites} Einladungen wurden versandt. Versuche, die Datei in kleinere Teile aufzuteilen."
@@ -1874,6 +1877,7 @@ de:
     raw_email_max_length: "Wie viele Zeichen für eingehende E-Mails gespeichert werden sollen."
     raw_rejected_email_max_length: "Wie viele Zeichen für abgelehnte E-Mails gespeichert werden sollen."
     delete_rejected_email_after_days: "Lösche abgelehnte E-Mails, die älter als (n) Tage sind."
+    require_change_email_confirmation: "Verlangt von Nicht-Mitarbeitern, dass sie ihre alte E-Mail-Adresse bestätigen, bevor sie sie ändern. Gilt nicht für Mitarbeiter/innen, sie müssen ihre alte E-Mail-Adresse immer bestätigen."
     manual_polling_enabled: "E-Mails über die API für E-Mail-Antworten verteilen."
     pop3_polling_enabled: "E-Mail-Antworten über POP3 abrufen."
     pop3_polling_ssl: "SSL für die Verbindung zum POP3-Server verwenden. (Empfohlen)"
@@ -1952,6 +1956,7 @@ de:
     enable_mobile_theme: "Mobilgeräte verwenden eine mobile Darstellung mit der Möglichkeit, zur vollständigen Website zu wechseln. Deaktiviere diese Option, wenn du ein eigenes Fully-Responsive-Stylesheet verwenden möchtest."
     dominating_topic_minimum_percent: "Anteil der Beiträge eines Themas in Prozent, die ein einzelner Benutzer verfassen darf, bevor dieser Benutzer darauf hingewiesen wird, dass er dieses Thema dominiert."
     disable_avatar_education_message: "Deaktiviert den Hinweis für Benutzer, dass sie ihren Avatar ändern können."
+    pm_warn_user_last_seen_months_ago: "Wenn du eine neue PM erstellst, warne den Benutzer, wenn der Empfänger vor mehr als n Monaten nicht gesehen wurde."
     suppress_uncategorized_badge: "Zeige kein Abzeichen für nicht kategorisierte Themen in der Themenliste."
     header_dropdown_category_count: "Wie viele Kategorien im Header-Drop-down-Menü angezeigt werden können."
     permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw., um Teilausdrücke zu verwenden"
@@ -1999,9 +2004,12 @@ de:
     delete_merged_stub_topics_after_days: "Anzahl der abzuwartenden Tage, bevor vollständig zusammengeführte Stub-Themen automatisch gelöscht werden. Auf 0 setzen, um Stub-Themen nie zu löschen."
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (zum Deaktivieren auf 0 setzen)"
     prevent_anons_from_downloading_files: "Verhindern, dass anonyme Benutzer Anhänge herunterladen können."
-    secure_media: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, Zips und andere). Wenn „Anmeldung erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienuploads in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein umfassendes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">das Thema „Sichere Medien“ auf Meta</a> für Details.'
-    secure_media_allow_embed_images_in_emails: "Ermöglicht das Einbetten sicherer Bilder, die normalerweise in E-Mails geschwärzt werden würden, wenn ihre Größe kleiner ist als die Einstellung „secure media max email embed image size kb“."
-    secure_media_max_email_embed_image_size_kb: "Der Größengrenzwert für sichere Bilder, die in E-Mails eingebettet werden, wenn die Einstellung „secure media allow embed in emails“ aktiviert ist. Anderweitig hat diese Einstellung keine Auswirkung."
+    secure_media: 'VERALTET: Verwende stattdessen die Einstellung secure_uploads, wird in Discourse 3.0 entfernt.'
+    secure_uploads: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, Zips und andere). Wenn „Anmeldung erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienuploads in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein umfassendes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/-/140017">das Thema „Sichere Uploads“ auf Meta</a> für Details.'
+    secure_media_allow_embed_images_in_emails: "VERALTET: secure_uploads_allow_embed_images_in_emails verwenden, wird in Discourse 3.0 entfernt."
+    secure_uploads_allow_embed_images_in_emails: "Ermöglicht das Einbetten sicherer Bilder, die normalerweise in E-Mails geschwärzt werden würden, wenn ihre Größe kleiner ist als die Einstellung „secure uploads max email embed image size kb“."
+    secure_media_max_email_embed_image_size_kb: "DEPRECATED: Verwende secure_uploads_max_email_embed_image_size_kb, wird in Discourse 3.0 entfernt."
+    secure_uploads_max_email_embed_image_size_kb: "Der Größengrenzwert für sichere Bilder, die in E-Mails eingebettet werden, wenn die Einstellung „secure uploads allow embed in emails“ aktiviert ist. Anderweitig hat diese Einstellung keine Auswirkung."
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. „encoded“ erzeugt einen Prozent-encodierten String, bei „none“ wird kein Kürzel verwendet."
     enable_emoji: "Emoji aktivieren"
     enable_emoji_shortcuts: "Geläufige Text-Smileys wie :) :p :( werden in Emojis umgewandelt"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index d1d73a7ea3..0671c6edc1 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -175,7 +175,6 @@ el:
       s3_upload_bucket_is_required: "Δεν μπορείτε να ενεργοποιήσετε μεταφορτώσεις στο S3 εάν δεν παρέχετε το 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Δε μπορείτε να ενεργοποιήσετε την απογραφή στο S3, εκτός αν έχετε ενεργοποιήσει τις επιφορτώσεις S3."
       s3_backup_requires_s3_settings: "Δε μπορείτε να χρησιμοποιήσετε το S3 ως θέση αντιγράφου ασφαλείας, εκτός αν έχετε παράσχει το «%{setting_name}»."
-      secure_media_requirements: "Οι επιφορτώσεις S3 πρέπει να είναι ενεργοποιημένες πριν ενεργοποιήσετε τα ασφαλή πολυμέσα."
       share_quote_facebook_requirements: "Πρέπει να ορίσετε ένα αναγνωριστικό εφαρμογής Facebook για να ενεργοποιήσετε την κοινοποίηση παραθέσεων για το Facebook."
       second_factor_cannot_enforce_with_socials: "Δε μπορείτε να επιβάλετε 2FA με ενεργοποιημένες τις συνδέσεις κοινωνικής δικτύωσης. Πρέπει πρώτα να απενεργοποιήσετε τη σύνδεση μέσω: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Δε μπορείτε να επιβάλετε 2FA εάν οι τοπικές συνδέσεις είναι απενεργοποιημένες."
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index f2b6567dac..bd67164c4c 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -129,7 +129,6 @@ es:
         unsubscribe_not_allowed: "Sucede cuando no se le permite a este usuario anular la subscripción por correo electrónico."
         email_not_allowed: "Ocurre cuando la dirección de correo electrónico no está en la lista de permitidos o está en la lista de bloqueo."
       unrecognized_error: "Error no identificado"
-    secure_media_placeholder: "Censurado: este sitio tiene activada la seguridad multimedia. Visita el tema o haz clic en «Ver multimedia» para ver el adjunto."
     view_redacted_media: "Ver multimedia"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -199,7 +198,6 @@ es:
       page_publishing_requirements: "No se puede activar la publicación de páginas si secure media está activado."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de respaldo salvo que hayas rellenado «%{setting_name}»."
       s3_bucket_reused: "No puedes usar el mismo bucket para «s3_upload_bucket» y «s3_backup_bucket». Selecciona otro bucket o usa una ruta diferente para cada bucket."
-      secure_media_requirements: "Se debe activar la subida de S3 antes de activar medios seguros."
       share_quote_facebook_requirements: "Debes establecer la app id de Facebook para activar compartir citas en Facebook."
       second_factor_cannot_enforce_with_socials: "No puedes obligar el uso de 2FA con inicios de sesión usando redes sociales. Desactiva primero los inicios de sesión con %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "No puedes obligar a usar la autenticación de dos factores si los inicios de sesión locales están desactivados."
@@ -1995,9 +1993,6 @@ es:
     delete_merged_stub_topics_after_days: "Número de días que hay que esperar antes de eliminar automáticamente los temas pendientes totalmente fusionados. Poner a 0 para no eliminar nunca los temas pendientes."
     bootstrap_mode_min_users: "Número mínimo de usuarios requerido para desactivar el modo de arranque (establece en 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que usuarios anónimos descarguen archivos adjuntos."
-    secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está activado «inicio de sesión requerido», solo los usuarios que hayan iniciado sesión pueden acceder a los medios subidos. En caso contrario, se limitará el acceso únicamente a los medios subidos en mensajes privados. ADVERTENCIA: se deben activar las subidas S3 antes de poder activar esta configuración. Ver <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the secure media topic on Meta</a> para más detalles.'
-    secure_media_allow_embed_images_in_emails: "Permite incrustar imágenes seguras que normalmente serían quitadas de los correos electrónicos si su tamaño es menor que la configuración de 'secure media max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "El tamaño límite para las imágenes seguras que se incrustarán en los correos electrónicos si está activada la configuración «los medios seguros permiten su incrustación en los correos electrónicos». Sin esa configuración activada, esta configuración no tiene efecto."
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» desactivará completamente el slug."
     enable_emoji: "Activar emoji"
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( se convertirán a emojis"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 3d2b5f14b9..22dbf90a52 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -85,6 +85,7 @@ fa_IR:
         bounced_email_error: "ایمیل یک گزارش برگشتی است."
         screened_email_error: "وقتی که ارسال کننده ایمیل پیش از این در حال نمایش باشد، اتفاق می‌افتد."
       unrecognized_error: "خطای نامشخص"
+    secure_uploads_placeholder: "ویرایش شده: این سایت بارگذاری ایمن را فعال کرده است، از موضوع دیدن کنید یا برای مشاهده بارگذاری‌های پیوست روی مشاهده رسانه کلیک کنید."
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -136,6 +137,7 @@ fa_IR:
     site_settings:
       default_categories_already_selected: "شما نمیتوانید دسته‌بندی‌ای را که در یک فهرست دیگر استفاده شده را انتخاب کنید."
       s3_upload_bucket_is_required: "شما نمیتوانید بارگذاری به S3 را فعال کنید مگر اینکه 's3_upload_bucket' را ارائه دهید."
+      secure_uploads_requirements: "قبل از فعال کردن بارگذاری‌های ایمن، بارگذاری‌های S3 باید فعال شوند."
   word_connector:
     comma: "، "
   invite:
@@ -146,6 +148,9 @@ fa_IR:
     invalid_email: "آدرس ایمیل %{email} معتبر نیست."
     disabled_errors:
       invalid_access: "شما اجازه مشاهده منبع درخواست شده را ندارید."
+    max_redemptions_allowed_one: "برای دعوت‌نامه‌های ایمیل باید 1 باشد."
+    redemption_count_less_than_max: "باید کمتر از %{max_redemptions_allowed} باشد."
+    email_xor_domain: "فیلدهای ایمیل و دامنه به طور همزمان مجاز نیستند"
   bulk_invite:
     file_should_be_csv: "فرمت فایل بارگذاری شده می بایست csv باشد."
     error: "خطایی هنگام آپلود فایل مربوطه رخ داده است. لطفا بعدا امتحان کنید."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index f253e11734..890d7be686 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -127,7 +127,6 @@ fi:
         unsubscribe_not_allowed: "Näin käy, kun tämä käyttäjä ei voi perua tilausta sähköpostitse."
         email_not_allowed: "Näin käy, kun sähköpostiosoite ei ole sallittujen listalla tai on kiellettyjen listalla."
       unrecognized_error: "Tuntematon virhe"
-    secure_media_placeholder: "Piilotettu: Tällä sivustolla on suojattu sisältö käytössä, vieraile ketjussa tai näytä sisältö napsauttamalla Näytä sisältö -painiketta."
     view_redacted_media: "Näytä sisältö"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -197,7 +196,6 @@ fi:
       page_publishing_requirements: "Sivun julkaisua ei voida ottaa käyttöön, jos suojattu media on käytössä."
       s3_backup_requires_s3_settings: "Et voi käyttää S3:a varmuuskopiosijaintina, ellei %{setting_name} ei ole määritetty."
       s3_bucket_reused: "Sama säiliö ei voi olla sekä 's3_upload_bucket' että 's3_backup_bucket'. Valitse eri säiliö tai määritä eri polku jokaiselle säiliölle."
-      secure_media_requirements: "S3-lataukset täytyy ottaa käyttöön ennen suojatun median käyttöönottoa."
       share_quote_facebook_requirements: "Facebook-sovellustunnus on määritettävä, jotta lainausten jakaminen Facebookiin on mahdollista."
       second_factor_cannot_enforce_with_socials: "Et voi pakottaa 2FA-asetusta käyttöön, kun yhteisökirjautuminen on aktiivisena. Poista yhteisökirjautuminen käytöstä täällä: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Et voi pakottaa kaksivaiheista tunnistusta, jos paikallinen kirjautuminen on pois käytöstä."
@@ -1900,9 +1898,6 @@ fi:
     delete_merged_stub_topics_after_days: "Kuinka montaa päivää odotetaan ennen kuin täysin yhdistetyt tynkäketjut poistetaan automaattisesti. Jos asetat arvoksi 0, tynkäketjuja ei poistetan koskaan."
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
     prevent_anons_from_downloading_files: "Estä tuntemattomia käyttäjiä lataamasta liitteitä."
-    secure_media: 'Rajoittaa pääsyä KAIKKIIN latauksiin (kuvat, videot, äänet, tekstit, pdf-tiedostot, zip-tiedostot ja muut). Jos "sisäänkirjautuminen vaaditaan" on käytössä, vain kirjautuneilla käyttäjillä on pääsy latauksiin. Muussa tapauksessa pääsy rajoitetaan vain yksityisviesteihin ja yksityisiin alueisiin ladattuihin mediatiedostoihin. VAROITUS: Tämä asetus on monimutkainen ja vaatii syvällistä hallinnollista ymmärrystä. Katso lisätietoja <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">turvallista mediaa käsittelevästä ketjusta Metassa</a>.'
-    secure_media_allow_embed_images_in_emails: "Sallii turvallisten kuvien upottamisen, jotka normaalisti karsittaisiin sähköposteissa, jos niiden koko on pienempi kuin \"secure media max email embed image size kb\" -asetus."
-    secure_media_max_email_embed_image_size_kb: "Sähköposteihin upotettavien turvallisten kuvien kokoraja, jos \"secure media allow embed in emails\" -asetus on käytössä. Ilman kyseistä asetusta tällä asetuksella ei ole vaikutusta."
     slug_generation_method: "Valitse polkutunnuksen luomisen metodi, 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkutunnukset käytöstä."
     enable_emoji: "Ota emoji käyttöön"
     enable_emoji_shortcuts: "Yleiset tekstiemojit, kuten :), :p ja :(, muunnetaan emojeiksi"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index e0dd389280..2a7cf3ab69 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -73,6 +73,7 @@ fr:
       file_too_big: "Le fichier non compressé est trop volumineux."
       unknown_file_type: "Le fichier que vous avez essayé d'envoyer ne semble pas être un thème Discourse valide."
       not_allowed_theme: "« %{repo} » n'est pas repris dans la liste des thèmes autorisés (vérifier le paramètre général « allowed_theme_repos »)."
+      ssh_key_gone: "Vous avez attendu trop longtemps pour installer le thème et la clé SSH a expiré. Veuillez réessayer."
     errors:
       component_no_user_selectable: "Les composants du thème ne peuvent pas être sélectionnés par les utilisateurs"
       component_no_default: "Les composants du thème ne peuvent pas être un thème par défaut"
@@ -129,7 +130,6 @@ fr:
         unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
         email_not_allowed: "Se produit quand l'adresse courriel n'est pas reprise dans la liste autorisée ou se trouve dans la liste des expéditeurs indésirables."
       unrecognized_error: "Erreur non reconnue"
-    secure_media_placeholder: "Masqué : ce site a activé la sécurisation des médias. Visitez le sujet ou cliquez sur « Afficher le média » pour le voir."
     view_redacted_media: "Afficher le média"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -199,7 +199,6 @@ fr:
       page_publishing_requirements: "La publication de pages ne peut pas être activée si la sécurisation des médias est activée."
       s3_backup_requires_s3_settings: "Utiliser S3 comme emplacement de sauvegarde nécessite de renseigner le paramètre « %{setting_name} »."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour « s3_upload_bucket » et « s3_backup_bucket ». Choisissez un autre bucket ou utilisez un chemin d'accès différent pour chaque bucket."
-      secure_media_requirements: "L'envoi de fichiers sur S3 doit être activé avant d'activer la sécurisation des médias."
       share_quote_facebook_requirements: "Vous devez définir un identifiant d'application Facebook pour activer le partage de citation vers Facebook."
       second_factor_cannot_enforce_with_socials: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque des connexions aux réseaux sociaux sont activées. Vous devez d'abord désactiver la connexion via : %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque les connexions locales sont désactivées."
@@ -1978,9 +1977,6 @@ fr:
     delete_merged_stub_topics_after_days: "Délai (en jours) de suppression automatique des sujets fusionnés, c'est-à-dire les sujets sans réponses résultant de la fusion de deux sujets par déplacement de messages. Si la valeur est fixée à 0, les sujets fusionnés ne seront pas supprimés."
     bootstrap_mode_min_users: "Nombre minimal d'utilisateurs nécessaire pour désactiver le mode d'amorçage (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Empêcher les utilisateurs anonymes de télécharger les pièces jointes."
-    secure_media: 'Limite l''accès à TOUS les fichiers envoyés (image, vidéo, audio, texte, PDF, ZIP, etc.). Si le paramètre « connexion requise » est activé, seuls les utilisateurs connectés peuvent accéder aux fichiers envoyés. Sinon, l''accès sera limité uniquement aux médias des messages et catégories privés. ATTENTION : ce paramètre est complexe et nécessite des connaissances d''administration approfondies. Consultez <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ce sujet sur les médias sécurisés</a> pour en savoir plus.'
-    secure_media_allow_embed_images_in_emails: "Autorise l'intégration d'images sécurisées (qui seraient autrement expurgées) dans les courriels, si leur taille est inférieure à la valeur du paramètre « secure media max email embed image size kb »."
-    secure_media_max_email_embed_image_size_kb: "La taille maximale d'images sécurisées qui seront intégrées dans des courriels si le paramètre « secure media allow embed in emails » est activé. Si celui-ci n'est pas activé, ce paramètre est sans effet."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
     enable_emoji: "Activer les émojis"
     enable_emoji_shortcuts: "Les textes de smiley courants « :) », « :p » ou « :( » seront convertis en émojis"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index c79cdee385..665affd2bd 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -121,7 +121,6 @@ gl:
         unsubscribe_not_allowed: "Sucede cando a este usuario non se lle permite cancelar a subscrición vía correo electrónico."
         email_not_allowed: "Sucede cando o enderezo electrónico non está na listaxe de elementos permitidos ou está na de bloqueados."
       unrecognized_error: "Erro non recoñecido"
-    secure_media_placeholder: "Redactado: este sitio ten activados elementos multimedia seguros; visite o tema ou prema en Ver contido multimedia para ver o contido multimedia anexado."
     view_redacted_media: "Ver contido multimedia"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -191,7 +190,6 @@ gl:
       page_publishing_requirements: "A publicación de páxinas non se pode activar se está activados multimedia seguros."
       s3_backup_requires_s3_settings: "Non se pode utilizar S3 como localización da copia de seguranza a menos que proporcionara '%{setting_name}'."
       s3_bucket_reused: "Non pode utilizar o mesmo contedor (bucket) para 's3_upload_bucket' e 's3_backup_bucket'. Elixa un contedor diferente ou utilice un camiño distinto para cada un deles."
-      secure_media_requirements: "Débese activar a carga de S3 antes de habilitar multimedia seguros."
       share_quote_facebook_requirements: "Debe definir un ID de aplicación de Facebook para activar o reparto de cota para Facebook."
       second_factor_cannot_enforce_with_socials: "Non pode forzar 2FA tendo o activo o inicio de sesión con redes sociais. Primeiro debe desactivar o inicio de sesión con: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non pode aplicar 2FA se os inicios de sesión locais están desactivados."
@@ -1839,9 +1837,6 @@ gl:
     delete_drafts_older_than_n_days: "Eliminar borradores con máis de (n) días de antigüidade."
     bootstrap_mode_min_users: "Número mínimo de usuarios necesarios para desactivar o modo de arranque (estabelecer en 0 para desactivar)"
     prevent_anons_from_downloading_files: "Evitar que usuarios anónimos descarguen anexos."
-    secure_media: 'Limita o acceso a TODO o que se cargase (imaxes, vídeo, son, texto, pdf, zip e outros). Se está activado o «requírese inicio de sesión», só os usuarios con sesión activa poden acceder ás cargas. En caso contrario, o acceso limitarase só para as cargas de multimedia en mensaxes privadas e categorías privadas. AVISO: este axuste é complexo e require unha comprensión administrativa profunda. Véxase <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">o tema de multimedia seguro en Meta</a> para saber máis.'
-    secure_media_allow_embed_images_in_emails: "Permite incorporar imaxes seguras que normalmente se engadirían nos correos electrónicos, se o seu tamaño é menor que o axuste de tamaño máx. de imaxe incorporada en correo en kb."
-    secure_media_max_email_embed_image_size_kb: "O tamaño de corte para imaxes seguras que se incorporarán nos correos se está activado o axuste «multimedia seguro que se permite incorporar nas mensaxes de correo». Se este axuste non está activado, non terá efecto."
     slug_generation_method: "Escolla un método de xeración de abreviacións. Con «codificado» xerarase unha cadea con codificación porcentual, con «ningún» desactivarase a abreviación amigábel."
     enable_emoji: "Activar emojis"
     enable_emoji_shortcuts: "As cariñas habituais en texto como :) :p :( converterase en emojis"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 29e2d5d216..81cc945b55 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -132,7 +132,7 @@ he:
         unsubscribe_not_allowed: "מתרחש כאשר למשתמש אין הרשאה לבטל מינוי דרך דוא״ל."
         email_not_allowed: "מתרחש כאשר כתובת דוא״ל אינה ברשימות ההיתר או החסימה."
       unrecognized_error: "שגיאה לא מוכרת"
-    secure_media_placeholder: "נדחס: באתר זה מופעלת מדיה מאובטחת, יש לבקר בנושא או ללחוץ על הצגת מדיה כדי לצפות במדיה המצורפת."
+    secure_uploads_placeholder: "נערך: באתר זה מופעלות העלאות מאובטחות, יש לבקר בנושא או ללחוץ על הצגת מדיה כדי לצפות בהעלאות המצורפות."
     view_redacted_media: "הצגת מדיה"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -214,7 +214,7 @@ he:
       page_publishing_requirements: "לא ניתן להפעיל פרסום עמודים אם מדיה מאובטחת פעילה."
       s3_backup_requires_s3_settings: "לא ניתן להשתמש ב־S3 כמיקום לגיבוי אלמלא סיפקת את ‚%{setting_name}’."
       s3_bucket_reused: "אין לך אפשרות להשתמש באותו הדלי עבור ‚s3_upload_bucket’ וגם ‚s3_backup_bucket’. נא לבחור בדלי שונה או להשתמש בנתיב שונה לכל דלי."
-      secure_media_requirements: "יש להפעיל העלאה ל־S3 בטרם הפעלת מדיה מאובטחת."
+      secure_uploads_requirements: "יש להפעיל העלאה ל־S3 בטרם הפעלת העלאות מאובטחות."
       share_quote_facebook_requirements: "עליך להגדיר מזהה יישומון פייסבוק כדי להפעיל שיתוף ציטוטים עבור פייסבוק"
       second_factor_cannot_enforce_with_socials: "לא ניתן לאכוף אימות דו־שלבי כאשר מופעלת כניסה דרך רשתות חברתיות. תחילה עליך להשבית כניסה דרך: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "אי אפשר לאכוף אימות דו־שלבי אם כניסה מקומית מושבתת."
@@ -265,6 +265,9 @@ he:
       invalid_access: "אין לך הרשאות לצפות במשאב המבוקש."
     requires_groups: "ההזמנה לא נשמרה מכיוון שהנושא שצוין אינו נגיש. נא להוסיף את אחת מהקבוצות הבאות: %{groups}."
     domain_not_allowed: "אי אפשר להשתמש בכתובת הדוא״ל שלך למימוש הזמנה זו."
+    max_redemptions_allowed_one: "להזמנות דוא״ל זה אמור להיות 1."
+    redemption_count_less_than_max: "אמור להיות קטן מ־%{max_redemptions_allowed}."
+    email_xor_domain: "שדות הדוא״ל ושם התחום אסורים לשימוש בו־זמנית"
   bulk_invite:
     file_should_be_csv: "הקובץ שנשלח אמור להיות בתסדיר csv."
     max_rows: "%{max_bulk_invites} ההזמנות הראשונות נשלחו. כדאי לנסות לפצל את הקובץ לחלקים קטנים יותר."
@@ -1582,6 +1585,8 @@ he:
     summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים"
     summary_max_results: "מספר הפוסטים המרבי שיוחזר על ידי ‚סיכום הנושא הזה’"
     summary_timeline_button: "הצגת כפתור ‚סיכום’ בציר הזמן"
+    enable_personal_messages: "יצא מכלל שימוש, יש להשתמש בהגדרה ‚קבוצות בהן מופעלות הודעות אישיות’. לאפשר למשתמשים בדרגת אמון 1 (ניתן להגדרה דרך אמון מזערי לשליחת הודעות) ליצור הודעות ולענות להודעות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות, ללא קשר."
+    personal_message_enabled_groups: "לאפשר למשתמשים בקבוצות האלו ליצור הודעות ולהגיב להודעות. קבוצות דרגות אמון כוללות את כל דרגות האמון מעל המספר הזה, למשל בחירה ב־trust_level_1 (דרגת אמון 1) מאפשרת גם למשתמשים בדרגות 2, 3 ו־4 לשלוח הודעות פרטיות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות ללא תלות בהגדרות כאלו ואחרות."
     enable_system_message_replies: "מאפשר למשתמשים להגיב להודעות מערכת אפילו כשהודעות אישיות מושבתות"
     enable_chunked_encoding: "הפעלת תגובות קידוד מחולקות מצד השרת. תכונה זו עובדת ברוב התצורות אך חלק מהמתווכים עשויים לכלוא כצעד ביניים, מה שעלול לגרום להאטה"
     long_polling_base_url: "כתובת הבסיס שמשמשת לתשאול ארוך (כאשר CDN מגיש תוכן דינמי, יש להגדיר זאת למשיכה המקורית) למשל: http://origin.site.com"
@@ -1649,6 +1654,7 @@ he:
     post_menu: "החליטו אילו פריטים מופיעים בתפריט הפוסט, ובאיזה סדר. למשל like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפוסט, אלא אם כן נלחץ לחצן ההרחבה."
     share_links: "החליטו אילו פריטים יופיעו בתיבת השיתוף, ובאיזה סדר."
+    allow_username_in_share_links: "לאפשר לכלול שמות משתמש בקישורי שיתוף. שימושי להענקת עיטורים לפי מבקרים מסוימים."
     site_contact_username: "שם משתמש תקין של חבר סגל ממנו יישלחו כל ההודעות האוטומטיות. במקרה של העדר בחירה, ייעשה שימוש בחשבון בררת המחדל של המערכת."
     site_contact_group_name: "שם קבוצה תקני להזמנה לכל ההודעות האוטומטיות."
     send_welcome_message: "שלחו לכל המשתמשים החדשים הודעת \"ברוכים הבאים\" עם הדרכה ראשונית כיצד להתחיל."
@@ -1850,6 +1856,7 @@ he:
     min_trust_to_edit_wiki_post: "דרגת האמון המזערית הנדרשת לעריכת פוסט המסומן כוויקי."
     min_trust_to_edit_post: "דרגת האמון המזערית הנדרשת לעריכת פוסטים."
     min_trust_to_allow_self_wiki: "דרגת האמון המזערית הנדרשת להפיכת פוסט עצמי של משתמש לוויקי."
+    min_trust_to_send_messages: "יצא מכלל שימוש, יש להשתמש בהגדרה ‚קבוצות בהן מופעלות הודעות אישיות’. דרגת האמון המזערית שנדרשת ליצירת הודעות אישיות."
     min_trust_to_send_email_messages: "דרגת האמון המזערית שנדרשת לשליחת הודעות פרטיות בדוא״ל."
     min_trust_to_flag_posts: "דרגת האמון המזערית הנדרשת לסימון פוסטים בדגל"
     min_trust_to_post_links: "דרגת האמון המזערית להוספת קישורים לפוסטים"
@@ -1974,6 +1981,7 @@ he:
     raw_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנכנס."
     raw_rejected_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנדחה."
     delete_rejected_email_after_days: "מחיקת הודעות שנדחו לפני למעלה מ־(n) ימים"
+    require_change_email_confirmation: "לדרוש ממשתמשים שאינם מהסגל לאשר את כתובת הדוא״ל הישנה שלהם בטרם החלפתה. לא חל על משתמשי סגל, הם תמיד צריכים לאשר את כתובת הדוא״ל הישנה שלהם."
     manual_polling_enabled: "דחיפת מיילים באמצעות ה API לתגובות מייל."
     pop3_polling_enabled: "למשוך תגובות דוא״ל דרך POP3."
     pop3_polling_ssl: "שימוש ב-SSL בעת חיבור לשרת POP3. (מומלץ)"
@@ -2099,9 +2107,12 @@ he:
     delete_merged_stub_topics_after_days: "מספר הימים להמתנה לפני מחיקה אוטומטית של נושאים מקוצרים שמוזגו במלואם. יש להגדיר ל־0 כדי לא למחוק נושאים מקוצרים לעולם."
     bootstrap_mode_min_users: "מספר משתמשים מזערי שנדרש כדי להשבית מצב ראשוניות (0 להשבתה)"
     prevent_anons_from_downloading_files: "למנוע ממשתמשים אלמוניים להוריד קבצים מצורפים."
-    secure_media: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">נושא המדיה המאובטחת ב־Meta</a> לקבלת פרטים נוספים.'
-    secure_media_allow_embed_images_in_emails: "מאפשר להטמיע תמונות מאובטחות שבדרך כלל יידחסו אם הגודל שלהן קטן מההגדרה ‚secure media max email embed image size kb’ (גודל תמונה מרבי להטמעה כמדיה מאובטחת בקילובתים)."
-    secure_media_max_email_embed_image_size_kb: "גודל החיתוך לתמונות מאובטחות שיוטמעו בהודעות דוא״ל אם ההגדרה ‚secure media allow embed in emails’ (לאפשר הטמעת מדיה מאובטחת בהודעות דוא״ל) פעילה. אם ההגדרה הזאת אינה פעולה להגדרה זו אין שום משמעות."
+    secure_media: 'יצא מכלל שימוש: נא להשתמש בהגדרה secure_uploads במקום, יוסר ב־Discourse 3.0.'
+    secure_uploads: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/-/140017">נושא ההעלאות המאובטחות ב־Meta</a> לקבלת פרטים נוספים.'
+    secure_media_allow_embed_images_in_emails: "יצא מכלל שימוש: יש להשתמש ב־secure_uploads_allow_embed_images_in_emails, יוסר ב־Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "מאפשר להטמיע תמונות מאובטחות שבדרך כלל יידחסו אם הגודל שלהן קטן מההגדרה ‚secure uploads max email embed image size kb’ (גודל העלאות מרבי להטמעה כתמונה בקילובתים)."
+    secure_media_max_email_embed_image_size_kb: "יצא מכלל שימוש: יש להשתמש ב־secure_uploads_max_email_embed_image_size_kb, יוסר ב־Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "גודל החיתוך לתמונות מאובטחות שיוטמעו בהודעות דוא״ל אם ההגדרה ‚secure uploads allow embed in emails’ (לאפשר הטמעת העלאות מאובטחת בהודעות דוא״ל) פעילה. אם ההגדרה הזאת אינה פעילה להגדרה זו אין שום משמעות."
     slug_generation_method: "נא לבחור שיטת יצירת כתובת מופשטות. ‚מוצפן’ ייצר מחרוזת עם קידוד באחוזים, ‚ללא’ ישבית את הכתובת המופשטת לחלוטין."
     enable_emoji: "הפעלת אמוג׳י"
     enable_emoji_shortcuts: "חייכנים נפוצים כגון ‎:) :p :(‎ יומרו לאמוג׳ים"
@@ -2195,6 +2206,7 @@ he:
     heading_font: "גופן לשימוש כותרות באתר. ערכות עיצוב יכולות לדרוס אותו באמצעות המאפיין ‎`--heading-font-family`‎"
     enable_sitemap: "ליצור מפת אתר עבור האתר שלך ולכלול אותה בקובץ robots.txt."
     sitemap_page_size: "מספר הכתובות שיתווספו בכל עמוד של מפת אתר. 50,000 לכל היותר"
+    enable_user_status: "(ניסיוני) לאפשר למשתמשים להגדיר הודעת מצב מותאמת אישית (אמוג׳י + תיאור)."
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
     dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
@@ -2240,6 +2252,7 @@ he:
       reply_by_email_address_is_empty: "חובה להגדיר ‚מענה לפי כתובת דוא״ל’ בטרם הפעלת תגובה בדוא״ל."
       email_polling_disabled: "עליכם לאפשר ידני או תשאול POP3 לפני שתאפשרו מענה באמצעות מייל."
       user_locale_not_enabled: "לפני שתוכלו להפעיל אפשרות זאת, יש לאפשר \"הגדרות מקומיות מותאמות משתמש/ת\""
+      personal_message_enabled_groups_invalid: "עליך לציין לפחות קבוצה אחת להגדרה זו. כדי למנוע מכולם לשלוח הודעות פרטיות למעט הסגל יש לבחור בקבוצת הסגל."
       invalid_regex: "ביטוי רגולרי לא תקין או לא מותר."
       invalid_regex_with_message: "בביטוי הרגולרי ‚%{regex}’ יש שגיאה: %{message}"
       email_editable_enabled: "עליך להשבית את ‚עריכת דוא״ל אפשרית’ בטרם הפעלת הגדרה זו."
diff --git a/config/locales/server.hr.yml b/config/locales/server.hr.yml
index 445e92391a..ded4c1fe77 100644
--- a/config/locales/server.hr.yml
+++ b/config/locales/server.hr.yml
@@ -129,7 +129,6 @@ hr:
         unsubscribe_not_allowed: "Događa se kada ovom korisniku nije dopuštena odjava putem e-pošte."
         email_not_allowed: "Događa se kada adresa e-pošte nije na popisu dopuštenih ili je na popisu blokiranih."
       unrecognized_error: "Neprepoznata pogreška"
-    secure_media_placeholder: "Redigirano: Ova stranica ima omogućen siguran medij. Posjetite temu ili kliknite Prikaži medije da biste vidjeli priloženi medij."
     view_redacted_media: "Pregledajte medije"
   errors: &errors
     format: ! "%{attribute} %{message}"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index cb7b7cddb9..d0269f354a 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -130,7 +130,6 @@ it:
         unsubscribe_not_allowed: "Succede quando annullare l'iscrizione tramite email non è consentito per questo utente."
         email_not_allowed: "Succede quando l'indirizzo e-mail non è nella lista di contatti permessi o è in quella di contatti bloccati."
       unrecognized_error: "Errore Non Riconosciuto"
-    secure_media_placeholder: "Oscurato: l'opzione per la sicurezza dei contenuti multimediali è attivata su questo sito; visita l'argomento o clicca su Visualizza media per vedere gli allegati."
     view_redacted_media: "Visualizza media"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -200,7 +199,6 @@ it:
       page_publishing_requirements: "La pubblicazione di pagine non può essere attivata se sono attivati i supporti sicuri."
       s3_backup_requires_s3_settings: "Non è possibile utilizzare S3 per i backup a meno che non sia stato fornito '%{setting_name}'."
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
-      secure_media_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i contenuti multimediali sicuri."
       share_quote_facebook_requirements: "Devi impostare un ID app Facebook per attivare la condivisione delle citazioni per Facebook."
       second_factor_cannot_enforce_with_socials: "Non si può applicare l'autenticazione a due fattori se l'acceso tramite social è attivo. Devi prima disattivarlo tramite %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare l'autenticazione a due fattori se gli accessi locali sono disabilitati."
@@ -246,6 +244,7 @@ it:
       invalid_access: "Non hai il permesso di visualizzare la risorsa richiesta."
     requires_groups: "L'invito non è stato salvato perché l'argomento specificato non è accessibile. Aggiungi uno dei seguenti gruppi: %{groups}."
     domain_not_allowed: "La tua email non può essere usata per riscattare l’invito."
+    max_redemptions_allowed_one: "per gli inviti via e-mail dovrebbe essere 1."
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
     max_rows: "I primi %{max_bulk_invites} inviti sono stati spediti. Prova a dividere il file in parti più piccole."
@@ -1981,9 +1980,6 @@ it:
     delete_merged_stub_topics_after_days: "Numero di giorni di attesa prima di eliminare automaticamente gli argomenti stub completamente uniti. Impostare a 0 per non eliminare mai gli argomenti stub."
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
     prevent_anons_from_downloading_files: "Impedisci agli utenti anonimi di scaricare allegati."
-    secure_media: 'Limita l''accesso a TUTTI i caricamenti (immagini, video, audio, testo, pdf, zip, ecc.). Se “login richiesto” è attivato, solo gli utenti registrati possono accedere ai caricamenti. In caso contrario, l''accesso sarà limitato solo per i media caricati in messaggi privati e categorie private. ATTENZIONE: Questa impostazione è complessa e richiede una profonda competenza amministrativa. Per maggiori dettagli visita <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">l''argomento sui media sicuri su Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "Consente di incorporare immagini protette che normalmente verrebbero oscurate nelle e-mail, se le loro dimensioni sono inferiori a quelle dell'impostazione \"Secure media max email embed image size kb\"."
-    secure_media_max_email_embed_image_size_kb: "Limite di dimensione per le immagini protette che verranno incorporate nelle e-mail se l'impostazione \"secure media allow embed in emails\" è abilitata. Se tale impostazione non è abilitata, anche questa non avrà alcun effetto."
     slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
     enable_emoji: "Attiva gli emoji"
     enable_emoji_shortcuts: "Smiley comuni come :) :p :( verranno convertiti in emoji"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 19b720aaf8..52e93296af 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -126,7 +126,6 @@ ja:
         unsubscribe_not_allowed: "このユーザーがメール経由で購読を解除できない場合に発生します。"
         email_not_allowed: "メールリストがホワイトリストにないか、ブラックリストに含まれている場合に発生します。"
       unrecognized_error: "不明なエラー"
-    secure_media_placeholder: "編集済み: このサイトではセキュリティで保護されたメディアが有効になっています。トピックにアクセスしたり、「メディアを表示」をクリックすると、添付されたメディアが表示されます。"
     view_redacted_media: "メディアを表示"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -190,7 +189,6 @@ ja:
       page_publishing_requirements: "セキュリティで保護されているメディアが有効である場合、ページの公開を有効にできません。"
       s3_backup_requires_s3_settings: "'%{setting_name}' が入力されていない場合、S3 をバックアップとして使用することはできません。"
       s3_bucket_reused: "'s3_upload_bucket' and 's3_backup_bucket' に同じバケットを使用することはできません。別のバケットを選択するか、バケットごとに異なるパスを使用してください。"
-      secure_media_requirements: "セキュリティで保護されたメディアを有効にする前に、S3 アップロードを有効にする必要があります。"
       share_quote_facebook_requirements: "Facebook に引用を共有できるようにするには、Facebook アプリの ID を設定する必要があります。"
       second_factor_cannot_enforce_with_socials: "ソーシャルログインが有効になっている状態で 2FA を適用することはできません。先に、%{auth_provider_names} でログインを無効にする必要があります。"
       second_factor_cannot_be_enforced_with_disabled_local_login: "ログインが無効になっている場合、2FA を適用することはできません。"
@@ -1858,9 +1856,6 @@ ja:
     delete_merged_stub_topics_after_days: "完全にマージされたスタブトピックを自動的に削除するまで待機する日数。0 に設定すると、スタブトピックは削除されません。"
     bootstrap_mode_min_users: "ブートストラップモードを無効にするために必要な最低ユーザー数 (0 に設定すると無効になります)"
     prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードできないようにする。"
-    secure_media: 'すべてのアップロード (画像、動画、音声、テキスト、pdf、zip など) へのアクセスを制限する。“login required” が有効である場合、ログイン済みのユーザーのみがアップロードにアクセスできます。そうでない場合は、個人メッセージと非公開カテゴリのメディアアップロードのアクセスのみが制限されます。警告: この設定は複雑であるため、管理を十分に理解している必要があります。詳細については、<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">メタに関するセキュリティで保護されたメディアのトピック</a>をご覧ください。'
-    secure_media_allow_embed_images_in_emails: "通常はメールで編集されるセキュリティで保護された画像のサイズが 'secure media max email embed image size kb' 設定よりも小さい場合、その埋め込みを許可する。"
-    secure_media_max_email_embed_image_size_kb: "'secure media allow embed in emails' 設定が有効である場合にメールに埋め込まれるセキュリティで保護された画像のサイズのカットオフ。その設定が有効でない場合、この設定の効果はありません。"
     slug_generation_method: "スラッグ生成方法を選択します。'encode' はパーセントエンコード文字列を生成します。'none'は、スラッグを無効にします。"
     enable_emoji: "絵文字を有効にする"
     enable_emoji_shortcuts: ":) :p :( などの一般的なスマイリーテキストは絵文字に変換されます"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index a3caeab54f..4a9a5172a3 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -125,7 +125,6 @@ ko:
         unsubscribe_not_allowed: "이 사용자에게 이메일을 통한 구독 취소가 허용되지 않은 경우 발생합니다."
         email_not_allowed: "이메일 주소가 화이트리스트에 없거나 블랙리스트에 있을 때 발생합니다."
       unrecognized_error: "인식되지 않은 오류"
-    secure_media_placeholder: "수정됨 :이 사이트에 보안 미디어가 활성화되어 있습니다. 주제를 방문하거나 미디어 보기를 클릭하여 첨부된 미디어를 확인하세요."
     view_redacted_media: "미디어 보기"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -189,7 +188,6 @@ ko:
       page_publishing_requirements: "보안 미디어를 활성화한 경우 페이지 게시를 활성화할 수 없습니다."
       s3_backup_requires_s3_settings: "'%{setting_name}' 설정을 제공하지 않으면 S3를 백업 위치로 사용할 수 없습니다."
       s3_bucket_reused: "'s3_upload_bucket' 및 's3_backup_bucket'에 동일한 버킷을 사용할 수 없습니다. 다른 버킷을 선택하거나 각 버킷에 다른 경로를 사용하세요."
-      secure_media_requirements: "보안 미디어를 활성화하기 전에 S3 업로드를 활성화해야 합니다."
       share_quote_facebook_requirements: "Facebook 인용 공유를 활성화하려면 Facebook 앱 ID를 설정해야 합니다."
       second_factor_cannot_enforce_with_socials: "소셜 로그인이 활성화된 상태에서는 2FA를 적용할 수 없습니다. 먼저 다음을 통해 로그인을 비활성화해야 합니다. %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "로컬 로그인이 비활성화된 경우 2FA를 적용할 수 없습니다."
@@ -1879,9 +1877,6 @@ ko:
     delete_merged_stub_topics_after_days: "완전히 병합된 스텁 주제를 자동으로 삭제하기 전에 대기할 일 수입니다. 스텁 주제를 삭제하지 않으려면 0으로 설정하세요."
     bootstrap_mode_min_users: "부트스트랩 모드를 비활성화하기 위한 최소 사용자 수(비활성화하려면 0으로 설정)"
     prevent_anons_from_downloading_files: "익명 사용자가 첨부 파일을 다운로드하지 못하도록 합니다."
-    secure_media: '모든 업로드(이미지, 비디오, 오디오, 텍스트, pdf, zip 및 기타)에 대한 액세스를 제한합니다. ''로그인 필요''가 활성화된 경우 로그인한 사용자만 업로드에 액세스할 수 있습니다. 그렇지 않으면 비공개 메시지 및 비공개 카테고리의 미디어 업로드에 대해서만 액세스가 제한됩니다. 경고: 이 설정은 복잡하며 관리에 대한 지식이 충분해야 합니다. 자세한 내용은 <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Meta의 보안 미디어 주제</a>를 참조하세요.'
-    secure_media_allow_embed_images_in_emails: "크기가 '보안 미디어 최대 이메일 임베드 이미지 크기 kb' 설정보다 작은 경우 일반적으로 이메일에서 수정되는 보안 이미지 임베드를 허용합니다."
-    secure_media_max_email_embed_image_size_kb: "'보안 미디어에서 이메일에 임베드 허용' 설정이 활성화된 경우 이메일에 임베드할 보안 이미지의 크기 컷오프입니다. 이 설정을 활성화하지 않으면 효과가 없습니다."
     slug_generation_method: "슬러그 생성 방법을 선택합니다. 'encoded'는 퍼센트 인코딩 스트링을 생성합니다. 'none'은 슬러그를 완전히 비활성화합니다."
     enable_emoji: "이모티콘 활성화"
     enable_emoji_shortcuts: ":) : p :( 같은 일반적인 스마일 텍스트는 이모티콘으로 변환됩니다."
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index 4b15a90956..6d1e414696 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -171,7 +171,6 @@ lt:
       enable_s3_uploads_is_required: "Negalite įgalinti S3 inventoriaus naudojimo, nebent įjungėte S3 įkėlimus."
       page_publishing_requirements: "Puslapio publikavimo įjungti negalima, jei įjungta saugi laikmena."
       s3_backup_requires_s3_settings: "Negalite naudoti S3 kaip atsarginės vietos, nebent nurodėte „%{setting_name}“."
-      secure_media_requirements: "Prieš įjungiant saugią laikmeną, turi būti įjungtas S3 įkėlimas."
       share_quote_facebook_requirements: "Jei norite įgalinti „Facebook“ citatų bendrinimą, turite nustatyti „Facebook“ programos ID."
       second_factor_cannot_be_enforced_with_disabled_local_login: "Negalite vykdyti 2FA, jei vietiniai prisijungimai išjungti."
       second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Negalite vykdyti 2FA, jei DiscoureConnect yra įjungtas."
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 27b0e59b9a..3b4ededa8b 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -120,7 +120,6 @@ nl:
         unsubscribe_not_allowed: "Gebeurt wanneer uitschrijven via e-mail niet is toegestaan voor deze gebruiker."
         email_not_allowed: "Gebeurt wanneer het e-mailadres zich niet op de acceptatielijst of wel op de blokkeerlijst bevindt."
       unrecognized_error: "Niet-herkende fout"
-    secure_media_placeholder: "Geredigeerd: deze website heeft beveiligde media ingeschakeld. Bezoek het topic of klik op Media weergeven om de bijgevoegde media te zien."
     view_redacted_media: "Media weergeven"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -188,7 +187,6 @@ nl:
       enable_s3_uploads_is_required: "U kunt geen inventory naar S3 inschakelen voordat u de S3-uploads hebt ingeschakeld."
       s3_backup_requires_s3_settings: "U kunt S3 niet als back-uplocatie gebruiken voordat u de '%{setting_name}' hebt opgegeven."
       s3_bucket_reused: "U kunt niet dezelfde bucket voor 's3_upload_bucket' en 's3_backup_bucket' gebruiken. Kies een andere bucket of gebruik een ander pad voor elke bucket."
-      secure_media_requirements: "S3-uploads moeten zijn ingeschakeld voordat u beveiligde media inschakelt."
       second_factor_cannot_be_enforced_with_disabled_local_login: "U kunt geen 2FA afdwingen als lokale aanmeldingen zijn uitgeschakeld."
       local_login_cannot_be_disabled_if_second_factor_enforced: "U kunt geen lokale aanmelding uitschakelen als 2FA is afgedwongen. Schakel afgedwongen 2FA uit voordat u lokale aanmeldingen uitschakelt."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "U kunt geen S3-uploads inschakelen, omdat S3-uploads al globaal zijn ingeschakeld, en inschakelen hiervan op websiteniveau kan kritieke problemen met uploads veroorzaken"
@@ -1750,7 +1748,6 @@ nl:
     show_create_topics_notice: "Als de website minder dan 5 publieke topics heeft, een melding tonen waarin beheerders wordt gevraagd een aantal topics te maken."
     delete_drafts_older_than_n_days: "Concepten ouder dan (n) dagen verwijderen."
     bootstrap_mode_min_users: "Minimale aantal vereiste gebruikers om bootstrapmodus uit te schakelen (stel dit in op 0 om uit te schakelen)"
-    secure_media: 'Beperkt toegang tot ALLE uploads (afbeeldingen, video, audio, tekst, pdf’s, zips en andere). Als ‘aanmelding vereist’ is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot uploads. Anders is toegang beperkt tot media-uploads in privéberichten en privécategorieën. WAARSCHUWING: deze instelling is complex en vereist grondige kennis van beheer. Zie <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">het topic over beveiligde media op Meta</a> voor details.'
     slug_generation_method: "Kies een slug-generatiemodus. 'encoded' genereert een percentage-coderingsstring. 'none' schakelt de slug helemaal uit."
     enable_emoji: "Emoji inschakelen"
     enable_emoji_shortcuts: "Gebruikelijke smileyteksten zoals :) :p :( worden naar emoji geconverteerd"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 60abac177f..d336e49acd 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -131,7 +131,6 @@ pl_PL:
         unsubscribe_not_allowed: "Zdarza się, kiedy anulowanie subskrypcji przez e‐mail nie jest dozwolone dla tego użytkownika."
         email_not_allowed: "Zdarza się, gdy adres e-mail nie znajduje się na liście dozwolonych adresów lub jest na liście zablokowanych."
       unrecognized_error: "Niezidentyfikowany błąd"
-    secure_media_placeholder: "Zredagowano: Ta strona posiada włączone zabezpieczone media, odwiedź wątek lub kliknij przycisk Zobacz media, aby zobaczyć załączone media."
     view_redacted_media: "Wyświetl załączniki"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -213,7 +212,6 @@ pl_PL:
       page_publishing_requirements: "Nie można włączyć publikowania stron, jeśli włączone są bezpieczne media."
       s3_backup_requires_s3_settings: "Nie możesz używać S3 do tworzenia kopii zapasowych bez podania \"%{setting_name}\"."
       s3_bucket_reused: "Nie możesz używać tego samego bucketu jako \"s3_upload_bucket\" i \"s3_backup_bucket\". Wybierz inny bucket albo podaj różne ścieżki dla każdego z bucketów."
-      secure_media_requirements: "Przesyłanie S3 musi być włączone przed włączeniem bezpiecznych mediów."
       share_quote_facebook_requirements: "Aby włączyć udostępnianie na Facebooku, musisz ustawić identyfikator aplikacji Facebook."
       second_factor_cannot_enforce_with_socials: "Nie można wymusić 2FA z włączonym logowaniu społecznościowym. Najpierw musisz wyłączyć logowanie przez: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Nie można wymusić 2FA, jeśli lokalne logowanie jest wyłączone."
@@ -2086,9 +2084,6 @@ pl_PL:
     delete_merged_stub_topics_after_days: "Liczba dni, po których wątki, z których zostały przeniesione wszystkie posty, zostaną automatycznie usunięte. Aby to wyłączyć, ustaw wartość na 0."
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
     prevent_anons_from_downloading_files: "Zablokuj możliwość pobierania załączników przez anonimowych użytkowników."
-    secure_media: 'Ogranicza dostęp do WSZYSTKICH przesłanych plików (obrazów, wideo, audio, tekstu, plików PDF, zip i innych). Jeśli opcja „wymagane logowanie” jest włączona, tylko zalogowani użytkownicy mają dostęp do przesyłanych plików. W przeciwnym razie dostęp będzie ograniczony tylko do przesłanych multimediów w wiadomościach prywatnych i kategoriach prywatnych. OSTRZEŻENIE: to ustawienie jest złożone i wymaga głębokiego zrozumienia administracyjnego. Zobacz <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ten artykuł</a>, aby dowiedzieć się więcej.'
-    secure_media_allow_embed_images_in_emails: "Umożliwia osadzanie bezpiecznych obrazów, które normalnie byłyby redagowane w wiadomościach e-mail, jeśli ich rozmiar jest mniejszy niż ustawienie'secure media max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "Limit rozmiaru dla zabezpieczonych obrazów, które zostaną osadzone w wiadomości e-mail, gdy włączone jest ustawienie 'secure media allow embed in emails'. Bez tego ustawienia podany limit nie ma zastosowania."
     slug_generation_method: "Wybierz metodę tworzenia ślimaka. 'Zakodowane\" stworzy procentowy ciąg kodujący, \"żadne\" wyłączy tą metodę."
     enable_emoji: "Włącz obsługę emoji"
     enable_emoji_shortcuts: "Typowe tekstowe buźki, takie jak :) :p :( zostaną przekonwertowane na emoji"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 285d769f38..e662bd4c83 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -124,7 +124,6 @@ pt:
         unsubscribe_not_allowed: "Acontece quando desubescrever via e-mail não é permitido para este utilizador."
         email_not_allowed: "Acontece quando o endereço de email não está na lista de permissões ou está na lista de bloqueio."
       unrecognized_error: "Erro Desconhecido"
-    secure_media_placeholder: "Editado: este site tem mídia segura habilitada, visite o tópico ou clique em Exibir Mídia para ver a mídia anexada."
     view_redacted_media: "Exibir media"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -194,7 +193,6 @@ pt:
       page_publishing_requirements: "A publicação de página não pode ser ativada se a media segura estiver ativada."
       s3_backup_requires_s3_settings: "Não pode utilizar S3 como local para cópia de segurança a não ser que providencie '%{setting_name}'."
       s3_bucket_reused: "Não pode utilizar o mesmo balde para 's3_upload_bucket' e 's3_backup_bucket'. Escolha um balde diferente ou use uma localização diferente para cada balde."
-      secure_media_requirements: "Envios para S3 deve estar ativado antes de ativar média segura."
       share_quote_facebook_requirements: "Você tem de definir um ID de Aplicação do Facebook para ativar a partilha de citações para o Facebook."
       second_factor_cannot_enforce_with_socials: "Você não pode aplicar o 2FA com logins sociais ativados. Você tem primeiro de desativar o login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Não pode forçar 2FA se logins locais estiver desativado."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 1fe1f5483b..b346ab55e7 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -130,7 +130,6 @@ pt_BR:
         unsubscribe_not_allowed: "Ocorre quando não é permitido cancelar a associação por e-mail para este(a) usuário(a)"
         email_not_allowed: "Acontece quando o endereço de e-mail não está na lista de permissões ou está na lista de proibições."
       unrecognized_error: "Erro desconhecido"
-    secure_media_placeholder: "Redigido: este site tem mídias seguras ativada, acesse o tópico ou clique em Visualizar mídias para exibir as mídias anexas."
     view_redacted_media: "Exibir mídias"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -200,7 +199,6 @@ pt_BR:
       page_publishing_requirements: "A publicação da página não pode ser ativada se houver mídias seguras ativadas."
       s3_backup_requires_s3_settings: "Você não pode usar o S3 como local de backup, a não ser que você tenha informado o \"%{setting_name}\"."
       s3_bucket_reused: "Você não pode usar o mesmo bucket para \"s3_upload_bucket\" e \"s3_backup_bucke\"'. Escolha um bucket diferente ou use um caminho diferente para cada bucket."
-      secure_media_requirements: "Envios S3 devem ser ativados antes da mídia segura."
       share_quote_facebook_requirements: "É preciso definir uma id do app Facebook para permitir o compartilhamento de citação para Facebook."
       second_factor_cannot_enforce_with_socials: "Você não pode aplicar 2FA com entrada com contas de redes sociais ativada. Primeiro você deve desativar a entrada com conta via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Você não pode impor a 2FA se a autenticação local estiver desativada."
@@ -1975,9 +1973,6 @@ pt_BR:
     delete_merged_stub_topics_after_days: "Quantidade de dias para aguardar antes de excluir automaticamente tópicos de stub totalmente mesclados. Defina para 0 para nunca excluir tópicos de stub."
     bootstrap_mode_min_users: "Quantidade mínima de usuários(as) necessários(as) para desativar o modo de inicialização (defina como 0 para desativar)"
     prevent_anons_from_downloading_files: "Impeça que usuários(as) anônimos(as) baixem anexos."
-    secure_media: 'Limita acesso a TODOS os envios (imagens, vídeo, áudio, texto, pdfs, zips e muito mais). Se “É necessário entrar com a conta” estiver ativado, apenas usuários(as) que entraram com a conta podem acessar os envios. Caso contrário, o acesso será limitado apenas a envios de mídias em mensagens e categorias privadas. AVISO: esta configuração é complexa e requer conhecimento de administração. Consulte <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">o tópico de mídias seguras em Meta</a> para obter detalhes.'
-    secure_media_allow_embed_images_in_emails: "Permite incorporação de imagens seguras que geralmente seriam escritas em e-mails, caso seu tamanho seja menor do que a configuração \"tamanho máx. de imagem incorporada no e-mail, em KB\"."
-    secure_media_max_email_embed_image_size_kb: "A redução de tamanho para imagens seguras que serão incorporadas nos e-mails se a configuração \"Permissão de incorporação de mídias seguras no e-mail\". Caso não esteja ativada, esta configuração não terá efeito."
     slug_generation_method: "Escolha um método para geração de slug. \"Codificado\" irá gerar linhas com \"%\". 'Nenhum\" irá desativar a geração de slugs."
     enable_emoji: "Ativar emoji"
     enable_emoji_shortcuts: "Texto com carinhas comuns como :): p :( será convertido em emojis"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 58caa776eb..e1ed333976 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -132,7 +132,7 @@ ru:
         unsubscribe_not_allowed: "Происходит, когда отписка по электронной почте не разрешена для этого пользователя."
         email_not_allowed: "Происходит, когда адрес электронной почты отсутствует в белом или чёрном списке."
       unrecognized_error: "Неопознанная ошибка"
-    secure_media_placeholder: "На сайте включено ограничение доступа к мультимедийному контенту. Для просмотра файлов откройте эту тему на сайте как авторизованный пользователь или нажмите на 'Просмотр вложений'."
+    secure_uploads_placeholder: "На сайте включено ограничение доступа к загружаемому контенту. Для просмотра вложений откройте эту тему на сайте или нажмите на 'Просмотр вложений'."
     view_redacted_media: "Просмотр вложений"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -214,7 +214,7 @@ ru:
       page_publishing_requirements: "Публикация страниц не может быть включена при включённом ограничении доступа к мультимедийному контенту."
       s3_backup_requires_s3_settings: "Нельзя включить резервные копии на S3, пока не задана настройка '%{setting_name}'"
       s3_bucket_reused: "Нельзя использовать одну и ту же корзину для 's3_upload_bucket' и 's3_backup_bucket'. Выберите другую корзину или используйте различные пути для каждой корзины."
-      secure_media_requirements: "Перед включением ограничения доступа к мультимедийному контенту необходимо включить загрузки в хранилище S3."
+      secure_uploads_requirements: "Перед тем как ограничить доступ к загружаемому контенту, необходимо включить загрузку в S3"
       share_quote_facebook_requirements: "Вы должны установить идентификатор приложения, чтобы включить обмен цитатами для Фейсбука."
       second_factor_cannot_enforce_with_socials: "Вы не можете применить двухфакторную аутентификацию при включённом входе в социальные сети. Сначала вы должны отключить вход через: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Вы не можете применить двухфакторную аутентификацию, если локальный вход в систему отключён."
@@ -265,6 +265,9 @@ ru:
       invalid_access: "У вас нет прав для просмотра запрашиваемого ресурса."
     requires_groups: "Приглашение не сохранено, потому что указанная тема недоступна. Добавьте одну из следующих групп: %{groups}."
     domain_not_allowed: "Ваш адрес электронной почты не может быть использован для активации этого приглашения."
+    max_redemptions_allowed_one: "Для приглашений по электронной почте значение должно быть равно '1'."
+    redemption_count_less_than_max: "Значение должно быть меньше %{max_redemptions_allowed}"
+    email_xor_domain: "Одновременное указание домена и адреса электронной почты не допускается"
   bulk_invite:
     file_should_be_csv: "Загружаемый файл должен быть в csv-формате."
     max_rows: "Первые %{max_bulk_invites} приглашения были отправлены. Попробуйте разделить файл на более мелкие части."
@@ -1979,6 +1982,7 @@ ru:
     raw_email_max_length: "Максимальное количество символов, сохраняющихся в сообщениях входящей электронной почты."
     raw_rejected_email_max_length: "Максимальное количество символов, сохраняющихся в отклонённых сообщениях входящей электронной почты."
     delete_rejected_email_after_days: "Удалять отклонённые письма старше указанного здесь количества дней."
+    require_change_email_confirmation: "Требовать от обычных пользователей подтверждения старого адреса электронной почты перед его изменением. Не относится к сотрудникам, им всегда необходимо подтверждать старый адрес электронной почты."
     manual_polling_enabled: "Отправлять электронную почту, используя API для ответов."
     pop3_polling_enabled: "Загружать ответы на форум в виде писем с учетной записи POP3."
     pop3_polling_ssl: "Использовать SSL при подключении к POP3-серверу. (Рекомендуется)"
@@ -2057,6 +2061,7 @@ ru:
     enable_mobile_theme: "Мобильные устройства используют специальную тему с возможностью переключения в обычный вид. Отключите данную настройку, если вы хотите использовать специально адаптированный стиль для мобильных устройств."
     dominating_topic_minimum_percent: "Какой процент сообщений в одной теме могут составлять сообщения одного пользователя, прежде чем ему будет показано предупреждение о слишком большой активности в теме."
     disable_avatar_education_message: "Отключить обучающее сообщение при смене аватара."
+    pm_warn_user_last_seen_months_ago: "При создании нового личного сообщения предупреждать автора сообщения, если получатель сообщения не был замечен на форуме более указанного здесь количества месяцев назад."
     suppress_uncategorized_badge: "Не показывать награду в списках тем для тех тем, которые находятся в разделе РАЗНОЕ."
     header_dropdown_category_count: "Максимальное количество разделов, отображаемых в выпадающем меню заголовка."
     permalink_normalizations: "Применять указанное регулярное выражение перед поиском соответствий в постоянных ссылках, например, выражение: /(topic.*)\\?.*/\\1 удалит подстроку запроса из ссылок. \nИспользование: регулярное выражение + строка. Используйте \\1 и т. д. для доступа к захватам"
@@ -2104,9 +2109,12 @@ ru:
     delete_merged_stub_topics_after_days: "Количество дней, после которого темы, из которых были перемещены все сообщения, будут автоматически удалены. Для отключения параметра установите значение в 0."
     bootstrap_mode_min_users: "Минимальное количество пользователей, необходимое для отключения специального режима (Для отключения этого параметра установите значение в 0)"
     prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложения."
-    secure_media: 'Ограничивать доступ ко ВСЕМ загрузкам (изображения, видео, аудио, текст, PDF, ZIP-файлы и другие). Только зарегистрированные пользователи будут получать доступ к загрузкам. При отключённом параметре загрузки будут недоступны только в личных сообщениях и в закрытых разделах форума. ВНИМАНИЕ: Этот сложный параметр и администратор, используя его, должен отдавать себе отчёт в своих действиях. См. тему <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Secure Media Uploads</a>.'
-    secure_media_allow_embed_images_in_emails: "Разрешать встраивать изображения с ограниченным доступом в письма, если их размер не превышает значения, указанного в параметре 'secure_media_max_email_embed_image_size_kb'."
-    secure_media_max_email_embed_image_size_kb: "Количество килобайт, до которого будет уменьшен размер встроенных в письма изображений с ограниченным доступом, если включён параметр 'secure_media_allow_embed_images_in_emails'."
+    secure_media: 'УСТАРЕЛО: параметр будет удалён в Discourse 3.0, вместо него используйте параметр ''secure_uploads_max_email_embed_image_size_kb''.'
+    secure_uploads: 'Ограничивать доступ ко ВСЕМ загрузкам (изображения, видео, аудио, текст, PDF, ZIP-файлы и другие). Только зарегистрированные пользователи будут получать доступ к загрузкам. При отключённом параметре загрузки будут недоступны только в личных сообщениях и в закрытых разделах форума. ВНИМАНИЕ: Этот сложный параметр и администратор, используя его, должен отдавать себе отчёт в своих действиях. См. тему <a target="_blank" href="https://meta.discourse.org/t/-/140017">Secure Media Uploads</a>.'
+    secure_media_allow_embed_images_in_emails: "УСТАРЕЛО: параметр будет удалён в Discourse 3.0, вместо него используйте параметр 'secure_uploads_allow_embed_images_in_emails' ."
+    secure_uploads_allow_embed_images_in_emails: "Разрешать встраивать изображения с ограниченным доступом в письма, если их размер не превышает значения, указанного в параметре 'secure uploads max email embed image size kb'."
+    secure_media_max_email_embed_image_size_kb: "УСТАРЕЛО: параметр будет удалён в Discourse 3.0, вместо него используйте параметр 'secure_uploads_max_email_embed_image_size_kb'."
+    secure_uploads_max_email_embed_image_size_kb: "Количество килобайт, до которого будет уменьшен размер встроенных в письма изображений с ограниченным доступом, если включён параметр 'secure uploads allow embed in emails'."
     slug_generation_method: "Метод создания <a href='https://ru.wikipedia.org/wiki/Семантический_URL' target='_blank'>слагов</a>. При выборе 'encoded' будет выполняться процентное кодирование строки. При выборе 'none' слаги создаваться не будут."
     enable_emoji: "Использовать смайлы (эмодзи)"
     enable_emoji_shortcuts: "Текстовая альтернатива смайлика, например, сочетания :), :p или :( - будет преобразовываться в полноценный смайлик"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 0320f89df4..cf2737ff80 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -130,7 +130,7 @@ sv:
         unsubscribe_not_allowed: "Det händer när avprenumeration via e-post inte tillåts för den här användaren."
         email_not_allowed: "Händer när e-postadressen inte står på vitlistan eller om den står på svartlistan."
       unrecognized_error: "Okänt fel"
-    secure_media_placeholder: "Redigerad: Denna webbplats har säkerhet för medier aktiverad, gå till ämnet eller klicka på \"Visa media\" för att se bifogade medier."
+    secure_uploads_placeholder: "Redigerad: Denna webbplats har säkerhet för uppladdningar aktiverad, gå till ämnet eller klicka på \"Visa media\" för att se bifogade uppladdningar."
     view_redacted_media: "Visa media"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -200,7 +200,6 @@ sv:
       page_publishing_requirements: "Sidpublicering kan inte aktiveras om säkra medier är aktiverade."
       s3_backup_requires_s3_settings: "Du kan inte använda S3 som säkerhetskopieringsplats innan du har angivit '%{setting_name}'."
       s3_bucket_reused: "Du kan inte använda samma behållare för 's3_upload_bucket' och 's3_backup_bucket'. Välj en annan behållare eller använd en annan sökväg för varje behållare."
-      secure_media_requirements: "S3-uppladdningar måste ha aktiverats innan du aktiverar säkra medier."
       share_quote_facebook_requirements: "Du måste ange ett Facebook-app-id för att möjliggöra delning av citat på Facebook."
       second_factor_cannot_enforce_with_socials: "Du kan inte tvinga 2FA med sociala inloggningar aktiverade. Du måste först inaktivera inloggning via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan inte genomdriva 2FA om lokala inloggningar är inaktiverade."
@@ -1996,9 +1995,7 @@ sv:
     delete_merged_stub_topics_after_days: "Antal dagar att vänta innan helt sammanslagna stub-ämnen raderas automatiskt. Ställ in till 0 för att aldrig radera stub-ämnen."
     bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
     prevent_anons_from_downloading_files: "Förhindra att anonyma användare hämtar bilagor."
-    secure_media: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf, zip med flera). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Se detaljer i <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ämnet för säkra media i Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "Gör det möjligt att bädda in säkra bilder som normalt skulle begränsas i e-postmeddelanden, under förutsättning att deras storlek är mindre än inställningen för säkra medias maxstorlek för inbäddning av bild, 'secure media max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "Storleksbegränsningen för säkra bilder som kommer att bäddas in i e-postmeddelanden om inställningen för att tillåta inbäddningar för säkra media i e-post är aktiverad, 'secure media allow embed in emails' . Om inställningen inte är aktiverad har den här inställningen ingen effekt."
+    secure_media_allow_embed_images_in_emails: "UTFASAT: Använd secure_uploads_allow_embed_images_in_emails, kommer att tas bort i Discourse 3.0."
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
     enable_emoji: "Aktivera emoji"
     enable_emoji_shortcuts: "Vanlig smileytext som :): p :( kommer att konverteras till emojier"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 5cd36a9e6a..01cd18c13d 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -130,7 +130,6 @@ tr_TR:
         unsubscribe_not_allowed: "Bu kullanıcı için e-posta aboneliği iptal edilmiş."
         email_not_allowed: "E-posta adresi izin verilenler listesinde olmadığında veya engellenenler listesinde olduğunda gerçekleşir."
       unrecognized_error: "Bilinmeyen Hata"
-    secure_media_placeholder: "Düzeltildi: Bu site güvenli medyayı etkinleştirdi, konuyu ziyaret edin veya ekli medyayı görmek için Medyayı Görüntüle'yi tıklayın."
     view_redacted_media: "Medyayı Görüntüle"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -200,7 +199,6 @@ tr_TR:
       page_publishing_requirements: "Güvenli ortam etkinleştirilirse sayfa yayınlama etkinleştirilemez."
       s3_backup_requires_s3_settings: "'%{setting_name} verisini sağlamadıysanız S3'ü yedekleme konumu olarak kullanamazsınız."
       s3_bucket_reused: "Aynı sepeti 's3_upload_bucket' ve 's3_backup_bucket' için kullanamazsınız. Farklı bir sepet seçin veya her sepet için farklı bir yol kullanın."
-      secure_media_requirements: "Güvenli medyayı etkinleştirmeden önce S3 yüklemelerinin etkinleştirilmesi gerekir."
       share_quote_facebook_requirements: "Facebook paylaşımını etkinleştirmek için bir Facebook uygulaması kimliği ayarlamanız gerekir."
       second_factor_cannot_enforce_with_socials: "Sosyal oturum açma etkinken 2FA'yı zorunlu kılamazsınız. Önce şu yollarla oturum açmayı devre dışı bırakmalısınız: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Yerel girişler devre dışı bırakılmışsa 2FA'yı uygulayamazsınız."
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 97ebaddee6..5e18d0ba2d 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -131,7 +131,6 @@ uk:
         unsubscribe_not_allowed: "Буває, коли відписка через електронну пошту не дозволена для цього користувача."
         email_not_allowed: "Буває, коли адреса електронної пошти відсутня в білому або чорному списку."
       unrecognized_error: "Невідома помилка"
-    secure_media_placeholder: "На цьому сайті увімкнено захищений доступ до мультимедійного контенту. Щоб переглянути файли, авторизуйтесь на сайті та увійшовши в цю тему натисніть \"Переглянути вкладення\"."
     view_redacted_media: "Перегляд вкладень"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -213,7 +212,6 @@ uk:
       page_publishing_requirements: "Публікація сторінки не може бути ввімкнена якщо обмежено доступ до медіа контенту."
       s3_backup_requires_s3_settings: "Ви не можете використовувати S3 як резервне розташування, якщо ви не вказали '%{setting_name}'."
       s3_bucket_reused: "Не можна використовувати одне й те саме bucket для 's3_upload_bucket' та 's3_backup_bucket'. Виберіть інше bucket або використовуйте інший шлях для кожного bucket."
-      secure_media_requirements: "Спочатку потрібно увімкнути захист файлів для завантаження S3."
       share_quote_facebook_requirements: "Ви повинні встановити ідентифікатор додатка Facebook, щоб увімкнути обмін цитатами для Facebook."
       second_factor_cannot_enforce_with_socials: "Ви не можете примусово активувати двофакторну автентифікацію через вхід у соціальні мережі. Спочатку потрібно вимкнути вхід через: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Ви не можете застосувати 2FA, якщо локальні входи відключені."
@@ -2092,9 +2090,6 @@ uk:
     delete_merged_stub_topics_after_days: "Кількість днів очікування до автоматичного видалення тем, з яких переміщено всі повідомлення. Встановіть 0, щоб ніколи не видаляти теми-заглушки."
     bootstrap_mode_min_users: "Мінімальна кількість користувачів, необхідних для відключення режиму початкового налаштування (встановлено 0 для відключення)"
     prevent_anons_from_downloading_files: "Заборонити анонімним користувачам завантажувати вкладення."
-    secure_media: 'Обмежити доступ до УСІХ завантажень (зображень, відео, аудіо, тексту, PDF-файлів, архівів та інших). Якщо ввімкнено параметр «Потрібний вхід», доступ до завантажень мають лише користувачі, які ввійшли в систему. В іншому випадку доступ буде обмежено лише для медіа-завантажень у приватних повідомленнях та приватних категоріях. ПОПЕРЕДЖЕННЯ. Цей параметр є складним і вимагає глибокого адміністративного розуміння. Дивіться тему <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Secure Media Uploads</a> для отримання детальної інформації.'
-    secure_media_allow_embed_images_in_emails: "Дозволяти вбудовувати зображення з обмеженим доступом до листів, якщо їх розмір не перевищує значення, вказаного у параметрі 'secure_media_max_email_embed_image_size_kb'."
-    secure_media_max_email_embed_image_size_kb: "Кількість кілобайт, до якого буде зменшено розмір вбудованих у листи зображень з обмеженим доступом, якщо увімкнено параметр 'secure_media_allow_embed_images_in_emails'."
     slug_generation_method: "Виберіть спосіб генерації slug (рядок ідентифікатор). 'закодований' буде генерувати рядок закодований з %. 'none' зовсім вимкне slug."
     enable_emoji: "Увімкнути іконки emoji"
     enable_emoji_shortcuts: "Поширений смайлик, наприклад :): p :( буде перетворений на emoji"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 98036ee9b4..53d19f8ae6 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -128,7 +128,6 @@ ur:
         unsubscribe_not_allowed: "ہو جاتا ہے جب اِس صارف کیلئے ای میل کے ذریعے سبسکرِپشن ختم کرنے کی اجازت نہ ہو۔"
         email_not_allowed: "ایسا ہوتا ہے جب ای میل ایڈریس اجازت یافتہ فہرست میں نہ ہو یا بلاک لسٹ میں ہو۔"
       unrecognized_error: "نامعلوم خرابی"
-    secure_media_placeholder: "ریڈیکٹڈ: اس سائٹ پر محفوظ میڈیا فعال ہے، موضوع ملاحظہ کریں یا منسلک میڈیا کو دیکھنے کے لیے میڈیا دیکھیں پر کلک کریں۔"
     view_redacted_media: "میڈیا دیکھیں"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -198,7 +197,6 @@ ur:
       page_publishing_requirements: "اگر محفوظ میڈیا فعال ہو تو صفحہ کی اشاعت کو فعال نہیں کیا جا سکتا۔"
       s3_backup_requires_s3_settings: "آپ S3 کو بیک اپ کے طور پر استعمال نہیں کرسکتے جب تک کہ آپ نے '%{setting_name}' فراہم نہیں کیا ہو۔"
       s3_bucket_reused: "آپ 's3_upload_bucket' اور 's3_backup_bucket' کیلئے ایک ہی بَکِّٹ کا استعمال نہیں کرسکتے۔ ایک مختلف بَکِّٹ کا انتخاب کریں یا ہر بَکِّٹ کیلئے ایک مختلف راستہ استعمال کریں۔"
-      secure_media_requirements: "محفوظ میڈیا کو فعال کرنے سے پہلے S3 اپ لوڈز کا فعال ہونا ضروری ہے۔"
       share_quote_facebook_requirements: "فیس بک کے لیے اِقْتِباس شیئرنگ کو فعال کرنے کے لیے آپ کو فیس بک ایپ آئی ڈی سیٹ کرنی ہوگی۔"
       second_factor_cannot_enforce_with_socials: "آپ سوشل لاگ ان کے فعال ہونے کے ساتھ 2FA نافذ نہیں کر سکتے۔ آپ کو پہلے لاگ ان کو غیر فعال کرنا ہوگا بذریعہ: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "اگر مقامی لاگ ان غیر فعال ہیں تو آپ 2FA نافذ نہیں کر سکتے۔"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index d71343b350..ad7817e073 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -129,7 +129,6 @@ zh_CN:
         unsubscribe_not_allowed: "当不允许此用户通过电子邮件退订时，就会发生这种情况。"
         email_not_allowed: "当电子邮件地址不在许可名单中或位于屏蔽名单中时，就会发生这种情况。"
       unrecognized_error: "无法识别的错误"
-    secure_media_placeholder: "已遮盖：此站点已启用安全媒体，请访问话题或点击“查看媒体”以查看附加的媒体。"
     view_redacted_media: "查看媒体"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -193,7 +192,7 @@ zh_CN:
       page_publishing_requirements: "如果启用了安全媒体，则无法启用页面发布。"
       s3_backup_requires_s3_settings: "除非提供 '%{setting_name}'，否则无法将 S3 用作备份位置。"
       s3_bucket_reused: "您无法将同一个存储桶同时用作 's3_upload_bucket' 和 's3_backup_bucket'。请选择一个不同的存储桶或为每个存储桶使用不同的路径。"
-      secure_media_requirements: "在启用安全媒体之前，必须启用 S3 上传。"
+      secure_uploads_requirements: "在启用安全上传之前，必须先启用 S3 上传。"
       share_quote_facebook_requirements: "您必须设置 Facebook 应用 ID 才能为 Facebook 启用引用共享。"
       second_factor_cannot_enforce_with_socials: "您无法在启用社交登录的情况下强制执行双重身份验证。您必须首先通过以下方式禁用登录：%{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录，则无法强制执行双重身份验证。"
@@ -238,6 +237,9 @@ zh_CN:
       invalid_access: "您没有权限查看请求的资源。"
     requires_groups: "邀请未保存，因为指定的话题无法访问。需要添加以下群组之一： %{groups}。"
     domain_not_allowed: "您的电子邮件域名不符合邀请条件。"
+    max_redemptions_allowed_one: "对于电子邮件邀请，应为 1。"
+    redemption_count_less_than_max: "应小于 %{max_redemptions_allowed}。"
+    email_xor_domain: "电子邮件和域名字段不允许同时出现"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     max_rows: "前 %{max_bulk_invites} 个邀请已发出。尝试将文件拆分成更小的部分。"
@@ -1822,6 +1824,7 @@ zh_CN:
     raw_email_max_length: "应为传入电子邮件存储的字符数。"
     raw_rejected_email_max_length: "应为被拒的传入电子邮件存储的字符数。"
     delete_rejected_email_after_days: "删除超过 (n) 天的被拒电子邮件。"
+    require_change_email_confirmation: "要求非管理人员用户在改变他们的旧电子邮件地址之前确认他们的旧电子邮件地址。不适用于管理人员用户，他们总是需要确认他们的旧电子邮件地址。"
     manual_polling_enabled: "使用 API 推送电子邮件以进行电子邮件回复。"
     pop3_polling_enabled: "通过 POP3 轮询以进行电子邮件回复。"
     pop3_polling_ssl: "连接到 POP3 服务器时使用 SSL。（推荐）"
@@ -1900,6 +1903,7 @@ zh_CN:
     enable_mobile_theme: "移动设备使用适合移动设备的主题，并且可以切换到完整站点。如果您想使用完全自适应的自定义样式表，请禁用此选项。"
     dominating_topic_minimum_percent: "在被提醒过度主导某个话题之前，用户必须在某个话题中发布的帖子所占的百分比。"
     disable_avatar_education_message: "禁用更改头像的教育消息。"
+    pm_warn_user_last_seen_months_ago: "在创建新的 PM 时，如果目标接收者超过 n 个月前未看到，则会警告用户。"
     suppress_uncategorized_badge: "不在话题列表中显示未分类话题的徽章。"
     header_dropdown_category_count: "标题下拉菜单中可以显示的类别数量。"
     permalink_normalizations: "在匹配永久链接之前应用以下正则表达式，例如：/(topic.*)\\?.*/\\1 将从话题路由中去除查询字符串。格式为正则表达式+字符串。使用 \\1 等访问捕获"
@@ -1947,9 +1951,7 @@ zh_CN:
     delete_merged_stub_topics_after_days: "在自动删除完全合并的存根话题之前等待的天数。设置为 0 将从不删除存根话题。"
     bootstrap_mode_min_users: "禁用引导模式所需的最小用户数（设置为 0 将禁用）"
     prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
-    secure_media: '限制对所有上传（图片、视频、音频、文本、pdf、zip 等）的访问。如果启用“需要登录”，则只有登录用户才能访问上传。否则，访问将仅限于私信和不公开类别中的媒体上传。警告：此设置比较复杂，需要深入理解管理操作。请参阅 <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Meta 安全媒体话题</a>以了解详情。'
-    secure_media_allow_embed_images_in_emails: "如果小于 'secure media max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全图片。"
-    secure_media_max_email_embed_image_size_kb: "如果启用了 'secure media allow embed in emails' 设置，将被嵌入到电子邮件的安全图片的大小限制；如果不启用，则此设置无效。"
+    secure_media: '已弃用：改用 secure_uploads 设置，将在 Discourse 3.0 中删除。'
     slug_generation_method: "选择一种缩略名生成方法。'encoded' 将生成百分比编码字符串。'none' 将完全禁用缩略名。"
     enable_emoji: "启用表情符号"
     enable_emoji_shortcuts: "常见的笑脸文字（如 :) :p :(）将被转换为表情符号"

From 94aba90c56056654915d1c0a813bb11aa36fd580 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 5 Oct 2022 13:38:41 -0300
Subject: [PATCH 057/332] DEV: Delete reviewable associations when deleting
 (#18472)

---
 app/models/reviewable.rb       | 4 ++--
 spec/models/reviewable_spec.rb | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index b955e77af0..13a15fe922 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -28,8 +28,8 @@ class Reviewable < ActiveRecord::Base
   belongs_to :topic
   belongs_to :category
 
-  has_many :reviewable_histories
-  has_many :reviewable_scores, -> { order(created_at: :desc) }
+  has_many :reviewable_histories, dependent: :destroy
+  has_many :reviewable_scores, -> { order(created_at: :desc) }, dependent: :destroy
 
   enum :status, {
     pending: 0,
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 53a6bcd252..0334b66f34 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -7,6 +7,9 @@ RSpec.describe Reviewable, type: :model do
 
     let(:reviewable) { Fabricate.build(:reviewable, created_by: admin) }
 
+    it { is_expected.to have_many(:reviewable_scores).dependent(:destroy) }
+    it { is_expected.to have_many(:reviewable_histories).dependent(:destroy) }
+
     it "can create a reviewable object" do
       expect(reviewable).to be_present
       expect(reviewable.pending?).to eq(true)

From 15f192447b858ef530291683535e43a9cca2468c Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 5 Oct 2022 10:33:08 -0700
Subject: [PATCH 058/332] FIX: Ability to trigger emoji after indented code
 block  (#18478)

---
 .../discourse/app/lib/utilities.js            | 22 +++++++++----------
 .../tests/unit/lib/utilities-test.js          | 11 +++++++---
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 9f5b02fac4..6af92d705a 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -460,18 +460,18 @@ export function postRNWebviewMessage(prop, value) {
 }
 
 const CODE_BLOCKS_REGEX =
-  /^(    |\t).*|`[^`]+`|^```[^]*?^```|\[code\][^]*?\[\/code\]/gm;
-//                        |      ^     |   ^   |      ^      |           ^           |
-//                               |         |          |                  |
-//                               |         |          |       code blocks between [code]
-//                               |         |          |
-//                               |         |          +--- code blocks between three backticks
-//                               |         |
-//                               |         +----- inline code between backticks
-//                               |
-//                               +------- paragraphs starting with 4 spaces or tab
+  /^(  |\t).*|`[^`]+`|^```[^]*?^```|\[code\][^]*?\[\/code\]/gm;
+//|    ^     |   ^   |      ^      |           ^           |
+//     |         |          |                  |
+//     |         |          |       code blocks between [code]
+//     |         |          |
+//     |         |          +--- code blocks between three backticks
+//     |         |
+//     |         +----- inline code between backticks
+//     |
+//     +------- paragraphs starting with 2 spaces or tab
 
-const OPEN_CODE_BLOCKS_REGEX = /`[^`]+|^```[^]*?|\[code\][^]*?/gm;
+const OPEN_CODE_BLOCKS_REGEX = /^(  |\t).*|`[^`]+|^```[^]*?|\[code\][^]*?/gm;
 
 export function inCodeBlock(text, pos) {
   let end = 0;
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index c2b0c40dd8..2aa232f678 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -271,18 +271,23 @@ discourseModule("Unit | Utilities", function () {
 
   test("inCodeBlock", function (assert) {
     const texts = [
-      // closed code blocks
+      // CLOSED CODE BLOCKS:
       "000\n\n    111\n\n000",
       "000 `111` 000",
       "000\n```\n111\n```\n000",
       "000\n[code]111[/code]\n000",
-      // open code blocks
+      // OPEN CODE BLOCKS:
       "000\n\n    111",
       "000 `111",
       "000\n```\n111",
       "000\n[code]111",
-      // complex test
+      // COMPLEX TEST:
       "000\n\n```\n111\n```\n\n000\n\n`111 111`\n\n000\n\n[code]\n111\n[/code]\n\n    111\n\t111\n\n000`111",
+      // INDENTED OPEN CODE BLOCKS:
+      // - Using tab
+      "000\n\t```111\n\t111\n\t111```\n000",
+      // - Using spaces
+      `000\n  \`\`\`111\n  111\n  111\`\`\`\n000`,
     ];
 
     texts.forEach((text) => {

From 4d8011032ef21b8707ff3d3313a3420e1f0bc2f9 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 5 Oct 2022 15:22:16 -0400
Subject: [PATCH 059/332] DEV: Add a rake task to export/import translation
 overrides (#18487)

Use `bin/rake export:translation_overrides` to export to a file. Then,
copy that file to a new site and run `bin/rake import:file["filename"].
---
 lib/import_export.rb                          |  4 ++++
 lib/import_export/base_exporter.rb            |  6 +++++
 lib/import_export/importer.rb                 | 14 +++++++++++
 .../translation_overrides_exporter.rb         | 24 +++++++++++++++++++
 lib/tasks/export.rake                         |  8 +++++++
 spec/fixtures/json/import-export.json         |  3 +++
 spec/import_export/importer_spec.rb           |  1 +
 7 files changed, 60 insertions(+)
 create mode 100644 lib/import_export/translation_overrides_exporter.rb

diff --git a/lib/import_export.rb b/lib/import_export.rb
index 6a32d686f1..13d2b5eddf 100644
--- a/lib/import_export.rb
+++ b/lib/import_export.rb
@@ -6,6 +6,7 @@ require "import_export/category_structure_exporter"
 require "import_export/category_exporter"
 require "import_export/topic_exporter"
 require "import_export/group_exporter"
+require "import_export/translation_overrides_exporter"
 require "json"
 
 module ImportExport
@@ -31,4 +32,7 @@ module ImportExport
     ImportExport::GroupExporter.new(include_users).perform.save_to_file(filename)
   end
 
+  def self.export_translation_overrides(filename = nil)
+    ImportExport::TranslationOverridesExporter.new.perform.save_to_file(filename)
+  end
 end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index 5a7f4a6195..989b7220e4 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -178,6 +178,12 @@ module ImportExport
       data
     end
 
+    def export_translation_overrides
+      @export_data[:translation_overrides] = TranslationOverride.all.select(:locale, :translation_key, :value)
+
+      self
+    end
+
     def default_filename_prefix
       raise "Overwrite me!"
     end
diff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rb
index a800b45d9b..c9d03030a1 100644
--- a/lib/import_export/importer.rb
+++ b/lib/import_export/importer.rb
@@ -10,6 +10,7 @@ module ImportExport
       @groups = data[:groups]
       @categories = data[:categories]
       @topics = data[:topics]
+      @translation_overrides = data[:translation_overrides]
 
       # To support legacy `category_export` script
       if data[:category].present?
@@ -25,6 +26,7 @@ module ImportExport
       import_groups
       import_categories
       import_topics
+      import_translation_overrides
 
       self
     ensure
@@ -167,6 +169,18 @@ module ImportExport
       self
     end
 
+    def import_translation_overrides
+      return if @translation_overrides.blank?
+
+      puts "Importing translation overrides..."
+
+      @translation_overrides.each do |tu|
+        TranslationOverride.upsert!(tu[:locale], tu[:translation_key], tu[:value])
+      end
+
+      TranslationOverride.reload_all_overrides!
+    end
+
     def new_user_id(external_user_id)
       ucf = UserCustomField.where(name: "import_id", value: "#{external_user_id}#{import_source}").first
       ucf ? ucf.user_id : Discourse::SYSTEM_USER_ID
diff --git a/lib/import_export/translation_overrides_exporter.rb b/lib/import_export/translation_overrides_exporter.rb
new file mode 100644
index 0000000000..7094248a99
--- /dev/null
+++ b/lib/import_export/translation_overrides_exporter.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ImportExport
+  class TranslationOverridesExporter < BaseExporter
+
+    def initialize()
+      @export_data = {
+        translation_overrides: []
+      }
+    end
+
+    def perform
+      puts "Exporting all translation overrides...", ""
+      export_translation_overrides
+
+      self
+    end
+
+    def default_filename_prefix
+      "translation-overrides"
+    end
+
+  end
+end
diff --git a/lib/tasks/export.rake b/lib/tasks/export.rake
index 1e58a3f9a8..1b4a63ed2f 100644
--- a/lib/tasks/export.rake
+++ b/lib/tasks/export.rake
@@ -24,3 +24,11 @@ task 'export:groups', [:include_group_users, :file_name] => [:environment] do |_
   ImportExport.export_groups(args[:include_group_users], args[:file_name])
   puts "", "Done", ""
 end
+
+desc 'Export all translation overrides'
+task 'export:translation_overrides' => [:environment] do |_, args|
+  require "import_export"
+
+  ImportExport.export_translation_overrides
+  puts "", "Done", ""
+end
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index f852a9def1..0d2288cbcd 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -27,5 +27,8 @@
         {"id":7,"user_id":-1,"post_number":2,"raw":"Edit the first post in this topic to change the contents of the FAQ/Guidelines page.","created_at":"2017-10-26T17:15:03.822Z","reply_to_post_number":null,"hidden":false,"hidden_reason_id":null,"wiki":false}
       ]
     }
+  ],
+  "translation_overrides":[
+    {"locale":"en","translation_key":"login_required.welcome_message","value":"## [Dude, Welcome to %{title}](#welcome)\nAn account is required. Please create an account or log in to continue again!\n"}
   ]
 }
diff --git a/spec/import_export/importer_spec.rb b/spec/import_export/importer_spec.rb
index b9f6581aad..39009ddabf 100644
--- a/spec/import_export/importer_spec.rb
+++ b/spec/import_export/importer_spec.rb
@@ -102,6 +102,7 @@ RSpec.describe ImportExport::Importer do
         .and change { Group.count }.by(2)
         .and change { Topic.count }.by(8)
         .and change { User.count }.by(2)
+        .and change { TranslationOverride.count }.by(1)
     end
   end
 end

From 89ac01704e60abaa328aeb9ff14c555340bffa31 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 6 Oct 2022 05:15:05 +0800
Subject: [PATCH 060/332] DEV: Remove contextual topic list linking behaviour
 in sidebar (#18485)

The feedback we got here is that the contextual topic list link
behaviour is surprising and people prefer that the topic list sidebar
links always go to a consistent location.

Internal ref: /t/74666/16
---
 .../everything-section-link.js                |  8 +----
 .../category-section-link.js                  |  8 +----
 .../community-section/tracked-section-link.js |  8 +----
 .../user/tags-section/tag-section-link.js     |  8 +----
 .../sidebar-user-community-section-test.js    | 30 -------------------
 5 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
index ac440559e5..39873ea966 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
@@ -63,13 +63,7 @@ export default class EverythingSectionLink extends BaseSectionLink {
   }
 
   get route() {
-    if (this.totalUnread > 0) {
-      return "discovery.unread";
-    } else if (this.totalNew > 0) {
-      return "discovery.new";
-    } else {
-      return "discovery.latest";
-    }
+    return "discovery.latest";
   }
 
   get prefixValue() {
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 6fa4638dbc..3fc33ea2df 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -79,12 +79,6 @@ export default class CategorySectionLink {
   }
 
   get route() {
-    if (this.totalUnread > 0) {
-      return "discovery.unreadCategory";
-    } else if (this.totalNew > 0) {
-      return "discovery.newCategory";
-    } else {
-      return "discovery.category";
-    }
+    return "discovery.category";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
index 110f426525..de23bee0a2 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
@@ -64,13 +64,7 @@ export default class TrackedSectionLink extends BaseSectionLink {
   }
 
   get route() {
-    if (this.totalUnread > 0) {
-      return "discovery.unread";
-    } else if (this.totalNew > 0) {
-      return "discovery.new";
-    } else {
-      return "discovery.latest";
-    }
+    return "discovery.latest";
   }
 
   get prefixValue() {
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
index 094fe74de2..ed09b6f609 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
@@ -33,13 +33,7 @@ export default class TagSectionLink extends BaseTagSectionLink {
   }
 
   get route() {
-    if (this.totalUnread > 0) {
-      return "tag.showUnread";
-    } else if (this.totalNew > 0) {
-      return "tag.showNew";
-    } else {
-      return "tag.show";
-    }
+    return "tag.show";
   }
 
   get currentWhen() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index d48d92e0d1..4230f0ed93 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -583,11 +583,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       "it displays the right unread count"
     );
 
-    assert.ok(
-      query(".sidebar-section-link-everything").href.endsWith("/unread"),
-      "it links to unread filter"
-    );
-
     // simulate reading topic 2
     await publishToMessageBus("/unread", {
       topic_id: 2,
@@ -637,11 +632,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       "it displays the new count once there are no unread topics"
     );
 
-    assert.ok(
-      query(".sidebar-section-link-everything").href.endsWith("/new"),
-      "it links to new filter"
-    );
-
     await publishToMessageBus("/unread", {
       topic_id: 1,
       message_type: "read",
@@ -658,11 +648,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       ),
       "it removes new count once there are no new topics"
     );
-
-    assert.ok(
-      query(".sidebar-section-link-everything").href.endsWith("/latest"),
-      "it links to latest filter"
-    );
   });
 
   test("visiting top route with tracked filter", async function (assert) {
@@ -871,11 +856,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       "it displays the right unread count"
     );
 
-    assert.ok(
-      query(".sidebar-section-link-tracked").href.endsWith("/unread?f=tracked"),
-      "it links to unread url with tracked filter"
-    );
-
     // simulate reading topic id 2
     await publishToMessageBus("/unread", {
       topic_id: 2,
@@ -922,11 +902,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       "it displays the new count once there are no tracked unread topics"
     );
 
-    assert.ok(
-      query(".sidebar-section-link-tracked").href.endsWith("/new?f=tracked"),
-      "it links to new url with tracked filter"
-    );
-
     // simulate reading topic id 1
     await publishToMessageBus("/unread", {
       topic_id: 1,
@@ -943,11 +918,6 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       ),
       "it removes new count once there are no tracked new topics"
     );
-
-    assert.ok(
-      query(".sidebar-section-link-tracked").href.endsWith("/latest?f=tracked"),
-      "it links to latest url with tracked filter"
-    );
   });
 
   test("adding section link via plugin API with Object", async function (assert) {

From d5f6262c4fba45b59298e5677b3e551e03813185 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 6 Oct 2022 11:10:43 +1100
Subject: [PATCH 061/332] FIX: watched topic overcome muted category (#18480)

Previously, when categories were not muted by default, we were sending message about unmuted topics (topics which user explicitly set notification level to watching)

The same mechanism can be used to fix a bug. When the user was explicitly watching topic, but category was muted, then the user was not informed about new reply.
---
 .../app/models/topic-tracking-state.js        |  3 ++-
 .../unit/models/topic-tracking-state-test.js  | 27 +++++++++++++++++++
 .../notify_mailing_list_subscribers.rb        |  2 +-
 app/models/topic_tracking_state.rb            |  3 +--
 app/models/user.rb                            |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 03059fb392..003710decb 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -866,7 +866,8 @@ const TopicTrackingState = EmberObject.extend({
 
       if (
         mutedCategoryIds &&
-        mutedCategoryIds.includes(data.payload.category_id)
+        mutedCategoryIds.includes(data.payload.category_id) &&
+        !this.isUnmutedTopic(data.topic_id)
       ) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
index 4ae475f5d8..e37011fec3 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
@@ -760,6 +760,33 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
         );
       });
 
+      test("watched topics in muted categories are added to the state", async function (assert) {
+        trackingState.currentUser.setProperties({
+          muted_category_ids: [123],
+        });
+
+        trackingState.trackMutedOrUnmutedTopic({
+          topic_id: 222,
+          message_type: "unmuted",
+        });
+
+        await publishToMessageBus("/new", newTopicPayload);
+
+        assert.deepEqual(
+          trackingState.findState(222),
+          {
+            category_id: 123,
+            topic_tag_ids: [44],
+            tags: ["pending"],
+            last_read_post_number: null,
+            highest_post_number: 1,
+            created_at: "2012-11-31 12:00:00 UTC",
+            archetype: "regular",
+          },
+          "topic state updated"
+        );
+      });
+
       test("topics in muted tags do not get added to the state", async function (assert) {
         trackingState.currentUser.set("muted_tags", ["pending"]);
 
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index c535296105..03a431ab3f 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -69,7 +69,7 @@ module Jobs
       end
 
       if SiteSetting.mute_all_categories_by_default
-        users = users.watching_topic_when_mute_categories_by_default(post.topic)
+        users = users.watching_topic(post.topic)
       end
 
       DiscourseEvent.trigger(:notify_mailing_list_subscribers, users, post)
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 1595f43927..bc25cf9281 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -118,8 +118,7 @@ class TopicTrackingState
   end
 
   def self.publish_unmuted(topic)
-    return if !SiteSetting.mute_all_categories_by_default
-    user_ids = User.watching_topic_when_mute_categories_by_default(topic)
+    user_ids = User.watching_topic(topic)
       .where("users.last_seen_at > ?", 7.days.ago)
       .order("users.last_seen_at DESC")
       .limit(100)
diff --git a/app/models/user.rb b/app/models/user.rb
index 0fbc35849e..773d37777d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -265,7 +265,7 @@ class User < ActiveRecord::Base
     end
   end
 
-  scope :watching_topic_when_mute_categories_by_default, ->(topic) do
+  scope :watching_topic, ->(topic) do
     joins(DB.sql_fragment("LEFT JOIN category_users ON category_users.user_id = users.id AND category_users.category_id = :category_id", category_id: topic.category_id))
       .joins(DB.sql_fragment("LEFT JOIN topic_users ON topic_users.user_id = users.id AND topic_users.topic_id = :topic_id",  topic_id: topic.id))
       .joins("LEFT JOIN tag_users ON tag_users.user_id = users.id AND tag_users.tag_id IN (#{topic.tag_ids.join(",").presence || 'NULL'})")

From 6d7abc1c8517a6893db47905bea624fce96adcc4 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 6 Oct 2022 15:16:38 +1000
Subject: [PATCH 062/332] FIX: Make sure first admin users are added to auto
 groups (#18494)

When a user with an email matching those inside the
DISCOURSE_DEVELOPER_EMAILS env var log in, we make
them into admin users if they are not already. This
is used when setting up the first admin user for
self-hosters, since the discourse-setup script sets
the provided admin emails into DISCOURSE_DEVELOPER_EMAILS.

The issue being fixed here is that the new admins were
not being automatically added to the staff and admins
automatic groups, which was causing issues with the site
settings that are group_list based that don't have an explicit
staff override. All we need to do is refresh the automatic
staff, admin groups when admin is granted for the user.
---
 lib/auth/default_current_user_provider.rb     |  5 ++++
 .../default_current_user_provider_spec.rb     | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index b80e42359d..3318b062da 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -308,6 +308,10 @@ class Auth::DefaultCurrentUserProvider
     }
   end
 
+  # This is also used to set the first admin of the site via
+  # the finish installation & register -> user account activation
+  # for signup flow, since all admin emails are stored in
+  # DISCOURSE_DEVELOPER_EMAILS for self-hosters.
   def make_developer_admin(user)
     if  user.active? &&
         !user.admin &&
@@ -315,6 +319,7 @@ class Auth::DefaultCurrentUserProvider
         Rails.configuration.developer_emails.include?(user.email)
       user.admin = true
       user.save
+      Group.refresh_automatic_groups!(:staff, :admins)
     end
   end
 
diff --git a/spec/lib/auth/default_current_user_provider_spec.rb b/spec/lib/auth/default_current_user_provider_spec.rb
index bd470e547e..74c45f21f5 100644
--- a/spec/lib/auth/default_current_user_provider_spec.rb
+++ b/spec/lib/auth/default_current_user_provider_spec.rb
@@ -794,4 +794,34 @@ RSpec.describe Auth::DefaultCurrentUserProvider do
       expect(UserAuthToken.find_by(user_id: user.id)).to be_nil
     end
   end
+
+  describe "first admin user" do
+    before do
+      user.update(admin: false, email: "blah@test.com")
+      Rails.configuration.developer_emails = "blah@test.com"
+    end
+
+    it "makes the user into an admin if their email is in DISCOURSE_DEVELOPER_EMAILS" do
+      @provider = provider('/')
+      @provider.log_on_user(user, {}, @provider.cookie_jar)
+      expect(user.reload.admin).to eq(true)
+      user2 = Fabricate(:user)
+      @provider.log_on_user(user2, {}, @provider.cookie_jar)
+      expect(user2.reload.admin).to eq(false)
+    end
+
+    it "adds the user to the correct staff/admin auto groups" do
+      @provider = provider('/')
+      @provider.log_on_user(user, {}, @provider.cookie_jar)
+      user.reload
+      expect(user.in_any_groups?([Group::AUTO_GROUPS[:staff]])).to eq(true)
+      expect(user.in_any_groups?([Group::AUTO_GROUPS[:admins]])).to eq(true)
+    end
+
+    it "runs the job to enable bootstrap mode" do
+      @provider = provider('/')
+      @provider.log_on_user(user, {}, @provider.cookie_jar)
+      expect_job_enqueued(job: :enable_bootstrap_mode, args: { user_id: user.id })
+    end
+  end
 end

From 8ae1edeb79ffe471aa666be2552e3b7b244b60a7 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <er.ajalan@gmail.com>
Date: Thu, 6 Oct 2022 12:02:48 +0530
Subject: [PATCH 063/332] FIX: do not prefill default site title value on
 wizard introduction step (#18496)

---
 lib/wizard/builder.rb                  |  2 +-
 spec/lib/wizard/wizard_builder_spec.rb | 36 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 86ae129ad6..b96b5e786e 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -13,7 +13,7 @@ class Wizard
       @wizard.append_step('introduction') do |step|
         step.banner = "welcome-illustration"
 
-        step.add_field(id: 'title', type: 'text', required: true, value: SiteSetting.title)
+        step.add_field(id: 'title', type: 'text', required: true, value: SiteSetting.title == SiteSetting.defaults[:title] ? "" : SiteSetting.title)
         step.add_field(id: 'site_description', type: 'text', required: false, value: SiteSetting.site_description)
         step.add_field(id: 'contact_email', type: 'text', required: true, value: SiteSetting.contact_email)
 
diff --git a/spec/lib/wizard/wizard_builder_spec.rb b/spec/lib/wizard/wizard_builder_spec.rb
index 564e578535..38572689cf 100644
--- a/spec/lib/wizard/wizard_builder_spec.rb
+++ b/spec/lib/wizard/wizard_builder_spec.rb
@@ -32,6 +32,42 @@ RSpec.describe Wizard::Builder do
     expect(wizard.steps).to be_blank
   end
 
+  describe 'introduction' do
+    let(:introduction_step) { wizard.steps.find { |s| s.id == 'introduction' } }
+
+    it 'should not prefill default site setting values' do
+      fields = introduction_step.fields
+      title_field = fields.first
+      description_field = fields.second
+      contact_email_field = fields.third
+
+      expect(title_field.id).to eq('title')
+      expect(title_field.value).to eq("")
+      expect(description_field.id).to eq('site_description')
+      expect(description_field.value).to eq("")
+      expect(contact_email_field.id).to eq('contact_email')
+      expect(contact_email_field.value).to eq("")
+    end
+
+    it 'should prefill overridden site setting values' do
+      SiteSetting.title = "foobar"
+      SiteSetting.site_description = "lorem ipsum"
+      SiteSetting.contact_email = "foobar@example.com"
+
+      fields = introduction_step.fields
+      title_field = fields.first
+      description_field = fields.second
+      contact_email_field = fields.third
+
+      expect(title_field.id).to eq('title')
+      expect(title_field.value).to eq("foobar")
+      expect(description_field.id).to eq('site_description')
+      expect(description_field.value).to eq("lorem ipsum")
+      expect(contact_email_field.id).to eq('contact_email')
+      expect(contact_email_field.value).to eq("foobar@example.com")
+    end
+  end
+
   describe 'privacy step' do
     let(:privacy_step) { wizard.steps.find { |s| s.id == 'privacy' } }
 

From f3392a5a81110eda546b4cb648fe49391c090b3c Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 6 Oct 2022 15:45:19 +0800
Subject: [PATCH 064/332] DEV: Avoid configuring Rails configuration in tests
 (#18499)

---
 spec/lib/auth/default_current_user_provider_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/auth/default_current_user_provider_spec.rb b/spec/lib/auth/default_current_user_provider_spec.rb
index 74c45f21f5..9c542e7965 100644
--- a/spec/lib/auth/default_current_user_provider_spec.rb
+++ b/spec/lib/auth/default_current_user_provider_spec.rb
@@ -797,8 +797,8 @@ RSpec.describe Auth::DefaultCurrentUserProvider do
 
   describe "first admin user" do
     before do
-      user.update(admin: false, email: "blah@test.com")
-      Rails.configuration.developer_emails = "blah@test.com"
+      user.update!(admin: false, email: "blah@test.com")
+      Rails.configuration.stubs(:developer_emails).returns(["blah@test.com"])
     end
 
     it "makes the user into an admin if their email is in DISCOURSE_DEVELOPER_EMAILS" do

From 3629b2de1b731fe90ffbc3648cb25744e46fbdbf Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 6 Oct 2022 15:58:55 +0800
Subject: [PATCH 065/332] DEV: Add tests for `SiteSerializer#top_tags` (#18498)

---
 spec/serializers/site_serializer_spec.rb | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 2839ac774e..02d39afc69 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -135,4 +135,52 @@ RSpec.describe SiteSerializer do
     serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
     expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
   end
+
+  describe '#top_tags' do
+    fab!(:tag) { Fabricate(:tag) }
+
+    describe 'when tagging is not enabled' do
+      before do
+        SiteSetting.tagging_enabled = false
+      end
+
+      it 'is not included in the serialised object' do
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+        expect(serialized[:top_tags]).to eq(nil)
+      end
+    end
+
+    describe 'when tagging is enabled' do
+      fab!(:tag2) { Fabricate(:tag) }
+      fab!(:tag3) { Fabricate(:tag) }
+
+      before do
+        SiteSetting.tagging_enabled = true
+      end
+
+      it 'is not included in the serialised object when there are no tags' do
+        tag.destroy!
+
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+        expect(serialized[:top_tags]).to eq([])
+      end
+
+      it 'is included in the serialised object containing the top tags' do
+        tag2 = Fabricate(:tag)
+        tag2 = Fabricate(:tag)
+
+        SiteSetting.max_tags_in_filter_list = 1
+
+        CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag2.id, topic_count: 2)
+        CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag.id, topic_count: 1)
+        CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag3.id, topic_count: 5)
+
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+        expect(serialized[:top_tags]).to eq([tag3.name, tag2.name])
+      end
+    end
+  end
 end

From 3115f38de22af8ecf155c1213d43eabee39cc927 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 6 Oct 2022 13:26:08 +0100
Subject: [PATCH 066/332] PERF: Move dominant color calculation to separate job
 (#18501)

This will ensure that any potential problems with this process do not affect the performance or reliability of the PeriodicalUpdates job.
---
 app/jobs/scheduled/backfill_dominant_colors.rb | 11 +++++++++++
 app/jobs/scheduled/periodical_updates.rb       |  2 --
 spec/models/upload_spec.rb                     | 13 +++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/jobs/scheduled/backfill_dominant_colors.rb

diff --git a/app/jobs/scheduled/backfill_dominant_colors.rb b/app/jobs/scheduled/backfill_dominant_colors.rb
new file mode 100644
index 0000000000..a0e3c733df
--- /dev/null
+++ b/app/jobs/scheduled/backfill_dominant_colors.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  class BackfillDominantColors < ::Jobs::Scheduled
+    every 15.minutes
+
+    def execute(args)
+      Upload.backfill_dominant_colors!(25)
+    end
+  end
+end
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 01649de062..5c5da8bac6 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -48,8 +48,6 @@ module Jobs
 
       Category.auto_bump_topic!
 
-      Upload.backfill_dominant_colors!(25)
-
       nil
     end
 
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 92d329303c..a2441540cc 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -666,6 +666,19 @@ RSpec.describe Upload do
       expect(red_image.dominant_color).to eq("FF0000")
     end
 
+    it "is backfilled by the job" do
+      expect(white_image.dominant_color).to eq(nil)
+      expect(red_image.dominant_color).to eq(nil)
+
+      Jobs::BackfillDominantColors.new.execute({})
+
+      white_image.reload
+      red_image.reload
+
+      expect(white_image.dominant_color).to eq("FFFFFF")
+      expect(red_image.dominant_color).to eq("FF0000")
+    end
+
     it "stores an empty string for non-image uploads" do
       expect(not_an_image.dominant_color).to eq(nil)
       expect(not_an_image.dominant_color(calculate_if_missing: true)).to eq("")

From 2d518b289589715d570c208aa04754fef96d5fbf Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 6 Oct 2022 14:35:06 +0200
Subject: [PATCH 067/332] UX: ensures we don't focus invisible button in
 sidebar (#18502)

Prior to this fix pressing tab multiple times in the sidebar, you would end up focusing invisible "sidebar-section-header-button". This change ensures the button will become visible when tabbing even if not hovering this section.

The `background: transparent change` is to avoid a flashing background due to different transition timing on the collapsable button.
---
 app/assets/stylesheets/common/base/sidebar-section.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/assets/stylesheets/common/base/sidebar-section.scss b/app/assets/stylesheets/common/base/sidebar-section.scss
index a583a9a7ae..d70e794de9 100644
--- a/app/assets/stylesheets/common/base/sidebar-section.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section.scss
@@ -32,6 +32,10 @@
       .discourse-no-touch & {
         transition: all 0.25s;
         opacity: 0;
+
+        &:focus {
+          opacity: 1;
+        }
       }
 
       background: transparent;
@@ -74,6 +78,10 @@
 
     &.sidebar-section-header-collapsable {
       justify-content: flex-start;
+
+      &:focus {
+        background: transparent;
+      }
     }
   }
 

From e83d35d6f3e832f42a51ff6b3d5655f7fb6b60b5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 6 Oct 2022 13:44:53 +0100
Subject: [PATCH 068/332] FIX: Improve error handling for
 `calculate_dominant_color!` (#18503)

These errors tend to indicate that the upload is missing on the remote store. This is bad, but we don't want it to block the dominant-color calculation process. This commit catches errors when there is an HTTP error, and fixes the `base_store.rb` implementation when `FileHelper.download` returns nil.
---
 app/models/upload.rb         |  4 ++++
 lib/file_store/base_store.rb |  2 ++
 spec/models/upload_spec.rb   | 11 ++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/models/upload.rb b/app/models/upload.rb
index 7bd583f2a6..8ffbbe99c7 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -373,6 +373,10 @@ class Upload < ActiveRecord::Base
         raise "Calculated dominant color but unable to parse output:\n#{data}" if color.nil?
 
         color
+      rescue OpenURI::HTTPError => e
+        # Some issue with downloading the image from a remote store.
+        # Assume the upload is broken and save an empty string to prevent re-evaluation
+        ""
       rescue Discourse::Utils::CommandError => e
         # Timeout or unable to parse image
         # This can happen due to bad user input - ignore and save
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index eec747ba08..8b4c41cf6f 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -116,6 +116,8 @@ module FileStore
             follow_redirect: true
           )
 
+          return nil if file.nil?
+
           cache_file(file, filename)
           file = get_from_cache(filename)
         end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index a2441540cc..fb4e6487a0 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -703,7 +703,7 @@ RSpec.describe Upload do
       expect(invalid_image.dominant_color).to eq(nil)
     end
 
-    it "correctly handles download failures" do
+    it "correctly handles error when file is too large to download" do
       white_image.stubs(:local?).returns(true)
       Discourse.store.stubs(:download).returns(nil)
 
@@ -712,6 +712,15 @@ RSpec.describe Upload do
       expect(invalid_image.dominant_color).to eq("")
     end
 
+    it "correctly handles error when file has HTTP error" do
+      white_image.stubs(:local?).returns(true)
+      Discourse.store.stubs(:download).raises(OpenURI::HTTPError)
+
+      expect(invalid_image.dominant_color).to eq(nil)
+      expect(invalid_image.dominant_color(calculate_if_missing: true)).to eq("")
+      expect(invalid_image.dominant_color).to eq("")
+    end
+
     it "is validated for length" do
       u = Fabricate(:upload)
 

From 73e9875a1d1ff9ae7d169678f33e73e87a1f718c Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 6 Oct 2022 20:26:04 +0300
Subject: [PATCH 069/332] FEATURE: Handle oneboxes for complex GitHub URLs
 (#18474)

GitHub PR URLs can link to a commit of the PR, a comment or a review
discussion.
---
 .../stylesheets/common/base/onebox.scss       |   8 +-
 .../engine/github_pull_request_onebox.rb      |  32 +++++
 lib/onebox/sanitize_config.rb                 |   2 +-
 .../templates/githubpullrequest.mustache      | 108 +++++++++++---
 .../onebox/githubpullrequest_comment.response |  44 ++++++
 .../onebox/githubpullrequest_commit.response  | 134 ++++++++++++++++++
 .../engine/github_pull_request_onebox_spec.rb |  26 ++++
 7 files changed, 327 insertions(+), 27 deletions(-)
 create mode 100644 spec/fixtures/onebox/githubpullrequest_comment.response
 create mode 100644 spec/fixtures/onebox/githubpullrequest_commit.response

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 2cd9d112fb..a15badbef9 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -442,8 +442,8 @@ pre.onebox code {
 
   .github-icon-container {
     display: flex;
-    align-items: flex-start;
-    margin-right: 5px;
+    align-items: center;
+    margin-right: 10px;
   }
 
   .github-icon {
@@ -526,8 +526,8 @@ pre.onebox code {
 
   .github-icon-container {
     display: flex;
-    align-items: flex-start;
-    margin-right: 5px;
+    align-items: center;
+    margin-right: 10px;
   }
 
   .github-icon {
diff --git a/lib/onebox/engine/github_pull_request_onebox.rb b/lib/onebox/engine/github_pull_request_onebox.rb
index 090fddea66..403c62f4b2 100644
--- a/lib/onebox/engine/github_pull_request_onebox.rb
+++ b/lib/onebox/engine/github_pull_request_onebox.rb
@@ -39,8 +39,40 @@ module Onebox
 
         result['body'], result['excerpt'] = compute_body(result['body'])
 
+        if result['commit'] = load_commit(link)
+          result['body'], result['excerpt'] = compute_body(result['commit']['body'])
+        elsif result['comment'] = load_comment(link)
+          result['body'], result['excerpt'] = compute_body(result['comment']['body'])
+        elsif result['discussion'] = load_review(link)
+          result['body'], result['excerpt'] = compute_body(result['discussion']['body'])
+        else
+          result['pr'] = true
+        end
+
         result
       end
+
+      def load_commit(link)
+        if commit_match = link.match(/commits\/(\h+)/)
+          load_json("https://api.github.com/repos/#{match[:owner]}/#{match[:repository]}/commits/#{commit_match[1]}")
+        end
+      end
+
+      def load_comment(link)
+        if comment_match = link.match(/#issuecomment-(\d+)/)
+          load_json("https://api.github.com/repos/#{match[:owner]}/#{match[:repository]}/issues/comments/#{comment_match[1]}")
+        end
+      end
+
+      def load_review(link)
+        if review_match = link.match(/#discussion_r(\d+)/)
+          load_json("https://api.github.com/repos/#{match[:owner]}/#{match[:repository]}/pulls/comments/#{review_match[1]}")
+        end
+      end
+
+      def load_json(url)
+        ::MultiJson.load(URI.parse(url).open(read_timeout: timeout))
+      end
     end
   end
 end
diff --git a/lib/onebox/sanitize_config.rb b/lib/onebox/sanitize_config.rb
index 0dedde853e..592077a186 100644
--- a/lib/onebox/sanitize_config.rb
+++ b/lib/onebox/sanitize_config.rb
@@ -14,7 +14,7 @@ module Onebox
         'iframe' => %w[allowfullscreen frameborder height scrolling src width data-original-href data-unsanitized-src],
         'source' => %w[src type],
         'video' => %w[controls height loop width autoplay muted poster controlslist playsinline],
-        'path' => %w[d],
+        'path' => %w[d fill-rule],
         'svg' => ['aria-hidden', 'width', 'height', 'viewbox'],
         'div' => [:data], # any data-* attributes,
         'span' => [:data], # any data-* attributes
diff --git a/lib/onebox/templates/githubpullrequest.mustache b/lib/onebox/templates/githubpullrequest.mustache
index 81eabb41af..8b0ee6378a 100644
--- a/lib/onebox/templates/githubpullrequest.mustache
+++ b/lib/onebox/templates/githubpullrequest.mustache
@@ -1,36 +1,100 @@
 <div class="github-row">
-  <div class="github-icon-container" title="Pull Request">
-    <svg width="60" height="60" class="github-icon" viewBox="0 0 12 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>
-  </div>
+  {{#commit}}
+    <div class="github-icon-container" title="Commit">
+      <svg width="60" height="60" class="github-icon" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z"></path></svg>
+    </div>
+  {{/commit}}
+
+  {{#comment}}
+    <div class="github-icon-container" title="Comment">
+      <svg width="60" height="60" class="github-icon" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M1.5 2.75a.25.25 0 01.25-.25h8.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-3.5a.75.75 0 00-.53.22L3.5 11.44V9.25a.75.75 0 00-.75-.75h-1a.25.25 0 01-.25-.25v-5.5zM1.75 1A1.75 1.75 0 000 2.75v5.5C0 9.216.784 10 1.75 10H2v1.543a1.457 1.457 0 002.487 1.03L7.061 10h3.189A1.75 1.75 0 0012 8.25v-5.5A1.75 1.75 0 0010.25 1h-8.5zM14.5 4.75a.25.25 0 00-.25-.25h-.5a.75.75 0 110-1.5h.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0114.25 12H14v1.543a1.457 1.457 0 01-2.487 1.03L9.22 12.28a.75.75 0 111.06-1.06l2.22 2.22v-2.19a.75.75 0 01.75-.75h1a.25.25 0 00.25-.25v-5.5z"></path></svg>
+    </div>
+  {{/comment}}
+
+  {{#discussion}}
+    <div class="github-icon-container" title="Discussion">
+      <svg width="60" height="60" class="github-icon" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M1.679 7.932c.412-.621 1.242-1.75 2.366-2.717C5.175 4.242 6.527 3.5 8 3.5c1.473 0 2.824.742 3.955 1.715 1.124.967 1.954 2.096 2.366 2.717a.119.119 0 010 .136c-.412.621-1.242 1.75-2.366 2.717C10.825 11.758 9.473 12.5 8 12.5c-1.473 0-2.824-.742-3.955-1.715C2.92 9.818 2.09 8.69 1.679 8.068a.119.119 0 010-.136zM8 2c-1.981 0-3.67.992-4.933 2.078C1.797 5.169.88 6.423.43 7.1a1.619 1.619 0 000 1.798c.45.678 1.367 1.932 2.637 3.024C4.329 13.008 6.019 14 8 14c1.981 0 3.67-.992 4.933-2.078 1.27-1.091 2.187-2.345 2.637-3.023a1.619 1.619 0 000-1.798c-.45-.678-1.367-1.932-2.637-3.023C11.671 2.992 9.981 2 8 2zm0 8a2 2 0 100-4 2 2 0 000 4z"></path></svg>
+    </div>
+  {{/discussion}}
+
+  {{#pr}}
+    <div class="github-icon-container" title="Pull Request">
+      <svg width="60" height="60" class="github-icon" viewBox="0 0 12 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>
+    </div>
+  {{/pr}}
 
   <div class="github-info-container">
-    <h4>
-      <a href="{{html_url}}" target="_blank" rel="noopener">{{title}}</a>
-    </h4>
+    {{#commit}}
+      <h4>
+        <a href="{{link}}" target="_blank" rel="noopener">{{commit.message}}</a>
+      </h4>
+
+      <span>
+        Commit by
+        <a href="{{author.html_url}}" target="_blank" rel="noopener">
+          <img alt="{{author.login}}" src="{{author.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
+          {{author.login}}
+        </a>
+        in
+        <a href="{{link}}" target="_blank" rel="noopener">{{title}}</a>
+      </span>
+    {{/commit}}
+
+    {{#comment}}
+      <h4>
+        Comment by
+        <a href="{{user.html_url}}" target="_blank" rel="noopener">
+          <img alt="{{user.login}}" src="{{user.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
+          {{user.login}}
+        </a>
+        to
+        <a href="{{link}}" target="_blank" rel="noopener">{{title}}</a>
+      </h4>
+    {{/comment}}
+
+    {{#discussion}}
+      <h4>
+        Review by
+        <a href="{{user.html_url}}" target="_blank" rel="noopener">
+          <img alt="{{user.login}}" src="{{user.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
+          {{user.login}}
+        </a>
+        in
+        <a href="{{link}}" target="_blank" rel="noopener">{{title}}</a>
+      </h4>
+    {{/discussion}}
+
+    {{#pr}}
+      <h4>
+        <a href="{{link}}" target="_blank" rel="noopener">{{title}}</a>
+      </h4>
+    {{/pr}}
 
     <div class="branches">
       <code>{{base.label}}</code> ← <code>{{head.label}}</code>
     </div>
 
-    <div class="github-info">
-      <div class="date">
-        opened <span class="discourse-local-date" data-format="ll" data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
-      </div>
+    {{#pr}}
+      <div class="github-info">
+        <div class="date">
+          opened <span class="discourse-local-date" data-format="ll" data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
+        </div>
 
-      <div class="user">
-        <a href="{{user.html_url}}" target="_blank" rel="noopener">
-          <img alt="{{user.login}}" src="{{user.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
-          {{user.login}}
-        </a>
-      </div>
+        <div class="user">
+          <a href="{{user.html_url}}" target="_blank" rel="noopener">
+            <img alt="{{user.login}}" src="{{user.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
+            {{user.login}}
+          </a>
+        </div>
 
-      <div class="lines" title="{{commits}} commits changed {{changed_files}} files with {{additions}} additions and {{deletions}} deletions">
-        <a href="{{html_url}}/files" target="_blank" rel="noopener">
-          <span class="added">+{{additions}}</span>
-          <span class="removed">-{{deletions}}</span>
-        </a>
+        <div class="lines" title="{{commits}} commits changed {{changed_files}} files with {{additions}} additions and {{deletions}} deletions">
+          <a href="{{html_url}}/files" target="_blank" rel="noopener">
+            <span class="added">+{{additions}}</span>
+            <span class="removed">-{{deletions}}</span>
+          </a>
+        </div>
       </div>
-    </div>
+    {{/pr}}
   </div>
 </div>
 
diff --git a/spec/fixtures/onebox/githubpullrequest_comment.response b/spec/fixtures/onebox/githubpullrequest_comment.response
new file mode 100644
index 0000000000..679be4d7a5
--- /dev/null
+++ b/spec/fixtures/onebox/githubpullrequest_comment.response
@@ -0,0 +1,44 @@
+{
+  "url": "https://api.github.com/repos/discourse/discourse/issues/comments/21597425",
+  "html_url": "https://github.com/discourse/discourse/pull/1253#issuecomment-21597425",
+  "issue_url": "https://api.github.com/repos/discourse/discourse/issues/1253",
+  "id": 21597425,
+  "node_id": "MDEyOklzc3VlQ29tbWVudDIxNTk3NDI1",
+  "user": {
+    "login": "discoursebot",
+    "id": 3698800,
+    "node_id": "MDQ6VXNlcjM2OTg4MDA=",
+    "avatar_url": "https://avatars.githubusercontent.com/u/3698800?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/discoursebot",
+    "html_url": "https://github.com/discoursebot",
+    "followers_url": "https://api.github.com/users/discoursebot/followers",
+    "following_url": "https://api.github.com/users/discoursebot/following{/other_user}",
+    "gists_url": "https://api.github.com/users/discoursebot/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/discoursebot/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/discoursebot/subscriptions",
+    "organizations_url": "https://api.github.com/users/discoursebot/orgs",
+    "repos_url": "https://api.github.com/users/discoursebot/repos",
+    "events_url": "https://api.github.com/users/discoursebot/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/discoursebot/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "created_at": "2013-07-26T02:05:57Z",
+  "updated_at": "2013-07-26T02:05:57Z",
+  "author_association": "NONE",
+  "body": "You've signed the CLA, jamesaanderson. Thank you! This pull request is ready for review.\n",
+  "reactions": {
+    "url": "https://api.github.com/repos/discourse/discourse/issues/comments/21597425/reactions",
+    "total_count": 0,
+    "+1": 0,
+    "-1": 0,
+    "laugh": 0,
+    "hooray": 0,
+    "confused": 0,
+    "heart": 0,
+    "rocket": 0,
+    "eyes": 0
+  },
+  "performed_via_github_app": null
+}
diff --git a/spec/fixtures/onebox/githubpullrequest_commit.response b/spec/fixtures/onebox/githubpullrequest_commit.response
new file mode 100644
index 0000000000..65f302be2a
--- /dev/null
+++ b/spec/fixtures/onebox/githubpullrequest_commit.response
@@ -0,0 +1,134 @@
+{
+  "sha": "d7d3be1130c665cc7fab9f05dbf32335229137a6",
+  "node_id": "MDY6Q29tbWl0NzU2OTU3ODpkN2QzYmUxMTMwYzY2NWNjN2ZhYjlmMDVkYmYzMjMzNTIyOTEzN2E2",
+  "commit": {
+    "author": {
+      "name": "James Anderson",
+      "email": "me@jamesaanderson.com",
+      "date": "2013-07-26T02:03:23Z"
+    },
+    "committer": {
+      "name": "James Anderson",
+      "email": "me@jamesaanderson.com",
+      "date": "2013-07-26T02:03:23Z"
+    },
+    "message": "Add audio onebox\nhttp://meta.discourse.org/t/audio-html5-tag/8168",
+    "tree": {
+      "sha": "20c3841a2f4d2153d880b266cc9307296d8e07c6",
+      "url": "https://api.github.com/repos/discourse/discourse/git/trees/20c3841a2f4d2153d880b266cc9307296d8e07c6"
+    },
+    "url": "https://api.github.com/repos/discourse/discourse/git/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6",
+    "comment_count": 0,
+    "verification": {
+      "verified": false,
+      "reason": "unsigned",
+      "signature": null,
+      "payload": null
+    }
+  },
+  "url": "https://api.github.com/repos/discourse/discourse/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6",
+  "html_url": "https://github.com/discourse/discourse/commit/d7d3be1130c665cc7fab9f05dbf32335229137a6",
+  "comments_url": "https://api.github.com/repos/discourse/discourse/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6/comments",
+  "author": {
+    "login": "jamesaanderson",
+    "id": 2722987,
+    "node_id": "MDQ6VXNlcjI3MjI5ODc=",
+    "avatar_url": "https://avatars.githubusercontent.com/u/2722987?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/jamesaanderson",
+    "html_url": "https://github.com/jamesaanderson",
+    "followers_url": "https://api.github.com/users/jamesaanderson/followers",
+    "following_url": "https://api.github.com/users/jamesaanderson/following{/other_user}",
+    "gists_url": "https://api.github.com/users/jamesaanderson/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/jamesaanderson/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/jamesaanderson/subscriptions",
+    "organizations_url": "https://api.github.com/users/jamesaanderson/orgs",
+    "repos_url": "https://api.github.com/users/jamesaanderson/repos",
+    "events_url": "https://api.github.com/users/jamesaanderson/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/jamesaanderson/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "committer": {
+    "login": "jamesaanderson",
+    "id": 2722987,
+    "node_id": "MDQ6VXNlcjI3MjI5ODc=",
+    "avatar_url": "https://avatars.githubusercontent.com/u/2722987?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/jamesaanderson",
+    "html_url": "https://github.com/jamesaanderson",
+    "followers_url": "https://api.github.com/users/jamesaanderson/followers",
+    "following_url": "https://api.github.com/users/jamesaanderson/following{/other_user}",
+    "gists_url": "https://api.github.com/users/jamesaanderson/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/jamesaanderson/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/jamesaanderson/subscriptions",
+    "organizations_url": "https://api.github.com/users/jamesaanderson/orgs",
+    "repos_url": "https://api.github.com/users/jamesaanderson/repos",
+    "events_url": "https://api.github.com/users/jamesaanderson/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/jamesaanderson/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "parents": [
+    {
+      "sha": "9c617d051e08a4a0335d8375e91d87a58c7e720e",
+      "url": "https://api.github.com/repos/discourse/discourse/commits/9c617d051e08a4a0335d8375e91d87a58c7e720e",
+      "html_url": "https://github.com/discourse/discourse/commit/9c617d051e08a4a0335d8375e91d87a58c7e720e"
+    }
+  ],
+  "stats": {
+    "total": 20,
+    "additions": 19,
+    "deletions": 1
+  },
+  "files": [
+    {
+      "sha": "4bf610116998b798fd7255aaf835ce2ffc3d0dc7",
+      "filename": "app/assets/stylesheets/application/compose.css.scss",
+      "status": "modified",
+      "additions": 3,
+      "deletions": 0,
+      "changes": 3,
+      "blob_url": "https://github.com/discourse/discourse/blob/d7d3be1130c665cc7fab9f05dbf32335229137a6/app%2Fassets%2Fstylesheets%2Fapplication%2Fcompose.css.scss",
+      "raw_url": "https://github.com/discourse/discourse/raw/d7d3be1130c665cc7fab9f05dbf32335229137a6/app%2Fassets%2Fstylesheets%2Fapplication%2Fcompose.css.scss",
+      "contents_url": "https://api.github.com/repos/discourse/discourse/contents/app%2Fassets%2Fstylesheets%2Fapplication%2Fcompose.css.scss?ref=d7d3be1130c665cc7fab9f05dbf32335229137a6",
+      "patch": "@@ -299,6 +299,9 @@\n         webkit-border-radius: 4px;\n         ms-border-radius: 4px;\n       }\n+      audio {\n+        max-width: 100%;\n+      }\n     }\n     #wmd-preview {\n       border: 1px dashed $gray;"
+    },
+    {
+      "sha": "f925244a588046d6caf2bc807c719a59569ad3c2",
+      "filename": "app/assets/stylesheets/application/topic-post.css.scss",
+      "status": "modified",
+      "additions": 3,
+      "deletions": 0,
+      "changes": 3,
+      "blob_url": "https://github.com/discourse/discourse/blob/d7d3be1130c665cc7fab9f05dbf32335229137a6/app%2Fassets%2Fstylesheets%2Fapplication%2Ftopic-post.css.scss",
+      "raw_url": "https://github.com/discourse/discourse/raw/d7d3be1130c665cc7fab9f05dbf32335229137a6/app%2Fassets%2Fstylesheets%2Fapplication%2Ftopic-post.css.scss",
+      "contents_url": "https://api.github.com/repos/discourse/discourse/contents/app%2Fassets%2Fstylesheets%2Fapplication%2Ftopic-post.css.scss?ref=d7d3be1130c665cc7fab9f05dbf32335229137a6",
+      "patch": "@@ -515,6 +515,9 @@\n     img {\n       max-width: 100%;\n     }\n+    audio {\n+      max-width: 100%;\n+    }\n     .topic-body {\n       position: relative;\n       .contents {"
+    },
+    {
+      "sha": "c2fda69aa041b7075287c5144fd74bd746d27aaf",
+      "filename": "lib/oneboxer/audio_onebox.rb",
+      "status": "added",
+      "additions": 12,
+      "deletions": 0,
+      "changes": 12,
+      "blob_url": "https://github.com/discourse/discourse/blob/d7d3be1130c665cc7fab9f05dbf32335229137a6/lib%2Foneboxer%2Faudio_onebox.rb",
+      "raw_url": "https://github.com/discourse/discourse/raw/d7d3be1130c665cc7fab9f05dbf32335229137a6/lib%2Foneboxer%2Faudio_onebox.rb",
+      "contents_url": "https://api.github.com/repos/discourse/discourse/contents/lib%2Foneboxer%2Faudio_onebox.rb?ref=d7d3be1130c665cc7fab9f05dbf32335229137a6",
+      "patch": "@@ -0,0 +1,12 @@\n+require_dependency 'oneboxer/base_onebox'\n+\n+module Oneboxer\n+  class AudioOnebox < BaseOnebox\n+\n+    matcher /^https?:\\/\\/.*\\.mp3$/\n+\n+    def onebox\n+      \"<audio controls><source src='#{@url}'><a href='#{@url}'>#{@url}</a></audio>\"\n+    end\n+  end\n+end"
+    },
+    {
+      "sha": "e3924069face09f9f716afd09b166af83da496a9",
+      "filename": "lib/oneboxer/video_onebox.rb",
+      "status": "modified",
+      "additions": 1,
+      "deletions": 1,
+      "changes": 2,
+      "blob_url": "https://github.com/discourse/discourse/blob/d7d3be1130c665cc7fab9f05dbf32335229137a6/lib%2Foneboxer%2Fvideo_onebox.rb",
+      "raw_url": "https://github.com/discourse/discourse/raw/d7d3be1130c665cc7fab9f05dbf32335229137a6/lib%2Foneboxer%2Fvideo_onebox.rb",
+      "contents_url": "https://api.github.com/repos/discourse/discourse/contents/lib%2Foneboxer%2Fvideo_onebox.rb?ref=d7d3be1130c665cc7fab9f05dbf32335229137a6",
+      "patch": "@@ -3,7 +3,7 @@\n module Oneboxer\n   class VideoOnebox < BaseOnebox\n     \n-    matcher /^https?:\\/\\/.*\\.(mov|mp4|ogg)$/\n+    matcher /^https?:\\/\\/.*\\.(mov|mp4)$/\n \n     def onebox\n       \"<video width='100%' height='100%' controls><source src='#{@url}'><a href='#{@url}'>#{@url}</a></video>\""
+    }
+  ]
+}
diff --git a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
index 546ff00438..c6ab147da4 100644
--- a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
@@ -49,4 +49,30 @@ RSpec.describe Onebox::Engine::GithubPullRequestOnebox do
       expect(html).not_to include("test comment")
     end
   end
+
+  context "with commit links" do
+    before do
+      @link = "https://github.com/discourse/discourse/pull/1253/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
+      @uri = "https://api.github.com/repos/discourse/discourse/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
+
+      stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name + "_commit"))
+    end
+
+    it "includes commit name" do
+      expect(html).to include("Add audio onebox")
+    end
+  end
+
+  context "with comment links" do
+    before do
+      @link = "https://github.com/discourse/discourse/pull/1253/#issuecomment-21597425"
+      @uri = "https://api.github.com/repos/discourse/discourse/issues/comments/21597425"
+
+      stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name + "_comment"))
+    end
+
+    it "includes comment" do
+      expect(html).to include("You&#39;ve signed the CLA")
+    end
+  end
 end

From 70d0892ac94348d090f8ae40c60f43dc10d8ae2e Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Thu, 6 Oct 2022 12:04:26 -0700
Subject: [PATCH 070/332] FIX: Arrive at topic must be hidden when
 `must_approve_users` (#18504)

---
 .../discourse/app/controllers/create-invite.js     |  8 ++++++++
 .../app/templates/modal/create-invite.hbs          |  2 +-
 .../tests/acceptance/create-invite-modal-test.js   | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite.js b/app/assets/javascripts/discourse/app/controllers/create-invite.js
index e043d28bb7..1492106b86 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-invite.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-invite.js
@@ -182,6 +182,14 @@ export default Controller.extend(
       return staff || groups.any((g) => g.owner);
     },
 
+    @discourseComputed("currentUser.staff")
+    canArriveAtTopic(staff) {
+      if (staff && !this.siteSettings.must_approve_users) {
+        return true;
+      }
+      return false;
+    },
+
     @discourseComputed
     timeShortcuts() {
       const timezone = this.currentUser.timezone;
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
index a737b26371..7528ea0401 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -59,7 +59,7 @@
       </div>
     {{/if}}
 
-    {{#if this.currentUser.staff}}
+    {{#if this.canArriveAtTopic}}
       <div class="input-group invite-to-topic">
         <label for="invite-topic">{{d-icon "hand-point-right"}}{{i18n "user.invited.invite.invite_to_topic"}}</label>
         <TopicChooser @value={{this.buffered.topicId}} @content={{this.topics}} @onChange={{action "onChangeTopic"}} @options={{hash
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
index b534b80ec5..0cc847176e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
@@ -229,3 +229,17 @@ acceptance(
     });
   }
 );
+
+acceptance(
+  "Invites - Create Invite on Site with must_approve_users Setting",
+  function (needs) {
+    needs.user();
+    needs.settings({ must_approve_users: true });
+
+    test("hides `Arrive at Topic` field on sites with `must_approve_users`", async function (assert) {
+      await visit("/u/eviltrout/invited/pending");
+      await click(".user-invite-buttons .btn:first-child");
+      assert.ok(!exists(".invite-to-topic"));
+    });
+  }
+);

From bd61f877bb3217b35a955a1055b088976d011c19 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Thu, 6 Oct 2022 23:51:32 +0200
Subject: [PATCH 071/332] FEATURE: new outlet topic-list-main-link-bottom added
 to mobile (#18505)

---
 .../discourse/app/templates/mobile/list/topic-list-item.hbr      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
index 6e6ed81e92..3c0de444e8 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
@@ -32,6 +32,7 @@
       {{~#if expandPinned~}}
       {{~raw "list/topic-excerpt" topic=topic~}}
       {{~/if~}}
+       {{~raw-plugin-outlet name="topic-list-main-link-bottom"}}
     </div>
     <div class='pull-right'>
       {{raw "list/post-count-or-badges" topic=topic postBadgesEnabled=showTopicPostBadges}}

From d507151508c34efb8f042c70257769df996401c7 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Thu, 6 Oct 2022 23:53:06 +0200
Subject: [PATCH 072/332] UX: add more spacing to tab btns (#18506)

---
 app/assets/stylesheets/mobile/menu-panel.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index 1a5f9aeefb..5ce9d5f913 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -69,6 +69,12 @@
   }
 }
 
+.tabs-list .btn {
+  .user-menu-revamped & {
+    padding: 1.2em 1.4em;
+  }
+}
+
 .hamburger-panel .revamped {
   --d-sidebar-row-horizontal-padding: 1rem;
   --d-sidebar-highlight-color: var(--primary-low);

From e6b5b6eae348aa0f6148589a07e9ade0f08bae59 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 7 Oct 2022 09:16:04 +1100
Subject: [PATCH 073/332] DEV: update to patched discourse-seed-fu (#18493)

Original seed-fu was cloned and patched with David's fix https://github.com/discourse/discourse-seed-fu/commit/576b69a3687388d760531ec7e8b9bb017d1a6861
---
 Gemfile                                  |  2 +-
 Gemfile.lock                             |  8 ++++----
 lib/freedom_patches/seed_fu.rb           | 19 -------------------
 spec/lib/freedom_patches/seed_fu_spec.rb | 17 -----------------
 4 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 lib/freedom_patches/seed_fu.rb
 delete mode 100644 spec/lib/freedom_patches/seed_fu_spec.rb

diff --git a/Gemfile b/Gemfile
index baca43e5b2..ba96d9a8fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'sprockets', '3.7.2'
 # allows us to precompile all our templates in the unicorn master
 gem 'actionview_precompiler', require: false
 
-gem 'seed-fu'
+gem 'discourse-seed-fu'
 
 gem 'mail', git: 'https://github.com/discourse/mail.git'
 gem 'mini_mime'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7347c11499..e7977f67d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -127,6 +127,9 @@ GEM
       railties (>= 3.1)
     discourse-ember-source (3.12.2.3)
     discourse-fonts (0.0.9)
+    discourse-seed-fu (2.3.12)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
     discourse_dev_assets (0.0.4)
       faker (~> 2.16)
       literate_randomizer
@@ -437,9 +440,6 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    seed-fu (2.3.9)
-      activerecord (>= 3.1)
-      activesupport (>= 3.1)
     selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
@@ -545,6 +545,7 @@ DEPENDENCIES
   discourse-ember-rails (= 0.18.6)
   discourse-ember-source (~> 3.12.2)
   discourse-fonts
+  discourse-seed-fu
   discourse_dev_assets
   email_reply_trimmer
   ember-handlebars-template (= 0.8.0)
@@ -628,7 +629,6 @@ DEPENDENCIES
   sanitize
   sassc (= 2.0.1)
   sassc-rails
-  seed-fu
   selenium-webdriver
   shoulda-matchers
   sidekiq
diff --git a/lib/freedom_patches/seed_fu.rb b/lib/freedom_patches/seed_fu.rb
deleted file mode 100644
index b24241b3d7..0000000000
--- a/lib/freedom_patches/seed_fu.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-SeedFu::Seeder.prepend(Module.new do
-  def update_id_sequence
-    max_seeded_id = @data.filter_map { |d| d["id"] }.max
-    seq = @model_class.connection.execute(<<~SQL)
-      SELECT last_value
-      FROM #{@model_class.sequence_name}
-    SQL
-    last_seq_value = seq.first["last_value"]
-
-    if max_seeded_id && last_seq_value < max_seeded_id
-      # Update the sequence to start from the highest existing id
-      @model_class.connection.reset_pk_sequence!(@model_class.table_name)
-    else
-      # The sequence is already higher than any of our seeded ids - better not touch it
-    end
-  end
-end)
diff --git a/spec/lib/freedom_patches/seed_fu_spec.rb b/spec/lib/freedom_patches/seed_fu_spec.rb
deleted file mode 100644
index 12ba1dd745..0000000000
--- a/spec/lib/freedom_patches/seed_fu_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "seed-fu patch" do
-  it "does not modify a sequence on an existing table" do
-    u = User.create!(username: "test1", email: "test1@example.com")
-    uid1 = u.id
-    UserDestroyer.new(Discourse.system_user).destroy(u)
-
-    SeedFu.quiet = true
-    SeedFu.seed
-
-    # Ensure sequence was not reset. A new user should have
-    # id one greater than the last user
-    u2 = User.create!(username: "test1", email: "test1@example.com")
-    expect(u2.id).to eq(uid1 + 1)
-  end
-end

From 0059be6856eab13726175aec165c69abe95f9ac5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Oct 2022 00:58:21 +0200
Subject: [PATCH 074/332] Build(deps): Bump ember-cached-decorator-polyfill
 (#18507)

Bumps [ember-cached-decorator-polyfill](https://github.com/ember-polyfills/ember-cached-decorator-polyfill) from 0.1.4 to 1.0.1.
- [Release notes](https://github.com/ember-polyfills/ember-cached-decorator-polyfill/releases)
- [Changelog](https://github.com/ember-polyfills/ember-cached-decorator-polyfill/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ember-polyfills/ember-cached-decorator-polyfill/compare/v0.1.4...v1.0.1)

---
updated-dependencies:
- dependency-name: ember-cached-decorator-polyfill
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json |  4 +--
 app/assets/javascripts/yarn.lock              | 34 ++++++++++++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index ea0a69d384..e6279dbdf2 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -47,7 +47,7 @@
     "ember-auto-import": "^2.4.2",
     "ember-auto-import-chunks-json-generator": "^1.0.0",
     "ember-buffered-proxy": "^2.1.1",
-    "ember-cached-decorator-polyfill": "^0.1.4",
+    "ember-cached-decorator-polyfill": "^1.0.1",
     "ember-cli": "~3.28.5",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.10",
@@ -104,7 +104,7 @@
     ]
   },
   "devDependencies": {
-    "ember-cached-decorator-polyfill": "^0.1.4",
+    "ember-cached-decorator-polyfill": "^1.0.1",
     "ember-cli-deprecation-workflow": "^2.1.0",
     "ember-exam": "^8.0.0"
   }
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 3e74b59ac7..0bf77f87ed 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1103,7 +1103,7 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@embroider/macros@1.8.3", "@embroider/macros@^1.0.0", "@embroider/macros@^1.6.0":
+"@embroider/macros@1.8.3":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.8.3.tgz#2f0961ab8871f6ad819630208031d705b357757e"
   integrity sha512-gnIOfTL/pUkoD6oI7JyWOqXlVIUgZM+CnbH10/YNtZr2K0hij9eZQMdgjOZZVgN0rKOFw9dIREqc1ygrJHRYQA==
@@ -1117,6 +1117,20 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/macros@^1.0.0", "@embroider/macros@^1.6.0", "@embroider/macros@^1.8.3":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.9.0.tgz#0df2a56fdd93f11fddea450b6ca83cc2119b5008"
+  integrity sha512-12ElrRT+mX3aSixGHjHnfsnyoH1hw5nM+P+Ax0ITZdp6TaAvWZ8dENnVHltdnv4ssHiX0EsVEXmqbIIdMN4nLA==
+  dependencies:
+    "@embroider/shared-internals" "1.8.3"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
 "@embroider/shared-internals@1.8.3", "@embroider/shared-internals@^1.0.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9"
@@ -1210,7 +1224,7 @@
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
-"@glimmer/tracking@^1.0.4", "@glimmer/tracking@^1.1.2":
+"@glimmer/tracking@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb"
   integrity sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==
@@ -2337,7 +2351,7 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-import-util@^1.1.0, babel-import-util@^1.2.0:
+babel-import-util@^1.1.0, babel-import-util@^1.2.0, babel-import-util@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
   integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
@@ -4408,14 +4422,16 @@ ember-cache-primitive-polyfill@^1.0.1:
     ember-compatibility-helpers "^1.2.1"
     silent-error "^1.1.1"
 
-ember-cached-decorator-polyfill@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace"
-  integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==
+ember-cached-decorator-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-1.0.1.tgz#320abc0fe45338ee7c54777e32353023c48775c5"
+  integrity sha512-VDgrpIJ6rDDHIfkYrsFR1BM3fpcC0+zFWIOsX0qY44zPrIXjhQWVXs2iVXLIPHprSgf+tFQ3ESxwDscpeRe/0A==
   dependencies:
-    "@glimmer/tracking" "^1.0.4"
+    "@embroider/macros" "^1.8.3"
+    "@glimmer/tracking" "^1.1.2"
+    babel-import-util "^1.2.2"
     ember-cache-primitive-polyfill "^1.0.1"
-    ember-cli-babel "^7.21.0"
+    ember-cli-babel "^7.26.11"
     ember-cli-babel-plugin-helpers "^1.1.1"
 
 ember-cli-app-version@^5.0.0:

From cb26d52d3376f1587a4b48a0e7b3f5d1f4517f5b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 7 Oct 2022 09:24:08 +1000
Subject: [PATCH 075/332] DEV: Remvoe IMAGES_EXTENSIONS_REGEX const in
 lib/uploads (#18497)

This IMAGES_EXTENSIONS_REGEX const just creates redundancy
when we already have the `isImage` function -- the two can
easily get out of sync. Replace all usages of the former
with the latter.
---
 .../javascripts/discourse/app/lib/uploads.js      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js
index 366e842c79..02e0a2b673 100644
--- a/app/assets/javascripts/discourse/app/lib/uploads.js
+++ b/app/assets/javascripts/discourse/app/lib/uploads.js
@@ -135,9 +135,6 @@ export function validateUploadedFile(file, opts) {
   return true;
 }
 
-export const IMAGES_EXTENSIONS_REGEX =
-  /(png|jpe?g|gif|svg|ico|heic|heif|webp)/i;
-
 function extensionsToArray(exts) {
   return exts
     .toLowerCase()
@@ -155,12 +152,10 @@ function staffExtensions(siteSettings) {
 }
 
 function imagesExtensions(staff, siteSettings) {
-  let exts = extensions(siteSettings).filter((ext) =>
-    IMAGES_EXTENSIONS_REGEX.test(ext)
-  );
+  let exts = extensions(siteSettings).filter((ext) => isImage(`.${ext}`));
   if (staff) {
     const staffExts = staffExtensions(siteSettings).filter((ext) =>
-      IMAGES_EXTENSIONS_REGEX.test(ext)
+      isImage(`.${ext}`)
     );
     exts = exts.concat(staffExts);
   }
@@ -234,7 +229,7 @@ export function authorizesOneOrMoreImageExtensions(staff, siteSettings) {
 }
 
 export function isImage(path) {
-  return /\.(png|webp|jpe?g|gif|svg|ico)$/i.test(path);
+  return /\.(png|webp|jpe?g|gif|svg|ico|heic|heif)$/i.test(path);
 }
 
 export function isVideo(path) {
@@ -252,9 +247,7 @@ function uploadTypeFromFileName(fileName) {
 export function allowsImages(staff, siteSettings) {
   return (
     authorizesAllExtensions(staff, siteSettings) ||
-    IMAGES_EXTENSIONS_REGEX.test(
-      authorizedExtensions(staff, siteSettings).join()
-    )
+    authorizedExtensions(staff, siteSettings).some((ext) => isImage(`.${ext}`))
   );
 }
 

From 7d8cda9858d28921591960952cc8ed9a97045ffa Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Fri, 7 Oct 2022 09:39:41 +0800
Subject: [PATCH 076/332] FEATURE: Omit showing day when 'to' day is same as
 'from' day (#18500)

Essentially,

Saturday at 2:50 PM -> Saturday at 4:38 PM becomes
Saturday at 2:50 PM -> 4:38 PM (Singapore)

Also, the displayed dates are shortened when the standalone date
is within two days. So despite the 'from' and 'to' date being the
same day, it may show 'Saturday' for 'from', and the specific date
for the 'to'. This corrects the behaviour.

(so if the current date and time is Thursday 5PM, the 'from' date
below is within 2 days, but the 'to' date is not)
Saturday at 2:50 PM -> 8 October 2022 at 9:38 PM becomes
Saturday at 2:50 PM -> 9:38 PM
---
 .../initializers/discourse-local-dates.js     | 32 +++++++++++++++++--
 .../discourse-local-dates.js                  |  5 +--
 .../javascripts/lib/local-date-builder.js     |  9 ++++++
 .../spec/integration/local_dates_spec.rb      |  8 +++--
 .../lib/local-date-builder-test.js            | 14 ++++++++
 5 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
index 4eb5b8066e..d360d643fd 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
@@ -21,10 +21,22 @@ export function applyLocalDates(dates, siteSettings) {
 
   const currentUserTZ = moment.tz.guess();
 
-  dates.forEach((element) => {
+  dates.forEach((element, index, arr) => {
     const opts = buildOptionsFromElement(element, siteSettings);
 
+    if (
+      element.attributes["data-range"]?.value === "to" &&
+      index !== 0 &&
+      arr[index - 1].attributes["data-range"]?.value === "from"
+    ) {
+      const fromElement = arr[index - 1];
+      if (_rangeIsSameLocalDay(fromElement, element)) {
+        opts.sameLocalDayAsFrom = true;
+      }
+    }
+
     const localDateBuilder = new LocalDateBuilder(opts, currentUserTZ).build();
+
     element.innerText = "";
     element.insertAdjacentHTML(
       "beforeend",
@@ -45,6 +57,17 @@ export function applyLocalDates(dates, siteSettings) {
   });
 }
 
+function _rangeIsSameLocalDay(fromElement, toElement) {
+  const timezone = fromElement.attributes["data-timezone"].value;
+  const from = moment(_getDateFromElement(fromElement)).tz(timezone);
+  const to = moment(_getDateFromElement(toElement)).tz(timezone);
+  return from.isSame(to, "day");
+}
+
+function _getDateFromElement(element) {
+  return `${element.attributes["data-date"].value}T${element.attributes["data-time"].value}`;
+}
+
 function buildOptionsFromElement(element, siteSettings) {
   const opts = {};
   const dataset = element.dataset;
@@ -85,6 +108,7 @@ function buildOptionsFromMarkdownTag(element) {
   opts.displayedTimezone = element.attributes["data-displayed-timezone"];
   opts.format = element.attributes["data-format"];
   opts.countdown = element.attributes["data-countdown"];
+  opts.range = element.attributes["data-range"];
 
   return opts;
 }
@@ -189,7 +213,11 @@ function initializeDiscourseLocalDates(api) {
         this.metadata.discourseLocalDateStartRangeOpts = null;
         return "";
       }
-      if (this.element.attributes["data-range"] === "true") {
+      if (
+        this.element.attributes["data-range"] === "true" ||
+        this.element.attributes["data-range"] === "from" ||
+        this.element.attributes["data-range"] === "to"
+      ) {
         this.metadata.discourseLocalDateStartRangeOpts =
           buildOptionsFromMarkdownTag(this.element);
         return "";
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js
index 945ed5845a..e85e26a15b 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js
@@ -47,7 +47,7 @@ function addSingleLocalDate(buffer, state, config) {
     ]);
   }
   if (config.range) {
-    token.attrs.push(["data-range", true]);
+    token.attrs.push(["data-range", config.range]);
   }
 
   if (
@@ -152,12 +152,12 @@ function addLocalRange(buffer, matches, state) {
   config.timezones = parsed.attrs.timezones;
   config.displayedTimezone = parsed.attrs.displayedTimezone;
   config.countdown = parsed.attrs.countdown;
-  config.range = parsed.attrs.from && parsed.attrs.to;
 
   if (parsed.attrs.from) {
     [date, time] = parsed.attrs.from.split("T");
     config.date = date;
     config.time = time;
+    config.range = "from";
     addSingleLocalDate(buffer, state, config);
   }
   if (config.range) {
@@ -167,6 +167,7 @@ function addLocalRange(buffer, matches, state) {
     [date, time] = parsed.attrs.to.split("T");
     config.date = date;
     config.time = time;
+    config.range = "to";
     addSingleLocalDate(buffer, state, config);
   }
 }
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
index 2196eabaab..352ecd09b9 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
@@ -16,6 +16,7 @@ export default class LocalDateBuilder {
     this.time = params.time;
     this.date = params.date;
     this.recurring = params.recurring;
+    this.sameLocalDayAsFrom = params.sameLocalDayAsFrom;
     this.timezones = Array.from(
       new Set((params.timezones || []).filter(Boolean))
     );
@@ -233,6 +234,10 @@ export default class LocalDateBuilder {
           localDate.add(1, "day").datetime.endOf("day")
         );
 
+      if (this.sameLocalDayAsFrom) {
+        return this._timeOnlyFormat(localDate, displayedTimezone);
+      }
+
       if (inCalendarRange && sameTimezone) {
         const date = localDate.datetimeWithZone(this.localTimezone);
 
@@ -293,4 +298,8 @@ export default class LocalDateBuilder {
       .format(format);
     return `${formatted} (${this._zoneWithoutPrefix(displayedTimezone)})`;
   }
+
+  _timeOnlyFormat(localTime, displayedTimezone) {
+    return this._formatWithZone(localTime, displayedTimezone, "LT");
+  }
 }
diff --git a/plugins/discourse-local-dates/spec/integration/local_dates_spec.rb b/plugins/discourse-local-dates/spec/integration/local_dates_spec.rb
index 6d4425660e..2889d41fb4 100644
--- a/plugins/discourse-local-dates/spec/integration/local_dates_spec.rb
+++ b/plugins/discourse-local-dates/spec/integration/local_dates_spec.rb
@@ -91,7 +91,8 @@ RSpec.describe "Local Dates" do
       cooked = Fabricate(:post, raw: raw).cooked
 
       expect(cooked).to include('data-date="2022-01-06')
-      expect(cooked).to include('data-range="true"')
+      expect(cooked).to include('data-range="from"')
+      expect(cooked).to include('data-range="to"')
       expect(cooked).not_to include('data-time=')
     end
 
@@ -100,7 +101,8 @@ RSpec.describe "Local Dates" do
       cooked = Fabricate(:post, raw: raw).cooked
 
       expect(cooked).to include('data-date="2022-01-06')
-      expect(cooked).to include('data-range="true"')
+      expect(cooked).to include('data-range="to"')
+      expect(cooked).to include('data-range="from"')
       expect(cooked).to include('data-time="13:00"')
       expect(cooked).to include('data-timezone="Australia/Sydney"')
     end
@@ -111,7 +113,7 @@ RSpec.describe "Local Dates" do
 
       expect(cooked).to include('data-date="2022-01-06')
       expect(cooked).to include('data-time="13:00"')
-      expect(cooked).not_to include('data-range=')
+      expect(cooked).not_to include('data-range="to"')
     end
   end
 end
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
index 8f73b15152..5a640c476d 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
@@ -86,6 +86,20 @@ module("lib:local-date-builder", function () {
     );
   });
 
+  test("time", function (assert) {
+    assert.buildsCorrectDate(
+      {
+        "time": "12:22:00",
+        "date": "2022-10-07",
+        "timezone": "Asia/Singapore",
+        "localTimezone": "Asia/Singapore",
+        "sameLocalDayAsFrom": true
+      },
+      { formatted: "12:22 PM (Singapore)" },
+      "it displays the time only as the date is the same local day as 'from'"
+    );
+  });
+
   test("option[format]", function (assert) {
     freezeTime({ date: "2020-03-11" }, () => {
       assert.buildsCorrectDate(

From 14532ad4259f3b9b0ba94429b5db873e5f6f7bc0 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 7 Oct 2022 12:20:39 +0800
Subject: [PATCH 077/332] DEV: Try out double nav for new experimental user
 page nav (#18495)

No tests and this redesign is still highly highly experimental
---
 .../discourse/app/components/user-nav.hbs     | 140 ++++++------
 .../app/components/user-nav/messages-nav.hbs  |   4 +-
 .../discourse/app/controllers/user.js         |  12 -
 .../discourse/app/templates/preferences.hbs   | 212 ++++++++++++------
 .../discourse/app/templates/user-invited.hbs  |  26 ++-
 .../discourse/app/templates/user.hbs          |  16 +-
 .../discourse/app/templates/user/activity.hbs |   4 +-
 .../app/templates/user/notifications.hbs      |   2 +-
 .../stylesheets/common/base/new-user.scss     |  44 ++++
 app/assets/stylesheets/desktop/new-user.scss  |  17 +-
 app/assets/stylesheets/mobile/new-user.scss   |  43 ++--
 11 files changed, 304 insertions(+), 216 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index e5f45b102d..39d13e8d43 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -1,79 +1,77 @@
-{{#if @shouldDisplay}}
-  <section class="user-primary-navigation" {{did-insert this.registerClickListener}} {{will-destroy this.unregisterClickListener}}>
-    <ul class="main-nav nav nav-pills user-nav">
-      {{#unless @user.profile_hidden}}
-        <li class="summary">
-          <LinkTo @route="user.summary">
-            {{d-icon "user"}}
-            {{i18n "user.summary.title"}}
-          </LinkTo>
-        </li>
+<section class="user-navigation user-navigation-primary">
+  <ul class="main-nav nav nav-pills user-nav">
+    {{#unless @user.profile_hidden}}
+      <li class="summary">
+        <LinkTo @route="user.summary">
+          {{d-icon "user"}}
+          {{i18n "user.summary.title"}}
+        </LinkTo>
+      </li>
 
-        <li class="user-activity">
-          <LinkTo @route="userActivity">
-            {{d-icon "stream"}}
-            {{i18n "user.activity_stream"}}
-          </LinkTo>
-        </li>
-      {{/unless}}
+      <li class="user-activity">
+        <LinkTo @route="userActivity">
+          {{d-icon "stream"}}
+          {{i18n "user.activity_stream"}}
+        </LinkTo>
+      </li>
+    {{/unless}}
 
-      {{#if @showNotificationsTab}}
-        <li class="user-notifications">
-          <LinkTo @route="userNotifications">
-            {{d-icon "bell" class="glyph"}}{{i18n "user.notifications"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    {{#if @showNotificationsTab}}
+      <li class="user-notifications">
+        <LinkTo @route="userNotifications">
+          {{d-icon "bell" class="glyph"}}{{i18n "user.notifications"}}
+        </LinkTo>
+      </li>
+    {{/if}}
 
-      {{#if @showPrivateMessages}}
-        <li class="private-messages">
-          <LinkTo @route="userPrivateMessages">
-            {{d-icon "far-envelope"}}
-            {{i18n "user.private_messages"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    {{#if @showPrivateMessages}}
+      <li class="private-messages">
+        <LinkTo @route="userPrivateMessages">
+          {{d-icon "far-envelope"}}
+          {{i18n "user.private_messages"}}
+        </LinkTo>
+      </li>
+    {{/if}}
 
-      {{#if @canInviteToForum}}
-        <li class="invited">
-          <LinkTo @route="userInvited">
-            {{d-icon "user-plus"}}
-            {{i18n "user.invited.title"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    {{#if @canInviteToForum}}
+      <li class="invited">
+        <LinkTo @route="userInvited">
+          {{d-icon "user-plus"}}
+          {{i18n "user.invited.title"}}
+        </LinkTo>
+      </li>
+    {{/if}}
 
-      {{#if @showBadges}}
-        <li class="badges">
-          <LinkTo @route="user.badges">
-            {{d-icon "certificate"}}
-            {{i18n "badges.title"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    {{#if @showBadges}}
+      <li class="badges">
+        <LinkTo @route="user.badges">
+          {{d-icon "certificate"}}
+          {{i18n "badges.title"}}
+        </LinkTo>
+      </li>
+    {{/if}}
 
-      <PluginOutlet
-        @name="user-main-nav"
-        @connectorTagName="li"
-        @args={{hash model=@user}} />
+    <PluginOutlet
+      @name="user-main-nav"
+      @connectorTagName="li"
+      @args={{hash model=@user}} />
 
-      {{#if @user.can_edit}}
-        <li class="preferences">
-          <LinkTo @route="preferences">
-            {{d-icon "cog"}}
-            {{i18n "user.preferences"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    {{#if @user.can_edit}}
+      <li class="preferences">
+        <LinkTo @route="preferences">
+          {{d-icon "cog"}}
+          {{i18n "user.preferences"}}
+        </LinkTo>
+      </li>
+    {{/if}}
 
-      {{#if (and this.site.mobileView this.currentUser.staff)}}
-        <li class="admin">
-          <a href={{@user.adminPath}} >
-            {{d-icon "wrench"}}
-            {{i18n "admin.user.manage_user"}}
-          </a>
-        </li>
-      {{/if}}
-    </ul>
-  </section>
-{{/if}}
+    {{#if (and this.site.mobileView this.currentUser.staff)}}
+      <li class="admin">
+        <a href={{@user.adminPath}} >
+          {{d-icon "wrench"}}
+          {{i18n "admin.user.manage_user"}}
+        </a>
+      </li>
+    {{/if}}
+  </ul>
+</section>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
index e0744b6030..b7aa2a8f31 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
@@ -1,4 +1,4 @@
-<div class="user-navigation-container">
+<div class="user-navigation user-navigation-secondary">
   {{#if (gt @user.groupsWithMessages.length 0)}}
     <ol class="category-breadcrumb">
       <li>
@@ -7,7 +7,7 @@
     </ol>
   {{/if}}
 
-  <ul id="navigation-bar" class="messages-nav nav-pills action-list">
+  <ul class="messages-nav nav-pills action-list">
     {{#if @isPersonal}}
       <li>
         <LinkTo @route="userPrivateMessages.index" @model={{@user}}>
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 8f2d24beb1..35d086ecb7 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -17,13 +17,6 @@ export default Controller.extend(CanCheckEmails, {
   dialog: service(),
   userNotifications: controller("user-notifications"),
   adminTools: optionalService(),
-  displayUserNav: false,
-
-  init() {
-    this._super(...arguments);
-
-    this.displayUserNav = this.site.desktopView;
-  },
 
   @discourseComputed("model.username")
   viewingSelf(username) {
@@ -195,11 +188,6 @@ export default Controller.extend(CanCheckEmails, {
     }
   ),
 
-  @action
-  toggleUserNav() {
-    this.toggleProperty("displayUserNav");
-  },
-
   get displayTopLevelAdminButton() {
     if (!this.currentUser?.staff) {
       return false;
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index 914a54652c..a469349e64 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -1,75 +1,153 @@
-<DSection @pageClass="user-preferences" @class="user-secondary-navigation">
-  <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
-    <li class="nav-account">
-      <LinkTo @route="preferences.account">
-        {{i18n "user.preferences_nav.account"}}
-      </LinkTo>
-    </li>
-    <li class="nav-security">
-      <LinkTo @route="preferences.security">
-        {{i18n "user.preferences_nav.security"}}
-      </LinkTo>
-    </li>
-    <li class="nav-profile">
-      <LinkTo @route="preferences.profile">
-        {{i18n "user.preferences_nav.profile"}}
-      </LinkTo>
-    </li>
-    <li class="nav-emails">
-      <LinkTo @route="preferences.emails">
-        {{i18n "user.preferences_nav.emails"}}
-      </LinkTo>
-    </li>
-    <li class="nav-notifications">
-      <LinkTo @route="preferences.notifications">
-        {{i18n "user.preferences_nav.notifications"}}
-      </LinkTo>
-    </li>
-    {{#if this.model.can_change_tracking_preferences}}
-      <li class="indent nav-categories">
-        <LinkTo @route="preferences.categories">
-          {{i18n "user.preferences_nav.categories"}}
-        </LinkTo>
-      </li>
-    {{/if}}
-    <li class="indent nav-users">
-      <LinkTo @route="preferences.users">
-        {{i18n "user.preferences_nav.users"}}
-      </LinkTo>
-    </li>
-    {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
-      <li class="indent nav-tags">
-        <LinkTo @route="preferences.tags">
-          {{i18n "user.preferences_nav.tags"}}
-        </LinkTo>
-      </li>
-    {{/if}}
-    <li class="nav-interface">
-      <LinkTo @route="preferences.interface">
-        {{i18n "user.preferences_nav.interface"}}
-      </LinkTo>
-    </li>
+{{#if this.currentUser.redesigned_user_page_nav_enabled}}
+  <DSection @pageClass="user-preferences" />
 
-    {{#if this.siteSettings.enable_experimental_sidebar_hamburger}}
-      <li class="indent nav-sidebar">
-        <LinkTo @route="preferences.sidebar">
-          {{i18n "user.preferences_nav.sidebar"}}
+  <div class="user-navigation user-navigation-secondary">
+    <ul class="nav-pills action-list">
+      <li class="nav-account">
+        <LinkTo @route="preferences.account">
+          {{i18n "user.preferences_nav.account"}}
         </LinkTo>
       </li>
-    {{/if}}
-
-    <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
-
-    {{#if this.model.userApiKeys}}
-      <li class="nav-apps">
-        <LinkTo @route="preferences.apps">
-          {{i18n "user.preferences_nav.apps"}}
+      <li class="nav-security">
+        <LinkTo @route="preferences.security">
+          {{i18n "user.preferences_nav.security"}}
         </LinkTo>
       </li>
-    {{/if}}
-    <PluginOutlet @name="user-preferences-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
-  </MobileNav>
-</DSection>
+      <li class="nav-profile">
+        <LinkTo @route="preferences.profile">
+          {{i18n "user.preferences_nav.profile"}}
+        </LinkTo>
+      </li>
+      <li class="nav-emails">
+        <LinkTo @route="preferences.emails">
+          {{i18n "user.preferences_nav.emails"}}
+        </LinkTo>
+      </li>
+      <li class="nav-notifications">
+        <LinkTo @route="preferences.notifications">
+          {{i18n "user.preferences_nav.notifications"}}
+        </LinkTo>
+      </li>
+      {{#if this.model.can_change_tracking_preferences}}
+        <li class="indent nav-categories">
+          <LinkTo @route="preferences.categories">
+            {{i18n "user.preferences_nav.categories"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <li class="indent nav-users">
+        <LinkTo @route="preferences.users">
+          {{i18n "user.preferences_nav.users"}}
+        </LinkTo>
+      </li>
+      {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
+        <li class="indent nav-tags">
+          <LinkTo @route="preferences.tags">
+            {{i18n "user.preferences_nav.tags"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <li class="nav-interface">
+        <LinkTo @route="preferences.interface">
+          {{i18n "user.preferences_nav.interface"}}
+        </LinkTo>
+      </li>
+
+      {{#if this.siteSettings.enable_experimental_sidebar_hamburger}}
+        <li class="indent nav-sidebar">
+          <LinkTo @route="preferences.sidebar">
+            {{i18n "user.preferences_nav.sidebar"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+
+      <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
+
+      {{#if this.model.userApiKeys}}
+        <li class="nav-apps">
+          <LinkTo @route="preferences.apps">
+            {{i18n "user.preferences_nav.apps"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+
+      <PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=this.model}} />
+    </ul>
+  </div>
+{{else}}
+  <DSection @pageClass="user-preferences" @class="user-secondary-navigation">
+    <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
+      <li class="nav-account">
+        <LinkTo @route="preferences.account">
+          {{i18n "user.preferences_nav.account"}}
+        </LinkTo>
+      </li>
+      <li class="nav-security">
+        <LinkTo @route="preferences.security">
+          {{i18n "user.preferences_nav.security"}}
+        </LinkTo>
+      </li>
+      <li class="nav-profile">
+        <LinkTo @route="preferences.profile">
+          {{i18n "user.preferences_nav.profile"}}
+        </LinkTo>
+      </li>
+      <li class="nav-emails">
+        <LinkTo @route="preferences.emails">
+          {{i18n "user.preferences_nav.emails"}}
+        </LinkTo>
+      </li>
+      <li class="nav-notifications">
+        <LinkTo @route="preferences.notifications">
+          {{i18n "user.preferences_nav.notifications"}}
+        </LinkTo>
+      </li>
+      {{#if this.model.can_change_tracking_preferences}}
+        <li class="indent nav-categories">
+          <LinkTo @route="preferences.categories">
+            {{i18n "user.preferences_nav.categories"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <li class="indent nav-users">
+        <LinkTo @route="preferences.users">
+          {{i18n "user.preferences_nav.users"}}
+        </LinkTo>
+      </li>
+      {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
+        <li class="indent nav-tags">
+          <LinkTo @route="preferences.tags">
+            {{i18n "user.preferences_nav.tags"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <li class="nav-interface">
+        <LinkTo @route="preferences.interface">
+          {{i18n "user.preferences_nav.interface"}}
+        </LinkTo>
+      </li>
+
+      {{#if this.siteSettings.enable_experimental_sidebar_hamburger}}
+        <li class="indent nav-sidebar">
+          <LinkTo @route="preferences.sidebar">
+            {{i18n "user.preferences_nav.sidebar"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+
+      <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
+
+      {{#if this.model.userApiKeys}}
+        <li class="nav-apps">
+          <LinkTo @route="preferences.apps">
+            {{i18n "user.preferences_nav.apps"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      <PluginOutlet @name="user-preferences-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
+    </MobileNav>
+  </DSection>
+{{/if}}
 
 <section class="user-content user-preferences">
   <PluginOutlet @name="above-user-preferences" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited.hbs b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
index 4f33488b3a..d634e12bf9 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
@@ -1,11 +1,23 @@
 {{#if this.can_see_invite_details}}
-  <DSection @class="user-secondary-navigation" @pageClass="user-invites">
-    <MobileNav @class="invites-nav" @desktopClass="nav-stacked action-list">
-      <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{this.pendingLabel}} />
-      <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{this.expiredLabel}} />
-      <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{this.redeemedLabel}} />
-    </MobileNav>
-  </DSection>
+  {{#if this.currentUser.redesigned_user_page_nav_enabled}}
+    <DSection @pageClass="user-invites" />
+
+    <div class="user-navigation user-navigation-secondary">
+      <ul id="navigation-bar" class="nav-pills action-list">
+        <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{this.pendingLabel}} />
+        <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{this.expiredLabel}} />
+        <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{this.redeemedLabel}} />
+      </ul>
+    </div>
+  {{else}}
+    <DSection @class="user-secondary-navigation" @pageClass="user-invites">
+      <MobileNav @class="invites-nav" @desktopClass="nav-stacked action-list">
+        <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{this.pendingLabel}} />
+        <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{this.expiredLabel}} />
+        <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{this.redeemedLabel}} />
+      </MobileNav>
+    </DSection>
+  {{/if}}
 {{/if}}
 
 {{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index d036d2111e..553196e307 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -77,12 +77,6 @@
                   <DButton @ariaExpanded={{this.collapsedInfoState.isExpanded}} @ariaLabel={{this.collapsedInfoState.ariaLabel}} @ariaControls="collapsed-info-panel" @class="btn-default" @label={{concat "user." this.collapsedInfoState.label}} @icon={{this.collapsedInfoState.icon}} @action={{action this.collapsedInfoState.action}} />
                 </li>
               {{/if}}
-
-              {{#if (and this.site.mobileView this.currentUser.redesigned_user_page_nav_enabled)}}
-                <li>
-                  <DButton @class="btn-default toggle-mobile-user-menu" @action={{this.toggleUserNav}} @icon="bars" @label="hamburger_menu" />
-                </li>
-              {{/if}}
             </ul>
           </section>
 
@@ -237,8 +231,6 @@
     {{#if this.currentUser.redesigned_user_page_nav_enabled}}
       <div class="new-user-wrapper">
         <UserNav
-          @shouldDisplay={{this.displayUserNav}}
-          @toggleUserNav={{this.toggleUserNav}}
           @user={{this.model}}
           @showNotificationsTab={{this.showNotificationsTab}}
           @showPrivateMessages={{this.showPrivateMessages}}
@@ -249,11 +241,9 @@
           @showDrafts={{this.showDrafts}}
           @showBookmarks={{this.showBookmarks}} />
 
-        {{#if (or this.site.desktopView (not this.displayUserNav))}}
-          <div class="new-user-content-wrapper">
-            {{outlet}}
-          </div>
-        {{/if}}
+        <div class="new-user-content-wrapper">
+          {{outlet}}
+        </div>
       </div>
     {{else}}
       <div class='user-content-wrapper'>
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 18a0971b36..9d53a20d0f 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -1,8 +1,8 @@
 {{#if this.currentUser.redesigned_user_page_nav_enabled}}
   <DSection @pageClass="user-activity" />
 
-  <div class="user-navigation-container">
-    <ul id="navigation-bar" class="nav-pills action-list">
+  <div class="user-navigation user-navigation-secondary">
+    <ul class="nav-pills action-list">
       <DNavigationItem @route="userActivity.index">{{i18n "user.filters.all"}}</DNavigationItem>
       <DNavigationItem @route="userActivity.topics">{{i18n "user_action_groups.4"}}</DNavigationItem>
       <DNavigationItem @route="userActivity.replies">{{i18n "user_action_groups.5"}}</DNavigationItem>
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index a1ba2bbf29..15a4c78d2c 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -1,7 +1,7 @@
 {{#if this.currentUser.redesigned_user_page_nav_enabled}}
   <DSection @pageClass="user-notifications" />
 
-  <div class="user-navigation-container">
+  <div class="user-navigation user-navigation-secondary">
     <ul id="navigation-bar" class="messages-nav nav-pills action-list">
       <li>
         <LinkTo @route="userNotifications.index">
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index 0ad82a46cb..65b3a6abc9 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -1,4 +1,48 @@
 .new-user-wrapper {
+  .user-navigation {
+    &.user-navigation-secondary {
+      margin-top: 0.5em;
+
+      .nav-pills {
+        border-bottom: 1px solid var(--primary-low);
+      }
+    }
+
+    .nav-pills {
+      width: 100%;
+      border-bottom: 2px solid var(--primary-low);
+      margin: 0;
+
+      li {
+        margin: 0;
+
+        a {
+          display: inline-block;
+          text-align: center;
+          position: relative;
+          border-bottom: 2px solid transparent;
+          padding: 0.5em 1em;
+
+          &.active,
+          &:hover {
+            color: var(--quaternary);
+            background-color: var(--secondary);
+          }
+
+          &.active::after {
+            display: block;
+            content: "";
+            position: absolute;
+            width: 100%;
+            border-bottom: 2px solid var(--quaternary);
+            bottom: -4px;
+            left: 0px;
+          }
+        }
+      }
+    }
+  }
+
   .user-nav-dropdown-button {
     background: transparent;
   }
diff --git a/app/assets/stylesheets/desktop/new-user.scss b/app/assets/stylesheets/desktop/new-user.scss
index dd378295a6..dbc615eb9f 100644
--- a/app/assets/stylesheets/desktop/new-user.scss
+++ b/app/assets/stylesheets/desktop/new-user.scss
@@ -7,14 +7,7 @@
     grid-template-rows: auto 1fr;
     grid-gap: 20px;
 
-    .user-secondary-navigation {
-      grid-column-start: 1;
-      grid-column-end: 2;
-      grid-row-start: 1;
-      grid-row-end: 2;
-    }
-
-    .user-navigation-container {
+    .user-navigation-secondary {
       grid-column-start: 1;
       grid-column-end: 3;
       grid-row-start: 1;
@@ -24,7 +17,7 @@
       flex-direction: row;
     }
 
-    .user-navigation-container ~ .user-content {
+    .user-navigation-secondary ~ .user-content {
       grid-column-start: 1;
       grid-column-end: 3;
       grid-row-start: 2;
@@ -32,6 +25,7 @@
     }
 
     .user-content {
+      margin-top: 1em;
       grid-column-start: 1;
       grid-column-end: 3;
       grid-row-start: 1;
@@ -43,11 +37,6 @@
       justify-self: start;
       grid-row-start: 2;
     }
-
-    .user-secondary-navigation ~ .user-content {
-      grid-column-start: 2;
-      grid-column-end: 3;
-    }
   }
 
   .user-nav-dropdown-list-item {
diff --git a/app/assets/stylesheets/mobile/new-user.scss b/app/assets/stylesheets/mobile/new-user.scss
index 8fe72e0053..26de4fbc7a 100644
--- a/app/assets/stylesheets/mobile/new-user.scss
+++ b/app/assets/stylesheets/mobile/new-user.scss
@@ -1,22 +1,24 @@
 .new-user-wrapper {
-  .user-nav {
-    flex-direction: column;
+  .user-navigation {
+    width: 100%;
 
-    > li {
-      width: 100%;
+    .nav-pills {
+      margin: 0.5em 0;
+      overflow-x: auto;
 
-      .d-icon {
-        margin-right: 0.5em;
+      scrollbar-width: none;
+
+      &::-webkit-scrollbar {
+        display: none;
       }
 
-      &:not(:first-of-type) {
-        border-top: 1px solid var(--primary-low);
-      }
-
-      > a,
-      button {
-        padding: 1em 0.75em;
-        width: 100%;
+      li {
+        a {
+          display: flex;
+          flex-direction: row;
+          padding: 0.5em 0.5em;
+          white-space: nowrap;
+        }
       }
     }
   }
@@ -49,17 +51,4 @@
       @include ellipsis;
     }
   }
-
-  #navigation-bar {
-    margin-top: 1em;
-    display: flex;
-    flex-wrap: nowrap;
-    width: 100%;
-    overflow-x: scroll;
-    margin-bottom: 0;
-    padding-bottom: 0.5em;
-    a {
-      white-space: nowrap;
-    }
-  }
 }

From e391f71c04f2078f0f58060f450edda786185dc7 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Fri, 7 Oct 2022 21:07:27 +0800
Subject: [PATCH 078/332] FIX: Determining local date same range is erroring
 when there is no date (#18509)

---
 .../initializers/discourse-local-dates.js     |  6 ++
 .../lib/local-date-builder-test.js            | 12 +--
 .../unit/discourse-local-dates-test.js        | 80 +++++++++++++++++++
 3 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js

diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
index d360d643fd..84b6842257 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
@@ -58,6 +58,12 @@ export function applyLocalDates(dates, siteSettings) {
 }
 
 function _rangeIsSameLocalDay(fromElement, toElement) {
+  if (
+    !fromElement.attributes["data-time"] ||
+    !toElement.attributes["data-time"]
+  ) {
+    return false;
+  }
   const timezone = fromElement.attributes["data-timezone"].value;
   const from = moment(_getDateFromElement(fromElement)).tz(timezone);
   const to = moment(_getDateFromElement(toElement)).tz(timezone);
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
index 5a640c476d..3cf8bb0f02 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
@@ -11,7 +11,7 @@ const PARIS = "Europe/Paris";
 const LAGOS = "Africa/Lagos";
 const LONDON = "Europe/London";
 
-function freezeTime({ date, timezone }, cb) {
+export function freezeTime({ date, timezone }, cb) {
   date = date || "2020-01-22 10:34";
   const newTimezone = timezone || PARIS;
   const previousZone = moment.tz.guess();
@@ -89,11 +89,11 @@ module("lib:local-date-builder", function () {
   test("time", function (assert) {
     assert.buildsCorrectDate(
       {
-        "time": "12:22:00",
-        "date": "2022-10-07",
-        "timezone": "Asia/Singapore",
-        "localTimezone": "Asia/Singapore",
-        "sameLocalDayAsFrom": true
+        time: "12:22:00",
+        date: "2022-10-07",
+        timezone: "Asia/Singapore",
+        localTimezone: "Asia/Singapore",
+        sameLocalDayAsFrom: true,
       },
       { formatted: "12:22 PM (Singapore)" },
       "it displays the time only as the date is the same local day as 'from'"
diff --git a/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js b/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js
new file mode 100644
index 0000000000..d88a8bb7cf
--- /dev/null
+++ b/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js
@@ -0,0 +1,80 @@
+import { module, test } from "qunit";
+import { applyLocalDates } from "../initializers/discourse-local-dates";
+import { freezeTime } from "../lib/local-date-builder-test";
+
+module("Unit | Discourse Local Dates | discourse-local-dates", function () {
+  function createElementFromHTML(htmlString) {
+    const div = document.createElement("div");
+    div.innerHTML = htmlString.trim();
+    // we need "element", not "node", since `.dataset` isn't available on nodes
+    return div.firstElementChild;
+  }
+
+  const fromElement = () =>
+    createElementFromHTML(
+      "<span " +
+        'data-date="2022-10-06" ' +
+        'data-time="17:21:00" ' +
+        'class="discourse-local-date" ' +
+        'data-range="from" ' +
+        'data-timezone="Asia/Singapore" ' +
+        'data-title="Testing dates with the local date builder">' +
+        "</span>"
+    );
+  const toElement = () =>
+    createElementFromHTML(
+      "<span " +
+        'data-date="2022-10-06" ' +
+        'data-time="22:22:00" ' +
+        'class="discourse-local-date" ' +
+        'data-range="to" ' +
+        'data-timezone="Asia/Singapore" ' +
+        'data-title="Testing dates with the local date builder">' +
+        "</span>"
+    );
+
+  test("applyLocalDates sets formatted relative time", function (assert) {
+    const from = fromElement();
+    const to = toElement();
+    const dateElements = [from, to];
+
+    freezeTime(
+      { date: "2022-10-07T10:10:10", timezone: "Asia/Singapore" },
+      () => {
+        applyLocalDates(dateElements, { discourse_local_dates_enabled: true });
+
+        assert.equal(
+          from.querySelector(".relative-time").textContent,
+          "Yesterday 5:21 PM"
+        );
+        assert.equal(
+          to.querySelector(".relative-time").textContent,
+          "10:22 PM (Singapore)"
+        );
+      }
+    );
+  });
+
+  test("applyLocalDates does not fail when a date element has no time", function (assert) {
+    const from = fromElement();
+    const to = toElement();
+    delete to.dataset.time;
+    const dateElements = [from, to];
+
+    freezeTime(
+      { date: "2022-10-07T10:10:10", timezone: "Asia/Singapore" },
+      () => {
+        applyLocalDates(dateElements, { discourse_local_dates_enabled: true });
+
+        assert.equal(
+          from.querySelector(".relative-time").textContent,
+          "Yesterday 5:21 PM"
+        );
+        assert.equal(
+          to.querySelector(".relative-time").textContent,
+          "Thursday"
+        );
+      }
+    );
+  });
+});

From 08476f17ff641736b80f75fa5cbfa404fdba36ed Mon Sep 17 00:00:00 2001
From: Jan Cernik <66427541+cernikkk@users.noreply.github.com>
Date: Fri, 7 Oct 2022 12:00:44 -0300
Subject: [PATCH 079/332] FEATURE: Add dark mode option for category logos
 (#18460)

Adds a new upload field for a second dark mode category logo.
This alternative will be used when the browser is in dark mode (similar to the global site setting for a dark logo).
---
 .../discourse/app/components/category-logo.js  |  3 +++
 .../app/components/edit-category-images.js     | 13 +++++++++++++
 .../discourse/app/models/category.js           |  1 +
 .../categories-boxes-with-topics.hbs           |  2 +-
 .../templates/components/categories-boxes.hbs  |  6 ++++--
 .../app/templates/components/category-logo.hbs | 10 ++++++++++
 .../components/category-title-link.hbs         |  2 +-
 .../app/templates/components/cdn-img.hbs       |  4 +---
 .../components/edit-category-images.hbs        |  5 +++++
 .../app/templates/navigation/category.hbs      |  3 +--
 .../stylesheets/common/base/_topic-list.scss   |  2 +-
 .../stylesheets/common/base/category-list.scss |  8 ++++----
 app/controllers/categories_controller.rb       |  1 +
 app/models/category.rb                         |  6 ++++--
 app/models/category_list.rb                    |  1 +
 app/models/site.rb                             |  2 +-
 app/serializers/basic_category_serializer.rb   |  1 +
 config/locales/client.en.yml                   |  1 +
 ...4122343_add_dark_mode_logo_to_categories.rb |  7 +++++++
 lib/tasks/site.rake                            |  1 +
 lib/tasks/uploads.rake                         |  1 +
 lib/upload_security.rb                         |  1 +
 spec/jobs/clean_up_uploads_spec.rb             | 18 ++++++++++++++----
 spec/models/upload_reference_spec.rb           |  7 ++++---
 .../schemas/json/category_create_response.json |  7 +++++++
 .../schemas/json/category_list_response.json   |  7 +++++++
 .../schemas/json/category_update_response.json |  7 +++++++
 .../api/schemas/json/site_response.json        |  7 +++++++
 28 files changed, 110 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/category-logo.js
 create mode 100644 app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
 create mode 100644 db/migrate/20221004122343_add_dark_mode_logo_to_categories.rb

diff --git a/app/assets/javascripts/discourse/app/components/category-logo.js b/app/assets/javascripts/discourse/app/components/category-logo.js
new file mode 100644
index 0000000000..742bb3c18e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/category-logo.js
@@ -0,0 +1,3 @@
+import templateOnly from "@ember/component/template-only";
+
+export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-images.js b/app/assets/javascripts/discourse/app/components/edit-category-images.js
index 174a8ed614..a11669854f 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-images.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-images.js
@@ -13,6 +13,11 @@ export default buildCategoryPanel("images").extend({
     return uploadedLogoUrl || "";
   },
 
+  @discourseComputed("category.uploaded_logo_dark.url")
+  logoImageDarkUrl(uploadedLogoDarkUrl) {
+    return uploadedLogoDarkUrl || "";
+  },
+
   actions: {
     logoUploadDone(upload) {
       this._setFromUpload("category.uploaded_logo", upload);
@@ -22,6 +27,14 @@ export default buildCategoryPanel("images").extend({
       this._deleteUpload("category.uploaded_logo");
     },
 
+    logoDarkUploadDone(upload) {
+      this._setFromUpload("category.uploaded_logo_dark", upload);
+    },
+
+    logoDarkUploadDeleted() {
+      this._deleteUpload("category.uploaded_logo_dark");
+    },
+
     backgroundUploadDone(upload) {
       this._setFromUpload("category.uploaded_background", upload);
     },
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 5fff896cee..2453ffc140 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -216,6 +216,7 @@ const Category = RestModel.extend({
         mailinglist_mirror: this.mailinglist_mirror,
         parent_category_id: this.parent_category_id,
         uploaded_logo_id: this.get("uploaded_logo.id"),
+        uploaded_logo_dark_id: this.get("uploaded_logo_dark.id"),
         uploaded_background_id: this.get("uploaded_background.id"),
         allow_badges: this.allow_badges,
         custom_fields: this.custom_fields,
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
index f2b2c622ec..5a3b241b2c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
@@ -5,7 +5,7 @@
         <a href={{c.url}}>
           {{#unless c.isMuted}}
             {{#if c.uploaded_logo.url}}
-              <CdnImg @src={{c.uploaded_logo.url}} @class="logo" @width={{c.uploaded_logo.width}} @height={{c.uploaded_logo.height}} @alt="" />
+              <CategoryLogo @category={{c}} />
             {{/if}}
           {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
index 844cc9f0e7..053d5cac0a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
@@ -6,7 +6,7 @@
       {{#unless c.isMuted}}
         <div class="category-logo">
           {{#if c.uploaded_logo.url}}
-            <CdnImg @src={{c.uploaded_logo.url}} @class="logo" @width={{c.uploaded_logo.width}} @height={{c.uploaded_logo.height}} @alt="" />
+            <CategoryLogo @category={{c}} />
           {{/if}}
         </div>
       {{/unless}}
@@ -54,7 +54,9 @@
               {{#each c.subcategories as |sc|}}
                 <a class="subcategory" href={{sc.url}}>
                   <span class="subcategory-image-placeholder">
-                    <CdnImg @src={{sc.uploaded_logo.url}} @class="logo" @width={{sc.uploaded_logo.width}} @height={{sc.uploaded_logo.height}} @alt="" />
+                    {{#if sc.uploaded_logo.url}}
+                      <CategoryLogo @category={{sc}} />
+                    {{/if}}
                   </span>
 
                   {{category-link sc hideParent="true"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs b/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
new file mode 100644
index 0000000000..8b67105bd7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
@@ -0,0 +1,10 @@
+<div class="category-logo aspect-image">
+  {{#if (and @category.uploaded_logo.url @category.uploaded_logo_dark.url)}}
+    <picture>
+      <source srcset={{@category.uploaded_logo_dark.url}} width={{@category.uploaded_logo_dark.width}} height={{@category.uploaded_logo_dark.height}} media="(prefers-color-scheme: dark)">
+      <CdnImg @src={{@category.uploaded_logo.url}} @width={{@category.uploaded_logo.width}} @height={{@category.uploaded_logo.height}}/>
+    </picture>
+  {{else if @category.uploaded_logo.url}}
+    <CdnImg @src={{@category.uploaded_logo.url}} @width={{@category.uploaded_logo.width}} @height={{@category.uploaded_logo.height}}/>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
index e268b9d08e..89b6b1a777 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
@@ -7,6 +7,6 @@
     <span class="category-name">{{dir-span this.category.name}}</span>
   </div>
   {{#if this.category.uploaded_logo.url}}
-    <CdnImg @src={{this.category.uploaded_logo.url}} @class="category-logo" @width={{this.category.uploaded_logo.width}} @height={{this.category.uploaded_logo.height}} @alt="" />
+    <CategoryLogo @category={{this.category}} />
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
index e09aa5ac34..96b5db49ed 100644
--- a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
@@ -1,5 +1,3 @@
 {{#if this.src}}
-  <div class="{{this.class}} aspect-image" style={{this.style}}>
-    <img src={{this.cdnSrc}} width={{this.width}} height={{this.height}} alt={{this.alt}}>
-  </div>
+  <img src={{this.cdnSrc}} width={{this.width}} height={{this.height}} style={{this.style}}  alt="">
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
index 3f7fcbff36..4fae14a94d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
@@ -3,6 +3,11 @@
   <UppyImageUploader @imageUrl={{this.logoImageUrl}} @onUploadDone={{action "logoUploadDone"}} @onUploadDeleted={{action "logoUploadDeleted"}} @type="category_logo" @class="no-repeat contain-image" @id="category-logo-uploader" />
 </section>
 
+<section class="field category-logo">
+  <label>{{i18n "category.logo_dark"}}</label>
+  <UppyImageUploader @imageUrl={{this.logoImageDarkUrl}} @onUploadDone={{action "logoDarkUploadDone"}} @onUploadDeleted={{action "logoDarkUploadDeleted"}} @type="category_logo_dark" @class="no-repeat contain-image" @id="category-dark-logo-uploader" />
+</section>
+
 <section class="field category-background-image">
   <label>{{i18n "category.background_image"}}</label>
   <UppyImageUploader @imageUrl={{this.backgroundImageUrl}} @onUploadDone={{action "backgroundUploadDone"}} @onUploadDeleted={{action "backgroundUploadDeleted"}} @type="category_background" @id="category-background-uploader" />
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
index b60bb7159d..57e6b57007 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
@@ -2,8 +2,7 @@
 
 <section class="category-heading">
   {{#if this.category.uploaded_logo.url}}
-    <CdnImg @src={{this.category.uploaded_logo.url}} @class="category-logo" @width={{this.category.uploaded_logo.width}} @height={{this.category.uploaded_logo.height}} @alt="" />
-
+    <CategoryLogo @category={{this.category}} />
     {{#if this.category.description}}
       <p>{{dir-span this.category.description htmlSafe="true"}}</p>
     {{/if}}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 90646ddcac..b04e40e97c 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -116,7 +116,7 @@
       width: 100%;
       height: inherit;
       max-width: initial;
-      max-height: initial;
+      max-height: var(--max-height);
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 09f0f5682e..f3b52df42f 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -78,7 +78,7 @@
       }
     }
 
-    .logo.aspect-image img {
+    .category-logo.aspect-image img {
       display: block;
       width: auto;
       height: 40px;
@@ -86,7 +86,7 @@
     }
 
     @supports (--custom: property) {
-      .logo.aspect-image img {
+      .category-logo.aspect-image img {
         --height: 40px;
         height: var(--height);
         width: calc(var(--height) * var(--aspect-ratio));
@@ -110,7 +110,7 @@
   }
 
   &.no-logos {
-    .logo {
+    .category-logo {
       display: none;
     }
   }
@@ -241,7 +241,7 @@
         min-width: 0;
         @include ellipsis;
       }
-      .logo img {
+      .category-logo img {
         display: inline-block;
         --height: 20px;
         height: var(--height);
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 2ac2415160..33325cf61c 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -353,6 +353,7 @@ class CategoriesController < ApplicationController
         :auto_close_hours,
         :auto_close_based_on_last_post,
         :uploaded_logo_id,
+        :uploaded_logo_dark_id,
         :uploaded_background_id,
         :slug,
         :allow_badges,
diff --git a/app/models/category.rb b/app/models/category.rb
index f9052ce397..adafc49a0f 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -35,6 +35,7 @@ class Category < ActiveRecord::Base
   belongs_to :user
   belongs_to :latest_post, class_name: "Post"
   belongs_to :uploaded_logo, class_name: "Upload"
+  belongs_to :uploaded_logo_dark, class_name: "Upload"
   belongs_to :uploaded_background, class_name: "Upload"
 
   has_many :topics
@@ -82,8 +83,8 @@ class Category < ActiveRecord::Base
   after_save :update_reviewables
 
   after_save do
-    if saved_change_to_uploaded_logo_id? || saved_change_to_uploaded_background_id?
-      upload_ids = [self.uploaded_logo_id, self.uploaded_background_id]
+    if saved_change_to_uploaded_logo_id? || saved_change_to_uploaded_logo_dark_id? || saved_change_to_uploaded_background_id?
+      upload_ids = [self.uploaded_logo_id, self.uploaded_logo_dark_id, self.uploaded_background_id]
       UploadReference.ensure_exist!(upload_ids: upload_ids, target: self)
     end
   end
@@ -1064,6 +1065,7 @@ end
 #  default_list_filter                       :string(20)       default("all")
 #  allow_unlimited_owner_edits_on_first_post :boolean          default(FALSE), not null
 #  default_slow_mode_seconds                 :integer
+#  uploaded_logo_dark_id                     :integer
 #
 # Indexes
 #
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 743a4cc446..ef8e78329e 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -99,6 +99,7 @@ class CategoryList
     @categories = Category.includes(
       :uploaded_background,
       :uploaded_logo,
+      :uploaded_logo_dark,
       :topic_only_relative_url,
       subcategories: [:topic_only_relative_url]
     ).secured(@guardian)
diff --git a/app/models/site.rb b/app/models/site.rb
index b76a0fa2a0..4a9c08488a 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -69,7 +69,7 @@ class Site
     # corresponding ActiveRecord callback to clear the categories cache.
     Discourse.cache.fetch(categories_cache_key, expires_in: 30.minutes) do
       categories = Category
-        .includes(:uploaded_logo, :uploaded_background, :tags, :tag_groups, category_required_tag_groups: :tag_group)
+        .includes(:uploaded_logo, :uploaded_logo_dark, :uploaded_background, :tags, :tag_groups, category_required_tag_groups: :tag_group)
         .joins('LEFT JOIN topics t on t.id = categories.topic_id')
         .select('categories.*, t.slug topic_slug')
         .order(:position)
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 87c02a67a9..fe1b8cd2f7 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -34,6 +34,7 @@ class BasicCategorySerializer < ApplicationSerializer
              :custom_fields
 
   has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
+  has_one :uploaded_logo_dark, embed: :object, serializer: CategoryUploadSerializer
   has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer
 
   def include_parent_category_id?
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e8f39b3f01..b8321bc94e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3450,6 +3450,7 @@ en:
       name: "Category Name"
       description: "Description"
       logo: "Category Logo Image"
+      logo_dark: "Dark Mode Category Logo Image"
       background_image: "Category Background Image"
       badge_colors: "Badge colors"
       background_color: "Background color"
diff --git a/db/migrate/20221004122343_add_dark_mode_logo_to_categories.rb b/db/migrate/20221004122343_add_dark_mode_logo_to_categories.rb
new file mode 100644
index 0000000000..6fa8ba03dd
--- /dev/null
+++ b/db/migrate/20221004122343_add_dark_mode_logo_to_categories.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDarkModeLogoToCategories < ActiveRecord::Migration[7.0]
+  def change
+    add_column :categories, :uploaded_logo_dark_id, :integer, index: true
+  end
+end
diff --git a/lib/tasks/site.rake b/lib/tasks/site.rake
index 9a05d5fd96..870e31dc1b 100644
--- a/lib/tasks/site.rake
+++ b/lib/tasks/site.rake
@@ -210,6 +210,7 @@ task 'site:export_structure', [:zip_path] => :environment do |task, args|
       sort_order: c.sort_order,
       sort_ascending: c.sort_ascending,
       uploaded_logo_id: data.set_upload(c.uploaded_logo_id),
+      uploaded_logo_dark_id: data.set_upload(c.uploaded_logo_dark_id),
       uploaded_background_id: data.set_upload(c.uploaded_background_id),
       topic_featured_link_allowed: c.topic_featured_link_allowed,
       all_topics_wiki: c.all_topics_wiki,
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 4d685580b4..bfc2806faa 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -905,6 +905,7 @@ def analyze_missing_s3
       [:user_profiles, :profile_background_upload_id],
       [:user_profiles, :card_background_upload_id],
       [:categories, :uploaded_logo_id],
+      [:categories, :uploaded_logo_dark_id],
       [:categories, :uploaded_background_id],
       [:custom_emojis, :upload_id],
       [:theme_fields, :upload_id],
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index dcaa7f1098..c784b25aa2 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -29,6 +29,7 @@ class UploadSecurity
     profile_background
     card_background
     category_logo
+    category_logo_dark
     category_background
     group_flair
     badge_image
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 842f3e0d1b..461123394b 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -242,14 +242,24 @@ RSpec.describe Jobs::CleanUpUploads do
     expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
   end
 
-  it "does not delete category background url uploads" do
-    category_logo_upload = fabricate_upload
-    Fabricate(:category, uploaded_background: category_logo_upload)
+  it "does not delete category dark logo uploads" do
+    category_logo_dark_upload = fabricate_upload
+    Fabricate(:category, uploaded_logo_dark: category_logo_dark_upload)
 
     Jobs::CleanUpUploads.new.execute(nil)
 
     expect(Upload.exists?(id: expired_upload.id)).to eq(false)
-    expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
+    expect(Upload.exists?(id: category_logo_dark_upload.id)).to eq(true)
+  end
+
+  it "does not delete category background uploads" do
+    category_background_upload = fabricate_upload
+    Fabricate(:category, uploaded_background: category_background_upload)
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
+    expect(Upload.exists?(id: category_background_upload.id)).to eq(true)
   end
 
   it "does not delete post uploads" do
diff --git a/spec/models/upload_reference_spec.rb b/spec/models/upload_reference_spec.rb
index 50a027a3f9..cd7a826957 100644
--- a/spec/models/upload_reference_spec.rb
+++ b/spec/models/upload_reference_spec.rb
@@ -21,17 +21,18 @@ RSpec.describe UploadReference do
   describe 'category uploads' do
     fab!(:upload1) { Fabricate(:upload) }
     fab!(:upload2) { Fabricate(:upload) }
+    fab!(:upload3) { Fabricate(:upload) }
 
     it 'creates upload references' do
       category = nil
-      expect { category = Fabricate(:category, uploaded_logo_id: upload1.id, uploaded_background_id: upload2.id) }
-        .to change { UploadReference.count }.by(2)
+      expect { category = Fabricate(:category, uploaded_logo_id: upload1.id, uploaded_logo_dark_id: upload2.id, uploaded_background_id: upload3.id) }
+        .to change { UploadReference.count }.by(3)
 
       upload_reference = UploadReference.last
       expect(upload_reference.target).to eq(category)
 
       expect { category.destroy! }
-        .to change { UploadReference.count }.by(-2)
+        .to change { UploadReference.count }.by(-3)
     end
   end
 
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
index 7cef34b393..e13c1642f6 100644
--- a/spec/requests/api/schemas/json/category_create_response.json
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -239,6 +239,12 @@
             "null"
           ]
         },
+        "uploaded_logo_dark": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "uploaded_background": {
           "type": [
             "string",
@@ -293,6 +299,7 @@
         "topic_featured_link_allowed",
         "search_priority",
         "uploaded_logo",
+        "uploaded_logo_dark",
         "uploaded_background"
       ]
     }
diff --git a/spec/requests/api/schemas/json/category_list_response.json b/spec/requests/api/schemas/json/category_list_response.json
index f1dac8b3e7..ab9da83568 100644
--- a/spec/requests/api/schemas/json/category_list_response.json
+++ b/spec/requests/api/schemas/json/category_list_response.json
@@ -156,6 +156,12 @@
                     "null"
                   ]
                 },
+                "uploaded_logo_dark": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
                 "uploaded_background": {
                   "type": [
                     "string",
@@ -199,6 +205,7 @@
                 "topics_all_time",
                 "subcategory_ids",
                 "uploaded_logo",
+                "uploaded_logo_dark",
                 "uploaded_background"
               ]
             }
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
index ed4e9aaece..402828ec08 100644
--- a/spec/requests/api/schemas/json/category_update_response.json
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -242,6 +242,12 @@
             "null"
           ]
         },
+        "uploaded_logo_dark": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "uploaded_background": {
           "type": [
             "string",
@@ -296,6 +302,7 @@
         "topic_featured_link_allowed",
         "search_priority",
         "uploaded_logo",
+        "uploaded_logo_dark",
         "uploaded_background"
       ]
     }
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index 5703ede25f..1401d22311 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -629,6 +629,12 @@
                 "null"
               ]
             },
+            "uploaded_logo_dark": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
             "uploaded_background": {
               "type": [
                 "string",
@@ -680,6 +686,7 @@
             "required_tag_groups",
             "read_only_banner",
             "uploaded_logo",
+            "uploaded_logo_dark",
             "uploaded_background",
             "can_edit"
           ]

From d2d474912794d8ac57aca27a6674f9ce8282a67b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 7 Oct 2022 17:25:15 +0200
Subject: [PATCH 080/332] DEV: Asyncify `Composer.createPost()` (#18026)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I convert these Composer (and Topic) functions one by one because stuff do be breaking 😄

Moved the special pretender handler code from the global one to the tests that actually require it.
---
 .../discourse/app/models/composer.js          | 141 ++++++++----------
 .../tests/acceptance/composer-test.js         |  32 +++-
 .../tests/helpers/create-pretender.js         |  15 --
 3 files changed, 93 insertions(+), 95 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 466491ea4b..e4058e78d1 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -22,7 +22,7 @@ import { inject as service } from "@ember/service";
 import deprecated from "discourse-common/lib/deprecated";
 import { isEmpty } from "@ember/utils";
 import { propertyNotEqual } from "discourse/lib/computed";
-import { throwAjaxError } from "discourse/lib/ajax-error";
+import { extractError, throwAjaxError } from "discourse/lib/ajax-error";
 import { prioritizeNameFallback } from "discourse/lib/settings";
 
 let _customizations = [];
@@ -1023,7 +1023,7 @@ const Composer = RestModel.extend({
     return dest;
   },
 
-  createPost(opts) {
+  async createPost(opts) {
     if (CREATE_TOPIC === this.action || PRIVATE_MESSAGE === this.action) {
       this.set("topic", null);
     }
@@ -1032,7 +1032,6 @@ const Composer = RestModel.extend({
     const topic = this.topic;
     const user = this.user;
     const postStream = this.get("topic.postStream");
-    let addedToStream = false;
     const postTypes = this.site.post_types;
     const postType = this.whisper ? postTypes.whisper : postTypes.regular;
 
@@ -1073,12 +1072,10 @@ const Composer = RestModel.extend({
     // If we're in a topic, we can append the post instantly.
     if (postStream) {
       // If it's in reply to another post, increase the reply count
-      if (post) {
-        post.setProperties({
-          reply_count: (post.reply_count || 0) + 1,
-          replies: [],
-        });
-      }
+      post?.setProperties({
+        reply_count: (post.reply_count || 0) + 1,
+        replies: [],
+      });
 
       // We do not stage posts in mobile view, we do not have the "cooked"
       // Furthermore calculating cooked is very complicated, especially since
@@ -1092,80 +1089,72 @@ const Composer = RestModel.extend({
       }
     }
 
-    const composer = this;
-    composer.setProperties({
+    this.setProperties({
       composeState: SAVING,
       stagedPost: state === "staged" && createdPost,
     });
 
-    return createdPost
-      .save()
-      .then((result) => {
-        let saving = true;
-
-        if (result.responseJson.action === "enqueued") {
-          if (postStream) {
-            postStream.undoPost(createdPost);
-          }
-          return result;
-        }
-
-        // We sometimes want to hide the `reply_to_user` if the post contains a quote
-        if (
-          result.responseJson &&
-          result.responseJson.post &&
-          !result.responseJson.post.reply_to_user
-        ) {
-          createdPost.set("reply_to_user", null);
-        }
-
-        if (topic) {
-          // It's no longer a new post
-          topic.set("draft_sequence", result.target.draft_sequence);
-          postStream.commitPost(createdPost);
-          addedToStream = true;
-        } else {
-          // We created a new topic, let's show it.
-          composer.set("composeState", CLOSED);
-          saving = false;
-
-          // Update topic_count for the category
-          const category = composer.site.categories.find(
-            (x) => x.id === (parseInt(createdPost.category, 10) || 1)
-          );
-          if (category) {
-            category.incrementProperty("topic_count");
-          }
-        }
-
-        composer.clearState();
-        composer.set("createdPost", createdPost);
-        if (composer.replyingToTopic) {
-          this.appEvents.trigger("post:created", createdPost);
-        } else {
-          this.appEvents.trigger("topic:created", createdPost, composer);
-        }
-
-        if (addedToStream) {
-          composer.set("composeState", CLOSED);
-        } else if (saving) {
-          composer.set("composeState", SAVING);
-        }
+    try {
+      const result = await createdPost.save();
+      let saving = true;
 
+      if (result.responseJson.action === "enqueued") {
+        postStream?.undoPost(createdPost);
         return result;
-      })
-      .catch(
-        throwAjaxError(() => {
-          if (postStream) {
-            postStream.undoPost(createdPost);
+      }
 
-            if (post) {
-              post.set("reply_count", post.reply_count - 1);
-            }
-          }
-          next(() => composer.set("composeState", OPEN));
-        })
-      );
+      // We sometimes want to hide the `reply_to_user` if the post contains a quote
+      if (result.responseJson.post && !result.responseJson.post.reply_to_user) {
+        createdPost.set("reply_to_user", null);
+      }
+
+      let addedToStream = false;
+      if (topic) {
+        // It's no longer a new post
+        topic.set("draft_sequence", result.target.draft_sequence);
+        postStream.commitPost(createdPost);
+        addedToStream = true;
+      } else {
+        // We created a new topic, let's show it.
+        this.set("composeState", CLOSED);
+        saving = false;
+
+        // Update topic_count for the category
+        const postCategoryId = parseInt(createdPost.category, 10) || 1;
+        const category = this.site.categories.find(
+          (x) => x.id === postCategoryId
+        );
+
+        category?.incrementProperty("topic_count");
+      }
+
+      this.clearState();
+      this.set("createdPost", createdPost);
+
+      if (this.replyingToTopic) {
+        this.appEvents.trigger("post:created", createdPost);
+      } else {
+        this.appEvents.trigger("topic:created", createdPost, this);
+      }
+
+      if (addedToStream) {
+        this.set("composeState", CLOSED);
+      } else if (saving) {
+        this.set("composeState", SAVING);
+      }
+
+      return result;
+    } catch (error) {
+      if (postStream) {
+        postStream.undoPost(createdPost);
+
+        post?.set("reply_count", post.reply_count - 1);
+      }
+
+      next(() => this.set("composeState", OPEN));
+
+      throw extractError(error);
+    }
   },
 
   getCookedHtml() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 6fa0cec03e..98ada74b6d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -227,12 +227,17 @@ acceptance("Composer", function (needs) {
   });
 
   test("Create a topic with server side errors", async function (assert) {
+    pretender.post("/posts", function () {
+      return response(422, { errors: ["That title has already been taken"] });
+    });
+
     await visit("/");
     await click("#create-topic");
     await fillIn("#reply-title", "this title triggers an error");
     await fillIn(".d-editor-input", "this is the *content* of a post");
     await click("#reply-control button.create");
     assert.ok(exists(".dialog-body"), "it pops up an error message");
+
     await click(".dialog-footer .btn-primary");
     assert.ok(!exists(".dialog-body"), "it dismisses the error");
     assert.ok(exists(".d-editor-input"), "the composer input is visible");
@@ -255,6 +260,17 @@ acceptance("Composer", function (needs) {
   });
 
   test("Create an enqueued Topic", async function (assert) {
+    pretender.post("/posts", function () {
+      return response(200, {
+        success: true,
+        action: "enqueued",
+        pending_post: {
+          id: 1234,
+          raw: "enqueue this content please",
+        },
+      });
+    });
+
     await visit("/");
     await click("#create-topic");
     await fillIn("#reply-title", "Internationalization Localization");
@@ -380,7 +396,7 @@ acceptance("Composer", function (needs) {
 
     await click(".modal-footer button.keep-editing");
 
-    assert.ok(invisible(".discard-draft-modal.modal"));
+    assert.ok(invisible(".discard-draft-modal.modal"), "hides modal");
     await click("#topic-footer-buttons .btn.create");
     assert.ok(
       exists(".discard-draft-modal.modal"),
@@ -397,8 +413,18 @@ acceptance("Composer", function (needs) {
   });
 
   test("Create an enqueued Reply", async function (assert) {
-    await visit("/t/internationalization-localization/280");
+    pretender.post("/posts", function () {
+      return response(200, {
+        success: true,
+        action: "enqueued",
+        pending_post: {
+          id: 1234,
+          raw: "enqueue this content please",
+        },
+      });
+    });
 
+    await visit("/t/internationalization-localization/280");
     assert.ok(!exists(".pending-posts .reviewable-item"));
 
     await click("#topic-footer-buttons .btn.create");
@@ -415,12 +441,10 @@ acceptance("Composer", function (needs) {
         "enqueue this content please",
       "it doesn't insert the post"
     );
-
     assert.ok(visible(".d-modal"), "it pops up a modal");
 
     await click(".modal-footer button");
     assert.ok(invisible(".d-modal"), "the modal can be dismissed");
-
     assert.ok(exists(".pending-posts .reviewable-item"));
   });
 
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
index faddd058ad..0cf90293f9 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
@@ -612,21 +612,6 @@ export function applyDefaultHandlers(pretender) {
   pretender.post("/posts", function (request) {
     const data = parsePostData(request.requestBody);
 
-    if (data.title === "this title triggers an error") {
-      return response(422, { errors: ["That title has already been taken"] });
-    }
-
-    if (data.raw === "enqueue this content please") {
-      return response(200, {
-        success: true,
-        action: "enqueued",
-        pending_post: {
-          id: 1234,
-          raw: data.raw,
-        },
-      });
-    }
-
     if (data.raw === "custom message") {
       return response(200, {
         success: true,

From 642693283428a17f11cd06ef52800487c84e4fab Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 7 Oct 2022 11:37:07 -0400
Subject: [PATCH 081/332] UX: Default to dark category logo on dark schemes
 (#18510)

Fixes an edge case for when a category has a dark logo and the default
color scheme is dark.
---
 .../discourse/app/components/category-logo.js | 20 +++++++++++++++++--
 .../templates/components/category-logo.hbs    |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/category-logo.js b/app/assets/javascripts/discourse/app/components/category-logo.js
index 742bb3c18e..7ab722ae7b 100644
--- a/app/assets/javascripts/discourse/app/components/category-logo.js
+++ b/app/assets/javascripts/discourse/app/components/category-logo.js
@@ -1,3 +1,19 @@
-import templateOnly from "@ember/component/template-only";
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
 
-export default templateOnly();
+export default class CategoryLogo extends Component {
+  @service session;
+
+  get defaultCategoryLogo() {
+    // use dark logo by default in edge case
+    // when scheme is dark and dark logo is present
+    if (
+      this.session.defaultColorSchemeIsDark &&
+      this.args.category.uploaded_logo_dark
+    ) {
+      return this.args.category.uploaded_logo_dark;
+    }
+
+    return this.args.category.uploaded_logo;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs b/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
index 8b67105bd7..1907f6b11e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
@@ -2,7 +2,7 @@
   {{#if (and @category.uploaded_logo.url @category.uploaded_logo_dark.url)}}
     <picture>
       <source srcset={{@category.uploaded_logo_dark.url}} width={{@category.uploaded_logo_dark.width}} height={{@category.uploaded_logo_dark.height}} media="(prefers-color-scheme: dark)">
-      <CdnImg @src={{@category.uploaded_logo.url}} @width={{@category.uploaded_logo.width}} @height={{@category.uploaded_logo.height}}/>
+      <CdnImg @src={{this.defaultCategoryLogo.url}} @width={{this.defaultCategoryLogo.width}} @height={{this.defaultCategoryLogo.height}}/>
     </picture>
   {{else if @category.uploaded_logo.url}}
     <CdnImg @src={{@category.uploaded_logo.url}} @width={{@category.uploaded_logo.width}} @height={{@category.uploaded_logo.height}}/>

From a1d67122b1b5dde9bdfad2249a1746463bf23e7a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 7 Oct 2022 11:38:27 -0400
Subject: [PATCH 082/332] DEV: Refactor the last few bootbox dialogs (#18416)

---
 .../admin/addon/components/embeddable-host.js | 12 +--
 .../admin-customize-email-templates-edit.js   | 32 +++----
 .../admin-customize-themes-show.js            | 13 +--
 .../addon/controllers/admin-user-fields.js    | 26 +++---
 .../admin/addon/mixins/penalty-controller.js  | 13 +--
 .../admin-customize-email-style-edit.js       | 23 +++--
 .../routes/admin-customize-themes-edit.js     | 25 +++---
 .../routes/admin-customize-themes-show.js     | 28 +++---
 .../addon/routes/admin-customize-themes.js    | 15 ++--
 .../admin/addon/services/admin-tools.js       | 87 +++++++++----------
 .../discourse/app/components/bookmark-list.js | 13 ++-
 .../discourse/app/components/bookmark.js      |  8 +-
 .../app/components/reviewable-item.js         | 14 +--
 .../app/components/shared-draft-controls.js   | 12 +--
 .../discourse/app/components/tag-info.js      | 43 +++++----
 .../app/controllers/preferences/profile.js    | 27 +++---
 .../controllers/preferences/second-factor.js  | 45 ++++------
 .../discourse/app/controllers/tag-show.js     | 18 ++--
 .../discourse/app/controllers/tags-index.js   | 24 +++--
 .../app/controllers/topic-bulk-actions.js     | 13 +--
 .../app/controllers/user-invited-show.js      | 21 +++--
 .../app/widgets/private-message-map.js        | 32 ++++---
 .../addon/components/dialog-holder.hbs        |  2 +-
 .../dialog-holder/addon/services/dialog.js    | 11 +++
 .../acceptance/admin-suspend-user-test.js     | 10 +--
 .../tests/acceptance/bookmarks-test.js        | 12 +--
 .../tests/acceptance/composer-actions-test.js |  6 +-
 .../tests/acceptance/composer-test.js         |  2 +-
 .../tests/acceptance/flag-post-test.js        | 17 ++--
 .../tests/acceptance/shared-drafts-test.js    |  2 +-
 .../tests/acceptance/user-bookmarks-test.js   |  8 +-
 .../components/dialog-holder-test.js          | 24 +++++
 .../addon/components/composer-actions.js      | 18 ++--
 config/locales/client.en.yml                  |  8 +-
 34 files changed, 331 insertions(+), 333 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js
index 328ad06e1e..320b173bfb 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.js
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js
@@ -1,9 +1,9 @@
 import Category from "discourse/models/category";
 import Component from "@ember/component";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -13,6 +13,7 @@ export default Component.extend(bufferedProperty("host"), {
   tagName: "tr",
   categoryId: null,
   category: null,
+  dialog: service(),
 
   editing: or("host.isNew", "editToggled"),
 
@@ -61,12 +62,13 @@ export default Component.extend(bufferedProperty("host"), {
     },
 
     delete() {
-      bootbox.confirm(I18n.t("admin.embedding.confirm_delete"), (result) => {
-        if (result) {
-          this.host.destroyRecord().then(() => {
+      return this.dialog.confirm({
+        message: I18n.t("admin.embedding.confirm_delete"),
+        didConfirm: () => {
+          return this.host.destroyRecord().then(() => {
             this.deleteHost(this.host);
           });
-        }
+        },
       });
     },
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
index d20f812ca3..c784deb0ec 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
@@ -1,13 +1,14 @@
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import { action } from "@ember/object";
-import bootbox from "bootbox";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend(bufferedProperty("emailTemplate"), {
   adminCustomizeEmailTemplates: controller(),
+  dialog: service(),
   emailTemplate: null,
   saved: false,
 
@@ -42,20 +43,19 @@ export default Controller.extend(bufferedProperty("emailTemplate"), {
   @action
   revertChanges() {
     this.set("saved", false);
-    bootbox.confirm(
-      I18n.t("admin.customize.email_templates.revert_confirm"),
-      (result) => {
-        if (result) {
-          this.emailTemplate
-            .revert()
-            .then((props) => {
-              const buffered = this.buffered;
-              buffered.setProperties(props);
-              this.commitBuffer();
-            })
-            .catch(popupAjaxError);
-        }
-      }
-    );
+
+    this.dialog.yesNoConfirm({
+      title: I18n.t("admin.customize.email_templates.revert_confirm"),
+      didConfirm: () => {
+        return this.emailTemplate
+          .revert()
+          .then((props) => {
+            const buffered = this.buffered;
+            buffered.setProperties(props);
+            this.commitBuffer();
+          })
+          .catch(popupAjaxError);
+      },
+    });
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
index 61ffda925e..45d1973305 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
@@ -10,7 +10,6 @@ import Controller from "@ember/controller";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import ThemeSettings from "admin/models/theme-settings";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -306,14 +305,10 @@ export default Controller.extend({
 
     editTheme() {
       if (this.get("model.remote_theme.is_git")) {
-        bootbox.confirm(
-          I18n.t("admin.customize.theme.edit_confirm"),
-          (result) => {
-            if (result) {
-              this.transitionToEditRoute();
-            }
-          }
-        );
+        this.dialog.confirm({
+          message: I18n.t("admin.customize.theme.edit_confirm"),
+          didConfirm: () => this.transitionToEditRoute(),
+        });
       } else {
         this.transitionToEditRoute();
       }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
index bafcc02937..619c1cf629 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
@@ -1,12 +1,13 @@
 import { gte, sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
 const MAX_FIELDS = 30;
 
 export default Controller.extend({
+  dialog: service(),
   fieldTypes: null,
   createDisabled: gte("model.length", MAX_FIELDS),
   sortedFields: sort("model", "fieldSortOrder"),
@@ -53,18 +54,17 @@ export default Controller.extend({
 
       // Only confirm if we already been saved
       if (f.get("id")) {
-        bootbox.confirm(
-          I18n.t("admin.user_fields.delete_confirm"),
-          function (result) {
-            if (result) {
-              f.destroyRecord()
-                .then(function () {
-                  model.removeObject(f);
-                })
-                .catch(popupAjaxError);
-            }
-          }
-        );
+        this.dialog.yesNoConfirm({
+          message: I18n.t("admin.user_fields.delete_confirm"),
+          didConfirm: () => {
+            return f
+              .destroyRecord()
+              .then(function () {
+                model.removeObject(f);
+              })
+              .catch(popupAjaxError);
+          },
+        });
       } else {
         model.removeObject(f);
       }
diff --git a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
index 55514dfe48..eb5d56e8cf 100644
--- a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
+++ b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
@@ -2,11 +2,12 @@ import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { Promise } from "rsvp";
-import bootbox from "bootbox";
 import { extractError } from "discourse/lib/ajax-error";
 import { next } from "@ember/runloop";
+import { inject as service } from "@ember/service";
 
 export default Mixin.create(ModalFunctionality, {
+  dialog: service(),
   errorMessage: null,
   reason: null,
   message: null,
@@ -40,15 +41,15 @@ export default Mixin.create(ModalFunctionality, {
         (this.message && this.message.length > 1))
     ) {
       this.send("hideModal");
-      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), (result) => {
-        if (result) {
+      this.dialog.confirm({
+        message: I18n.t("admin.user.confirm_cancel_penalty"),
+        didConfirm: () => {
           next(() => {
             this.set("confirmClose", true);
             this.send("closeModal");
           });
-        } else {
-          next(() => this.send("reopenModal"));
-        }
+        },
+        didCancel: () => this.send("reopenModal"),
       });
       return false;
     }
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
index 4453dbe672..847b21a75c 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
@@ -1,8 +1,9 @@
 import I18n from "I18n";
 import Route from "@ember/routing/route";
-import bootbox from "bootbox";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  dialog: service(),
   model(params) {
     return {
       model: this.modelFor("adminCustomizeEmailStyle"),
@@ -26,17 +27,15 @@ export default Route.extend({
         transition.intent.name !== this.routeName
       ) {
         transition.abort();
-        bootbox.confirm(
-          I18n.t("admin.customize.theme.unsaved_changes_alert"),
-          I18n.t("admin.customize.theme.discard"),
-          I18n.t("admin.customize.theme.stay"),
-          (result) => {
-            if (!result) {
-              this._shouldAlertUnsavedChanges = false;
-              transition.retry();
-            }
-          }
-        );
+        this.dialog.confirm({
+          message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
+          confirmButtonLabel: "admin.customize.theme.discard",
+          cancelButtonLabel: "admin.customize.theme.stay",
+          didConfirm: () => {
+            this._shouldAlertUnsavedChanges = false;
+            transition.retry();
+          },
+        });
       }
     },
   },
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
index 0d55baa6ce..c72e9d0731 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
@@ -1,8 +1,10 @@
 import I18n from "I18n";
 import Route from "@ember/routing/route";
-import bootbox from "bootbox";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  dialog: service(),
+
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
     const model = all.findBy("id", parseInt(params.theme_id, 10));
@@ -56,17 +58,16 @@ export default Route.extend({
         transition.intent.name !== this.routeName
       ) {
         transition.abort();
-        bootbox.confirm(
-          I18n.t("admin.customize.theme.unsaved_changes_alert"),
-          I18n.t("admin.customize.theme.discard"),
-          I18n.t("admin.customize.theme.stay"),
-          (result) => {
-            if (!result) {
-              this.set("shouldAlertUnsavedChanges", false);
-              transition.retry();
-            }
-          }
-        );
+
+        this.dialog.confirm({
+          message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
+          confirmButtonLabel: "admin.customize.theme.discard",
+          cancelButtonLabel: "admin.customize.theme.stay",
+          didConfirm: () => {
+            this.set("shouldAlertUnsavedChanges", false);
+            transition.retry();
+          },
+        });
       }
     },
   },
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
index 6c23a36109..156dbf9dd0 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
@@ -2,23 +2,11 @@ import { COMPONENTS, THEMES } from "admin/models/theme";
 import I18n from "I18n";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
-import bootbox from "bootbox";
-
-export function showUnassignedComponentWarning(theme, callback) {
-  bootbox.confirm(
-    I18n.t("admin.customize.theme.unsaved_parent_themes"),
-    I18n.t("admin.customize.theme.discard"),
-    I18n.t("admin.customize.theme.stay"),
-    (result) => {
-      if (!result) {
-        theme.set("recentlyInstalled", false);
-      }
-      callback(result);
-    }
-  );
-}
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  dialog: service(),
+
   serialize(model) {
     return { theme_id: model.get("id") };
   },
@@ -72,10 +60,14 @@ export default Route.extend({
       const model = this.controller.model;
       if (model.warnUnassignedComponent) {
         transition.abort();
-        showUnassignedComponentWarning(model, (result) => {
-          if (!result) {
+
+        this.dialog.yesNoConfirm({
+          message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
+          didConfirm: () => {
+            model.set("recentlyInstalled", false);
             transition.retry();
-          }
+          },
+          didCancel: () => model.set("recentlyInstalled", false),
         });
       }
     },
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
index 8734675eff..22878ded22 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
@@ -1,9 +1,12 @@
 import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
+import I18n from "I18n";
 import { next } from "@ember/runloop";
-import { showUnassignedComponentWarning } from "admin/routes/admin-customize-themes-show";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  dialog: service(),
+
   queryParams: {
     repoUrl: null,
     repoName: null,
@@ -35,11 +38,13 @@ export default Route.extend({
       const currentTheme = this.controllerFor(
         "adminCustomizeThemes.show"
       ).model;
-      if (currentTheme && currentTheme.warnUnassignedComponent) {
-        showUnassignedComponentWarning(currentTheme, (result) => {
-          if (!result) {
+      if (currentTheme?.warnUnassignedComponent) {
+        this.dialog.yesNoConfirm({
+          message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
+          didConfirm: () => {
+            currentTheme.set("recentlyInstalled", false);
             showModal("admin-install-theme", { admin: true });
-          }
+          },
         });
       } else {
         showModal("admin-install-theme", { admin: true });
diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index 3d06845508..5fce78cb33 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -3,10 +3,9 @@ import I18n from "I18n";
 import { Promise } from "rsvp";
 import Service, { inject as service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import { getOwner } from "discourse-common/lib/get-owner";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import showModal from "discourse/lib/show-modal";
+import { htmlSafe } from "@ember/template";
 
 // A service that can act as a bridge between the front end Discourse application
 // and the admin application. Use this if you need front end code to access admin
@@ -79,58 +78,50 @@ export default Service.extend({
       : Promise.resolve();
 
     return tryEmail.then(() => {
-      let message = I18n.messageFormat("flagging.delete_confirm_MF", {
-        POSTS: adminUser.get("post_count"),
-        TOPICS: adminUser.get("topic_count"),
-        email:
-          adminUser.get("email") || I18n.t("flagging.hidden_email_address"),
-        ip_address:
-          adminUser.get("ip_address") || I18n.t("flagging.ip_address_missing"),
-      });
+      let message = htmlSafe(
+        I18n.messageFormat("flagging.delete_confirm_MF", {
+          POSTS: adminUser.get("post_count"),
+          TOPICS: adminUser.get("topic_count"),
+          email:
+            adminUser.get("email") || I18n.t("flagging.hidden_email_address"),
+          ip_address:
+            adminUser.get("ip_address") ||
+            I18n.t("flagging.ip_address_missing"),
+        })
+      );
 
       let userId = adminUser.get("id");
 
       return new Promise((resolve, reject) => {
-        const buttons = [
-          {
-            label: I18n.t("composer.cancel"),
-            class: "d-modal-cancel",
-            link: true,
-          },
-          {
-            label:
-              `${iconHTML("exclamation-triangle")} ` +
-              I18n.t("flagging.yes_delete_spammer"),
-            class: "btn btn-danger confirm-delete",
-            callback() {
-              return ajax(`/admin/users/${userId}.json`, {
-                type: "DELETE",
-                data: {
-                  delete_posts: true,
-                  block_email: true,
-                  block_urls: true,
-                  block_ip: true,
-                  delete_as_spammer: true,
-                  context: window.location.pathname,
-                },
+        this.dialog.deleteConfirm({
+          message,
+          class: "flagging-delete-spammer",
+          confirmButtonLabel: "flagging.yes_delete_spammer",
+          confirmButtonIcon: "exclamation-triangle",
+          didConfirm: () => {
+            return ajax(`/admin/users/${userId}.json`, {
+              type: "DELETE",
+              data: {
+                delete_posts: true,
+                block_email: true,
+                block_urls: true,
+                block_ip: true,
+                delete_as_spammer: true,
+                context: window.location.pathname,
+              },
+            })
+              .then((result) => {
+                if (result.deleted) {
+                  resolve();
+                } else {
+                  throw new Error("failed to delete");
+                }
               })
-                .then((result) => {
-                  if (result.deleted) {
-                    resolve();
-                  } else {
-                    throw new Error("failed to delete");
-                  }
-                })
-                .catch(() => {
-                  this.dialog.alert(I18n.t("admin.user.delete_failed"));
-                  reject();
-                });
-            },
+              .catch(() => {
+                this.dialog.alert(I18n.t("admin.user.delete_failed"));
+                reject();
+              });
           },
-        ];
-
-        bootbox.dialog(message, buttons, {
-          classes: "flagging-delete-spammer",
         });
       });
     });
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.js b/app/assets/javascripts/discourse/app/components/bookmark-list.js
index 594bf4ff11..6ea4c9cb63 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.js
@@ -1,7 +1,6 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import { next, schedule } from "@ember/runloop";
-import bootbox from "bootbox";
 import { openBookmarkModal } from "discourse/controllers/bookmark";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -11,8 +10,10 @@ import {
 import Scrolling from "discourse/mixins/scrolling";
 import I18n from "I18n";
 import { Promise } from "rsvp";
+import { inject as service } from "@ember/service";
 
 export default Component.extend(Scrolling, {
+  dialog: service(),
   classNames: ["bookmark-list-wrapper"],
 
   didInsertElement() {
@@ -64,12 +65,10 @@ export default Component.extend(Scrolling, {
       if (!bookmark.reminder_at) {
         return deleteBookmark();
       }
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), (result) => {
-        if (result) {
-          deleteBookmark();
-        } else {
-          resolve(false);
-        }
+      this.dialog.deleteConfirm({
+        message: I18n.t("bookmarks.confirm_delete"),
+        didConfirm: () => deleteBookmark(),
+        didCancel: () => resolve(false),
       });
     });
   },
diff --git a/app/assets/javascripts/discourse/app/components/bookmark.js b/app/assets/javascripts/discourse/app/components/bookmark.js
index 14997c5aad..879ef027fc 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark.js
@@ -11,7 +11,6 @@ import {
 } from "discourse/lib/time-shortcut";
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 import { and, notEmpty } from "@ember/object/computed";
@@ -377,10 +376,9 @@ export default Component.extend({
     };
 
     if (this.existingBookmarkHasReminder) {
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), (result) => {
-        if (result) {
-          deleteAction();
-        }
+      this.dialog.deleteConfirm({
+        message: I18n.t("bookmarks.confirm_delete"),
+        didConfirm: () => deleteAction(),
       });
     } else {
       deleteAction();
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 73c90d665a..2ce56fd43b 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -2,13 +2,13 @@ import Category from "discourse/models/category";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import { classify, dasherize } from "@ember/string";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { action, set } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
 
 let _components = {};
 
@@ -22,6 +22,7 @@ export function addPluginReviewableParam(reviewableType, param) {
 
 export default Component.extend({
   adminTools: optionalService(),
+  dialog: service(),
   tagName: "",
   updating: null,
   editing: false,
@@ -269,14 +270,13 @@ export default Component.extend({
         return;
       }
 
-      let msg = performableAction.get("confirm_message");
+      const message = performableAction.get("confirm_message");
       let requireRejectReason = performableAction.get("require_reject_reason");
       let customModal = performableAction.get("custom_modal");
-      if (msg) {
-        bootbox.confirm(msg, (answer) => {
-          if (answer) {
-            return this._performConfirmed(performableAction);
-          }
+      if (message) {
+        this.dialog.confirm({
+          message,
+          didConfirm: () => this._performConfirmed(performableAction),
         });
       } else if (requireRejectReason) {
         showModal("reject-reason-reviewable", {
diff --git a/app/assets/javascripts/discourse/app/components/shared-draft-controls.js b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
index a68fe3c1eb..465edcbb6d 100644
--- a/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
+++ b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
@@ -1,10 +1,11 @@
 import Component from "@ember/component";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   tagName: "",
+  dialog: service(),
   publishing: false,
 
   @discourseComputed("topic.destination_category_id")
@@ -18,11 +19,12 @@ export default Component.extend({
     },
 
     publish() {
-      bootbox.confirm(I18n.t("shared_drafts.confirm_publish"), (result) => {
-        if (result) {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("shared_drafts.confirm_publish"),
+        didConfirm: () => {
           this.set("publishing", true);
           const destinationCategoryId = this.topic.destination_category_id;
-          this.topic
+          return this.topic
             .publish()
             .then(() => {
               this.topic.setProperties({
@@ -34,7 +36,7 @@ export default Component.extend({
             .finally(() => {
               this.set("publishing", false);
             });
-        }
+        },
       });
     },
   },
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 21da9a92f1..201dec9ba6 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -2,12 +2,12 @@ import { and, reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
+import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   dialog: service(),
@@ -100,19 +100,18 @@ export default Component.extend({
   @action
   deleteSynonym(tag, event) {
     event?.preventDefault();
-    bootbox.confirm(
-      I18n.t("tagging.delete_synonym_confirm", { tag_name: tag.text }),
-      (result) => {
-        if (!result) {
-          return;
-        }
 
-        tag
+    this.dialog.yesNoConfirm({
+      message: I18n.t("tagging.delete_synonym_confirm", {
+        tag_name: tag.text,
+      }),
+      didConfirm: () => {
+        return tag
           .destroyRecord()
           .then(() => this.tagInfo.synonyms.removeObject(tag))
           .catch(popupAjaxError);
-      }
-    );
+      },
+    });
   },
 
   actions: {
@@ -146,17 +145,15 @@ export default Component.extend({
     },
 
     addSynonyms() {
-      bootbox.confirm(
-        I18n.t("tagging.add_synonyms_explanation", {
-          count: this.newSynonyms.length,
-          tag_name: this.tagInfo.name,
-        }),
-        (result) => {
-          if (!result) {
-            return;
-          }
-
-          ajax(`/tag/${this.tagInfo.name}/synonyms`, {
+      this.dialog.confirm({
+        message: htmlSafe(
+          I18n.t("tagging.add_synonyms_explanation", {
+            count: this.newSynonyms.length,
+            tag_name: this.tagInfo.name,
+          })
+        ),
+        didConfirm: () => {
+          return ajax(`/tag/${this.tagInfo.name}/synonyms`, {
             type: "POST",
             data: {
               synonyms: this.newSynonyms,
@@ -177,8 +174,8 @@ export default Component.extend({
               }
             })
             .catch(popupAjaxError);
-        }
-      );
+        },
+      });
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index a3ea290db2..e396e3e4df 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -2,15 +2,16 @@ import Controller from "@ember/controller";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import { cookAsync } from "discourse/lib/text";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { readOnly } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  dialog: service(),
   init() {
     this._super(...arguments);
     this.saveAttrNames = [
@@ -79,20 +80,18 @@ export default Controller.extend({
     },
 
     clearFeaturedTopicFromProfile() {
-      bootbox.confirm(
-        I18n.t("user.feature_topic_on_profile.clear.warning"),
-        (result) => {
-          if (result) {
-            ajax(`/u/${this.model.username}/clear-featured-topic`, {
-              type: "PUT",
+      this.dialog.yesNoConfirm({
+        message: I18n.t("user.feature_topic_on_profile.clear.warning"),
+        didConfirm: () => {
+          return ajax(`/u/${this.model.username}/clear-featured-topic`, {
+            type: "PUT",
+          })
+            .then(() => {
+              this.model.set("featured_topic", null);
             })
-              .then(() => {
-                this.model.set("featured_topic", null);
-              })
-              .catch(popupAjaxError);
-          }
-        }
-      );
+            .catch(popupAjaxError);
+        },
+      });
     },
 
     useCurrentTimezone() {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index fc5293054a..91f77db8a0 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -5,14 +5,14 @@ import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend(CanCheckEmails, {
+  dialog: service(),
   loading: false,
   dirty: false,
   resetPasswordLoading: false,
@@ -127,34 +127,21 @@ export default Controller.extend(CanCheckEmails, {
       if (this.loading) {
         return;
       }
-      const message = I18n.t("user.second_factor.disable_confirm");
-      const buttons = [
-        {
-          label: I18n.t("cancel"),
-          class: "d-modal-cancel",
-          link: true,
-        },
-        {
-          icon: iconHTML("ban"),
-          label: I18n.t("user.second_factor.disable"),
-          class: "btn-danger btn-icon-text",
-          callback: () => {
-            this.model
-              .disableAllSecondFactors()
-              .then(() => {
-                const usernameLower = this.model.username.toLowerCase();
-                DiscourseURL.redirectTo(
-                  userPath(`${usernameLower}/preferences`)
-                );
-              })
-              .catch((e) => this.handleError(e))
-              .finally(() => this.set("loading", false));
-          },
-        },
-      ];
 
-      bootbox.dialog(message, buttons, {
-        classes: "disable-second-factor-modal",
+      this.dialog.deleteConfirm({
+        title: I18n.t("user.second_factor.disable_confirm"),
+        confirmButtonLabel: "user.second_factor.disable",
+        confirmButtonIcon: "ban",
+        didConfirm: () => {
+          this.model
+            .disableAllSecondFactors()
+            .then(() => {
+              const usernameLower = this.model.username.toLowerCase();
+              DiscourseURL.redirectTo(userPath(`${usernameLower}/preferences`));
+            })
+            .catch((e) => this.handleError(e))
+            .finally(() => this.set("loading", false));
+        },
       });
     },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index 2f9c493516..cc32873bbc 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -7,7 +7,6 @@ import I18n from "I18n";
 import NavItem from "discourse/models/nav-item";
 import Topic from "discourse/models/topic";
 import { readOnly } from "@ember/object/computed";
-import bootbox from "bootbox";
 import { endWith } from "discourse/lib/computed";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
@@ -167,15 +166,14 @@ export default DiscoverySortableController.extend(
           });
       }
 
-      bootbox.confirm(confirmText, (result) => {
-        if (!result) {
-          return;
-        }
-
-        this.tag
-          .destroyRecord()
-          .then(() => this.transitionToRoute("tags.index"))
-          .catch(() => this.dialog.alert(I18n.t("generic_error")));
+      this.dialog.deleteConfirm({
+        message: confirmText,
+        didConfirm: () => {
+          return this.tag
+            .destroyRecord()
+            .then(() => this.transitionToRoute("tags.index"))
+            .catch(() => this.dialog.alert(I18n.t("generic_error")));
+        },
       });
     },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index eff2f1d30b..09d71e89c8 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -3,7 +3,6 @@ import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
@@ -91,23 +90,20 @@ export default Controller.extend({
                   tags: joinedTags,
                 });
 
-          const string = I18n.t("tagging.delete_unused_confirmation", {
+          const message = I18n.t("tagging.delete_unused_confirmation", {
             count: tags.length,
             tags: tagsString,
           });
 
-          bootbox.confirm(
-            string,
-            I18n.t("tagging.cancel_delete_unused"),
-            I18n.t("tagging.delete_unused"),
-            (proceed) => {
-              if (proceed) {
-                ajax("/tags/unused", { type: "DELETE" })
-                  .then(() => this.send("triggerRefresh"))
-                  .catch(popupAjaxError);
-              }
-            }
-          );
+          this.dialog.deleteConfirm({
+            message,
+            confirmButtonLabel: "tagging.delete_unused",
+            didConfirm: () => {
+              return ajax("/tags/unused", { type: "DELETE" })
+                .then(() => this.send("triggerRefresh"))
+                .catch(popupAjaxError);
+            },
+          });
         })
         .catch(popupAjaxError);
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index 7efe21e137..205cc147a4 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -4,7 +4,6 @@ import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
-import bootbox from "bootbox";
 
 import { inject as service } from "@ember/service";
 
@@ -320,16 +319,12 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     removeTags() {
-      bootbox.confirm(
-        I18n.t("topics.bulk.confirm_remove_tags", {
+      this.dialog.deleteConfirm({
+        message: I18n.t("topics.bulk.confirm_remove_tags", {
           count: this.get("model.topics").length,
         }),
-        (result) => {
-          if (result) {
-            this.performAndRefresh({ type: "remove_tags" });
-          }
-        }
-      );
+        didConfirm: () => this.performAndRefresh({ type: "remove_tags" }),
+      });
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
index 008a4b5946..7ec24665f5 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -1,7 +1,6 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { equal, reads } from "@ember/object/computed";
-import bootbox from "bootbox";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
@@ -9,8 +8,10 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
 import Invite from "discourse/models/invite";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  dialog: service(),
   user: null,
   model: null,
   filter: null,
@@ -93,15 +94,16 @@ export default Controller.extend({
 
   @action
   destroyAllExpired() {
-    bootbox.confirm(I18n.t("user.invited.remove_all_confirm"), (confirm) => {
-      if (confirm) {
-        Invite.destroyAllExpired()
+    this.dialog.deleteConfirm({
+      message: I18n.t("user.invited.remove_all_confirm"),
+      didConfirm: () => {
+        return Invite.destroyAllExpired()
           .then(() => {
             this.set("removedAll", true);
             this.send("triggerRefresh");
           })
           .catch(popupAjaxError);
-      }
+      },
     });
   },
 
@@ -113,12 +115,13 @@ export default Controller.extend({
 
   @action
   reinviteAll() {
-    bootbox.confirm(I18n.t("user.invited.reinvite_all_confirm"), (confirm) => {
-      if (confirm) {
-        Invite.reinviteAll()
+    this.dialog.yesNoConfirm({
+      message: I18n.t("user.invited.reinvite_all_confirm"),
+      didConfirm: () => {
+        return Invite.reinviteAll()
           .then(() => this.set("reinvitedAll", true))
           .catch(popupAjaxError);
-      }
+      },
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
index 435df6c0de..781d2a8a3c 100644
--- a/app/assets/javascripts/discourse/app/widgets/private-message-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
@@ -1,6 +1,5 @@
 import { avatarFor, avatarImg } from "discourse/widgets/post";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import { createWidget } from "discourse/widgets/widget";
 import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
@@ -10,18 +9,16 @@ import { makeArray } from "discourse-common/lib/helpers";
 createWidget("pm-remove-group-link", {
   tagName: "a.remove-invited.no-text.btn-icon.btn",
   template: hbs`{{d-icon "times"}}`,
+  services: ["dialog"],
 
   click() {
-    bootbox.confirm(
-      I18n.t("private_message_info.remove_allowed_group", {
+    this.dialog.deleteConfirm({
+      message: I18n.t("private_message_info.remove_allowed_group", {
         name: this.attrs.name,
       }),
-      (confirmed) => {
-        if (confirmed) {
-          this.sendWidgetAction("removeAllowedGroup", this.attrs);
-        }
-      }
-    );
+      confirmButtonLabel: "private_message_info.remove_group",
+      didConfirm: () => this.sendWidgetAction("removeAllowedGroup", this.attrs),
+    });
   },
 });
 
@@ -48,22 +45,23 @@ createWidget("pm-map-user-group", {
 createWidget("pm-remove-link", {
   tagName: "a.remove-invited.no-text.btn-icon.btn",
   template: hbs`{{d-icon "times"}}`,
+  services: ["dialog"],
 
   click() {
     const messageKey = this.attrs.isCurrentUser
       ? "leave_message"
       : "remove_allowed_user";
 
-    bootbox.confirm(
-      I18n.t(`private_message_info.${messageKey}`, {
+    this.dialog.deleteConfirm({
+      message: I18n.t(`private_message_info.${messageKey}`, {
         name: this.attrs.user.username,
       }),
-      (confirmed) => {
-        if (confirmed) {
-          this.sendWidgetAction("removeAllowedUser", this.attrs.user);
-        }
-      }
-    );
+      confirmButtonLabel: this.attrs.isCurrentUser
+        ? "private_message_info.leave"
+        : "private_message_info.remove_user",
+      didConfirm: () =>
+        this.sendWidgetAction("removeAllowedUser", this.attrs.user),
+    });
   },
 });
 
diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs b/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs
index 46e2cd5aaf..7a1729f5b1 100644
--- a/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs
@@ -21,7 +21,7 @@
           {{#each this.dialog.buttons as |button|}}
             <DButton @icon={{button.icon}} @class={{button.class}} @action={{action "handleButtonAction" button}} @translatedLabel={{button.label}} />
           {{else}}
-            <DButton @class="btn-primary" @action={{this.dialog.didConfirmWrapped}} @icon={{this.dialog.confirmButtonIcon}} @label={{this.dialog.confirmButtonLabel}} />
+            <DButton @class={{this.dialog.confirmButtonClass}} @action={{this.dialog.didConfirmWrapped}} @icon={{this.dialog.confirmButtonIcon}} @label={{this.dialog.confirmButtonLabel}} />
             {{#if this.dialog.shouldDisplayCancel}}
               <DButton @class="btn-default" @action={{this.dialog.cancel}} @label={{this.dialog.cancelButtonLabel}} />
             {{/if}}
diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js
index fa072595ed..824e6e02d3 100644
--- a/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js
@@ -12,6 +12,7 @@ export default Service.extend({
 
   confirmButtonIcon: null,
   confirmButtonLabel: null,
+  confirmButtonClass: null,
   cancelButtonLabel: null,
   shouldDisplayCancel: null,
 
@@ -29,6 +30,7 @@ export default Service.extend({
 
       confirmButtonIcon,
       confirmButtonLabel = "ok_value",
+      confirmButtonClass = "btn-primary",
       cancelButtonLabel = "cancel_value",
       shouldDisplayCancel,
 
@@ -47,6 +49,7 @@ export default Service.extend({
       title,
       titleElementId: title !== null ? "dialog-title" : null,
 
+      confirmButtonClass,
       confirmButtonLabel,
       confirmButtonIcon,
       cancelButtonLabel,
@@ -108,6 +111,14 @@ export default Service.extend({
     });
   },
 
+  deleteConfirm(params) {
+    return this.confirm({
+      ...params,
+      confirmButtonClass: "btn-danger",
+      confirmButtonLabel: params.confirmButtonLabel || "delete",
+    });
+  },
+
   reset() {
     this.setProperties({
       message: null,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
index c60d3170cf..73918cd5e2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
@@ -54,9 +54,9 @@ acceptance("Admin - Suspend User", function (needs) {
 
     await click(".d-modal-cancel");
 
-    assert.strictEqual(count(".bootbox.modal:visible"), 1);
+    assert.strictEqual(count(".dialog-body:visible"), 1);
 
-    await click(".modal-footer .btn-default");
+    await click(".dialog-footer .btn-default");
     assert.strictEqual(count(".suspend-user-modal:visible"), 1);
     assert.strictEqual(
       query(".suspend-message").value,
@@ -64,11 +64,11 @@ acceptance("Admin - Suspend User", function (needs) {
     );
 
     await click(".d-modal-cancel");
-    assert.strictEqual(count(".bootbox.modal:visible"), 1);
+    assert.strictEqual(count(".dialog-body:visible"), 1);
     assert.ok(!exists(".suspend-user-modal:visible"));
 
-    await click(".modal-footer .btn-primary");
-    assert.ok(!exists(".bootbox.modal:visible"));
+    await click(".dialog-footer .btn-primary");
+    assert.ok(!exists(".dialog-body:visible"));
   });
 
   test("suspend, then unsuspend a user", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
index e46c80057c..e9fb662fd6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
@@ -215,15 +215,15 @@ acceptance("Bookmarking", function (needs) {
 
     await click("#delete-bookmark");
 
-    assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
+    assert.ok(exists(".dialog-body"), "it asks for delete confirmation");
     assert.ok(
-      query(".bootbox.modal").innerText.includes(
+      query(".dialog-body").innerText.includes(
         I18n.t("bookmarks.confirm_delete")
       ),
       "it shows delete confirmation message"
     );
 
-    await click(".bootbox.modal .btn-primary");
+    await click(".dialog-footer .btn-danger");
 
     assert.notOk(
       exists(".topic-post:first-child button.bookmark.bookmarked"),
@@ -444,15 +444,15 @@ acceptance("Bookmarking", function (needs) {
     await click("#topic-footer-button-bookmark");
     await click("#delete-bookmark");
 
-    assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
+    assert.ok(exists(".dialog-body"), "it asks for delete confirmation");
     assert.ok(
-      query(".bootbox.modal").innerText.includes(
+      query(".dialog-body").innerText.includes(
         I18n.t("bookmarks.confirm_delete")
       ),
       "it shows delete confirmation message"
     );
 
-    await click(".bootbox.modal .btn-primary");
+    await click(".dialog-footer .btn-danger");
 
     assert.strictEqual(
       query("#topic-footer-button-bookmark").innerText,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index a2002935f0..8be69c4bd6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -150,7 +150,7 @@ acceptance("Composer Actions", function (needs) {
     const composerActions = selectKit(".composer-actions");
     await composerActions.expand();
     await composerActions.selectRowByValue("reply_as_new_topic");
-    assert.ok(!exists(".bootbox"));
+    assert.ok(!exists(".dialog-body"));
   });
 
   test("reply_as_new_group_message", async function (assert) {
@@ -471,10 +471,10 @@ acceptance("Composer Actions With New Topic Draft", function (needs) {
     await composerActions.selectRowByValue("reply_as_new_topic");
 
     assert.strictEqual(
-      query(".bootbox .modal-body").innerText,
+      query(".dialog-body").innerText.trim(),
       I18n.t("composer.composer_actions.reply_as_new_topic.confirm")
     );
-    await click(".modal-footer .btn.btn-primary");
+    await click(".dialog-footer .btn-primary");
 
     assert.ok(
       query(".d-editor-input").value.startsWith(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 98ada74b6d..ab11f39043 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -223,7 +223,7 @@ acceptance("Composer", function (needs) {
     assert.ok(exists(".d-modal"), "it pops up a confirmation dialog");
 
     await click(".modal-footer .discard-draft");
-    assert.ok(!exists(".bootbox.modal"), "the confirmation can be cancelled");
+    assert.ok(!exists(".modal-body"), "the confirmation can be cancelled");
   });
 
   test("Create a topic with server side errors", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
index e4cc526ddd..a3b4b04842 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
@@ -1,6 +1,5 @@
 import {
   acceptance,
-  count,
   exists,
   query,
 } from "discourse/tests/helpers/qunit-helpers";
@@ -123,9 +122,11 @@ acceptance("flagging", function (needs) {
     const silenceUntilCombobox = selectKit(".silence-until .combobox");
     await silenceUntilCombobox.expand();
     await silenceUntilCombobox.selectRowByValue("tomorrow");
+    assert.ok(exists(".modal-body"));
     await fillIn(".silence-reason", "for breaking the rules");
+
     await click(".perform-silence");
-    assert.ok(!exists(".bootbox.modal:visible"));
+    assert.ok(!exists(".modal-body"));
   });
 
   test("Gets dismissable warning from canceling incomplete silence from take action", async function (assert) {
@@ -140,17 +141,17 @@ acceptance("flagging", function (needs) {
     await silenceUntilCombobox.selectRowByValue("tomorrow");
     await fillIn(".silence-reason", "for breaking the rules");
     await click(".d-modal-cancel");
-    assert.strictEqual(count(".bootbox.modal:visible"), 1);
+    assert.ok(exists(".dialog-body"));
 
-    await click(".modal-footer .btn-default");
-    assert.ok(!exists(".bootbox.modal:visible"));
+    await click(".dialog-footer .btn-default");
+    assert.ok(!exists(".dialog-body"));
     assert.ok(exists(".silence-user-modal"), "it shows the silence modal");
 
     await click(".d-modal-cancel");
-    assert.strictEqual(count(".bootbox.modal:visible"), 1);
+    assert.ok(exists(".dialog-body"));
 
-    await click(".modal-footer .btn-primary");
-    assert.ok(!exists(".bootbox.modal:visible"));
+    await click(".dialog-footer .btn-primary");
+    assert.ok(!exists(".dialog-body"));
   });
 
   test("CTRL + ENTER accepts the modal", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
index f21315b6e8..bbe7bc804b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
@@ -15,7 +15,7 @@ acceptance("Shared Drafts", function () {
     assert.strictEqual(categoryChooser.header().value(), "3");
 
     await click(".publish-shared-draft");
-    await click(".bootbox .btn-primary");
+    await click(".dialog-footer .btn-primary");
 
     assert.ok(!exists(".shared-draft-controls"));
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
index 691ecd9ef5..d958162f7b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
@@ -20,7 +20,7 @@ acceptance("User's bookmarks", function (needs) {
     await dropdown.expand();
     await dropdown.selectRowByValue("remove");
 
-    assert.notOk(exists(".bootbox.modal"), "it should not show the modal");
+    assert.notOk(exists(".dialog-body"), "it should not show the modal");
   });
 
   test("it renders search controls if there are bookmarks", async function (assert) {
@@ -51,10 +51,10 @@ acceptance("User's bookmarks - reminder", function (needs) {
     await dropdown.expand();
     await dropdown.selectRowByValue("remove");
 
-    assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
+    assert.ok(exists(".dialog-body"), "it asks for delete confirmation");
 
-    await click(".bootbox.modal a.btn-primary");
-    assert.notOk(exists(".bootbox.modal"));
+    await click(".dialog-footer .btn-danger");
+    assert.notOk(exists(".dialog-body"));
   });
 
   test("bookmarks with reminders have a clear reminder option", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
index c83889e20f..251e8ac4e2 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
@@ -364,4 +364,28 @@ module("Integration | Component | dialog-holder", function (hooks) {
     assert.notOk(query(".dialog-footer"), "no footer");
     assert.notOk(query(".dialog-header"), "no header");
   });
+
+  test("delete confirm", async function (assert) {
+    await render(hbs`<DialogHolder />`);
+
+    this.dialog.deleteConfirm({ message: "A delete confirm message" });
+    await settled();
+
+    assert.strictEqual(
+      query(".dialog-body").innerText.trim(),
+      "A delete confirm message",
+      "dialog message is shown"
+    );
+
+    assert.strictEqual(
+      query(".dialog-footer .btn-danger").innerText.trim(),
+      I18n.t("delete"),
+      "dialog primary button use danger class and label is Delete"
+    );
+
+    assert.notOk(
+      query(".dialog-footer .btn-primary"),
+      ".btn-primary element is not present in the dialog"
+    );
+  });
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/composer-actions.js b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
index da00b80e31..20b515605e 100644
--- a/app/assets/javascripts/select-kit/addon/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
@@ -9,10 +9,10 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Draft from "discourse/models/draft";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import I18n from "I18n";
-import bootbox from "bootbox";
 import { camelize } from "@ember/string";
 import { equal, gt } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
+import { inject as service } from "@ember/service";
 
 // Component can get destroyed and lose state
 let _topicSnapshot = null;
@@ -26,6 +26,7 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
+  dialog: service(),
   seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
@@ -283,14 +284,13 @@ export default DropdownSelectBoxComponent.extend({
   replyAsNewTopicSelected(options) {
     Draft.get("new_topic").then((response) => {
       if (response.draft) {
-        bootbox.confirm(
-          I18n.t("composer.composer_actions.reply_as_new_topic.confirm"),
-          (result) => {
-            if (result) {
-              this._replyAsNewTopicSelect(options);
-            }
-          }
-        );
+        this.dialog.confirm({
+          message: I18n.t(
+            "composer.composer_actions.reply_as_new_topic.confirm"
+          ),
+          confirmButtonLabel: "composer.ok_proceed",
+          didConfirm: () => this._replyAsNewTopicSelect(options),
+        });
       } else {
         this._replyAsNewTopicSelect(options);
       }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b8321bc94e..bf30b07949 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -254,6 +254,7 @@ en:
     ok_value: "OK"
     cancel_value: "Cancel"
     submit: "Submit"
+    delete: "Delete"
     generic_error: "Sorry, an error has occurred."
     generic_error_with_reason: "An error occurred: %{error}"
     sign_up: "Sign Up"
@@ -1918,6 +1919,9 @@ en:
       leave_message: "Do you really want to leave this message?"
       remove_allowed_user: "Do you really want to remove %{name} from this message?"
       remove_allowed_group: "Do you really want to remove %{name} from this message?"
+      leave: "Leave"
+      remove_group: "Remove group"
+      remove_user: "Remove user"
 
     email: "Email"
     username: "Username"
@@ -2169,6 +2173,7 @@ en:
       edit_conflict: "edit conflict"
       esc: "esc"
       esc_label: "Click or press Esc to dismiss"
+      ok_proceed: "Ok, proceed"
 
       group_mentioned_limit:
         one: "<b>Warning!</b> You mentioned <a href='%{group_link}'>%{group}</a>, however this group has more members than the administrator configured mention limit of %{count} user. Nobody will be notified."
@@ -2669,7 +2674,7 @@ en:
         remove_tags: "Remove All Tags"
         confirm_remove_tags:
           one: "All tags will be removed from this topic. Are you sure?"
-          other: "All tags will be removed from <b>%{count}</b> topics. Are you sure?"
+          other: "All tags will be removed from %{count} topics. Are you sure?"
         progress:
           one: "Progress: <strong>%{count}</strong> topic"
           other: "Progress: <strong>%{count}</strong> topics"
@@ -3998,7 +4003,6 @@ en:
       tag_list_joiner: ", "
       delete_unused: "Delete Unused Tags"
       delete_unused_description: "Delete all tags which are not attached to any topics or personal messages"
-      cancel_delete_unused: "Cancel"
       filters:
         without_category: "%{filter} %{tag} topics"
         with_category: "%{filter} %{tag} topics in %{category}"

From 2d1dbc6f9616ce18807d87c8700c41ee73daa450 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 7 Oct 2022 13:19:50 -0300
Subject: [PATCH 083/332] FEATURE: Preload resources via link header (#18475)

Experiment moving from preload tags in the document head to preload information the the response headers.

While this is a minor improvement in most browsers (headers are parsed before the response body), this allows smart proxies like Cloudflare to "learn" from those headers and build HTTP 103 Early Hints for subsequent requests to the same URI, which will allow the user agent to download and parse our JS/CSS while we are waiting for the server to generate and stream the HTML response.

Co-authored-by: Penar Musaraj <pmusaraj@gmail.com>
---
 app/controllers/application_controller.rb    | 13 ++++-
 app/helpers/application_helper.rb            | 12 +++--
 app/views/layouts/application.html.erb       |  4 +-
 lib/stylesheet/manager.rb                    |  6 ++-
 spec/helpers/application_helper_spec.rb      | 56 +++++++++++++++++---
 spec/lib/stylesheet/manager_spec.rb          | 21 ++++++++
 spec/requests/application_controller_spec.rb | 12 +++++
 7 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d7bd742922..60e23361be 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,7 +49,8 @@ class ApplicationController < ActionController::Base
   after_action  :conditionally_allow_site_embedding
   after_action  :ensure_vary_header
   after_action  :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
-  after_action  :add_noindex_header_to_non_canonical, if: -> { request.get? && !(request.format && request.format.json?) && !request.xhr? }
+  after_action  :add_noindex_header_to_non_canonical, if: :spa_boot_request?
+  around_action :link_preload, if: :spa_boot_request?
 
   HONEYPOT_KEY ||= 'HONEYPOT_KEY'
   CHALLENGE_KEY ||= 'CHALLENGE_KEY'
@@ -1008,4 +1009,14 @@ class ApplicationController < ActionController::Base
 
     result
   end
+
+  def link_preload
+    @links_to_preload = []
+    yield
+    response.headers['Link'] = @links_to_preload.join(', ') if !@links_to_preload.empty?
+  end
+
+  def spa_boot_request?
+    request.get? && !(request.format && request.format.json?) && !request.xhr?
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0ee00f928c..d667a5f2c4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,12 +142,16 @@ module ApplicationHelper
   end
 
   def preload_script_url(url)
+    add_resource_preload_list(url, 'script')
     <<~HTML.html_safe
-      <link rel="preload" href="#{url}" as="script">
       <script defer src="#{url}"></script>
     HTML
   end
 
+  def add_resource_preload_list(resource_url, type)
+    @links_to_preload << %Q(<#{resource_url}>; rel="preload"; as="#{type}") if !@links_to_preload.nil?
+  end
+
   def discourse_csrf_tags
     # anon can not have a CSRF token cause these are all pages
     # that may be cached, causing a mismatch between session CSRF
@@ -589,7 +593,7 @@ module ApplicationHelper
         stylesheet_manager
       end
 
-    manager.stylesheet_link_tag(name, 'all')
+    manager.stylesheet_link_tag(name, 'all', self.method(:add_resource_preload_list))
   end
 
   def discourse_preload_color_scheme_stylesheets
@@ -605,10 +609,10 @@ module ApplicationHelper
 
   def discourse_color_scheme_stylesheets
     result = +""
-    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all')
+    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all', self.method(:add_resource_preload_list))
 
     if dark_scheme_id != -1
-      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)')
+      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)', self.method(:add_resource_preload_list))
     end
 
     result.html_safe
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7db635e80d..7fa63d6b27 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,8 +21,8 @@
 
     <%= build_plugin_html 'server:before-script-load' %>
 
-    <link rel="preload" href="<%= script_asset_path "start-discourse" %>" as="script">
-    <link rel="preload" href="<%= script_asset_path "browser-update" %>" as="script">
+    <% add_resource_preload_list(script_asset_path("start-discourse"), "script") %>
+    <% add_resource_preload_list(script_asset_path("browser-update"), "script") %>
     <%= preload_script 'browser-detect' %>
 
     <%= preload_script "locales/#{I18n.locale}" %>
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 72d4424d0c..1ee4e8e557 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -196,10 +196,11 @@ class Stylesheet::Manager
     end.join("\n").html_safe
   end
 
-  def stylesheet_link_tag(target = :desktop, media = 'all')
+  def stylesheet_link_tag(target = :desktop, media = 'all', preload_callback = nil)
     stylesheets = stylesheet_details(target, media)
     stylesheets.map do |stylesheet|
       href = stylesheet[:new_href]
+      preload_callback.call(href, 'style') if preload_callback
       theme_id = stylesheet[:theme_id]
       data_theme_id = theme_id ? "data-theme-id=\"#{theme_id}\"" : ""
       theme_name = stylesheet[:theme_name]
@@ -311,12 +312,13 @@ class Stylesheet::Manager
     %[<link href="#{href}" rel="preload" as="style"/>].html_safe
   end
 
-  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all')
+  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all', preload_callback = nil)
     stylesheet = color_scheme_stylesheet_details(color_scheme_id, media)
 
     return '' if !stylesheet
 
     href = stylesheet[:new_href]
+    preload_callback.call(href, 'style') if preload_callback
 
     css_class = media == 'all' ? "light-scheme" : "dark-scheme"
 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ee2f1cdc97..102f8d7c32 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,9 +3,8 @@
 
 RSpec.describe ApplicationHelper do
   describe "preload_script" do
-    def preload_link(url)
+    def script_tag(url)
       <<~HTML
-          <link rel="preload" href="#{url}" as="script">
           <script defer src="#{url}"></script>
       HTML
     end
@@ -32,7 +31,7 @@ RSpec.describe ApplicationHelper do
       helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
       link = helper.preload_script('discourse')
 
-      expect(link).to eq(preload_link("https://awesome.com/brotli_asset/discourse.js"))
+      expect(link).to eq(script_tag("https://awesome.com/brotli_asset/discourse.js"))
     end
 
     context "with s3 CDN" do
@@ -61,36 +60,77 @@ RSpec.describe ApplicationHelper do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.br.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.br.js"))
       end
 
       it "gives s3 cdn if asset host is not set" do
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "can fall back to gzip compression" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip'
         link = helper.preload_script('discourse')
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.gz.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.gz.js"))
       end
 
       it "gives s3 cdn even if asset host is set" do
         set_cdn_url "https://awesome.com"
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "gives s3 cdn but without brotli/gzip extensions for theme tests assets" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip, br'
         link = helper.preload_script('discourse/tests/theme_qunit_ember_jquery')
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
       end
     end
   end
 
+  describe "add_resource_preload_list" do
+    it "adds resources to the preload list when it's available" do
+      @links_to_preload = []
+      add_resource_preload_list('/assets/discourse.js', 'script')
+      add_resource_preload_list('/assets/discourse.css', 'style')
+
+      expect(@links_to_preload.size).to eq(2)
+    end
+
+    it "doesn't add resources to the preload list when it's not available" do
+      @links_to_preload = nil
+      add_resource_preload_list('/assets/discourse.js', 'script')
+      add_resource_preload_list('/assets/discourse.css', 'style')
+
+      expect(@links_to_preload).to eq(nil)
+    end
+
+    it "adds resources to the preload list when preload_script is called" do
+      @links_to_preload = []
+      helper.preload_script('discourse')
+
+      expect(@links_to_preload.size).to eq(1)
+    end
+
+    it "adds resources to the preload list when discourse_stylesheet_link_tag is called" do
+      @links_to_preload = []
+      helper.discourse_stylesheet_link_tag(:desktop)
+
+      expect(@links_to_preload.size).to eq(1)
+    end
+
+    it "adds resources as the correct type" do
+      @links_to_preload = []
+      helper.discourse_stylesheet_link_tag(:desktop)
+      helper.preload_script('discourse')
+
+      expect(@links_to_preload[0]).to match(/as="style"/)
+      expect(@links_to_preload[1]).to match(/as="script"/)
+    end
+  end
+
   describe "escape_unicode" do
     it "encodes tags" do
       expect(helper.escape_unicode("<tag>")).to eq("\u003ctag>")
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index 218f2c4938..caae0e9a83 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -148,6 +148,16 @@ RSpec.describe Stylesheet::Manager do
       })
     end
 
+    it "stylesheet_link_tag calls the preload callback when set" do
+      preload_list = []
+      preload_callback = ->(href, type) { preload_list << [href, type] }
+
+      manager = manager(theme.id)
+      expect {
+        manager.stylesheet_link_tag(:desktop_theme, 'all', preload_callback)
+      }.to change(preload_list, :size)
+    end
+
     context "with stylesheet order" do
       let(:z_child_theme) do
         Fabricate(:theme, component: true, name: "ze component").tap do |z|
@@ -638,6 +648,17 @@ RSpec.describe Stylesheet::Manager do
       expect(details1[:new_href]).not_to eq(details2[:new_href])
     end
 
+    it "calls the preload callback when set" do
+      preload_list = []
+      cs = Fabricate(:color_scheme, name: 'Funky')
+      theme = Fabricate(:theme, color_scheme_id: cs.id)
+      preload_callback = ->(href, type) { preload_list << [href, type] }
+
+      expect {
+        manager.color_scheme_stylesheet_link_tag(theme.id, 'all', preload_callback)
+      }.to change(preload_list, :size).by(1)
+    end
+
     context "with theme colors" do
       let(:theme) { Fabricate(:theme).tap { |t|
         t.set_field(target: :common, name: "color_definitions", value: ':root {--special: rebeccapurple;}')
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index d25d1a983d..1828b1898c 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -1124,4 +1124,16 @@ RSpec.describe ApplicationController do
       end
     end
   end
+
+  describe 'preload Link header' do
+    it "should have the Link header with assets on full page requests" do
+      get("/latest")
+      expect(response.headers).to include('Link')
+    end
+
+    it "shouldn't have the Link header on xhr api requests" do
+      get("/latest.json")
+      expect(response.headers).not_to include('Link')
+    end
+  end
 end

From 95a57f7e0c7e78ecac14760ae4751e0ae2e8ea0d Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 7 Oct 2022 15:08:40 -0300
Subject: [PATCH 084/332] Revert "FEATURE: Preload resources via link header
 (#18475)" (#18511)

This reverts commit 2d1dbc6f9616ce18807d87c8700c41ee73daa450.

We need to increase nginx proxy buffer to land this.
---
 app/controllers/application_controller.rb    | 13 +----
 app/helpers/application_helper.rb            | 12 ++---
 app/views/layouts/application.html.erb       |  4 +-
 lib/stylesheet/manager.rb                    |  6 +--
 spec/helpers/application_helper_spec.rb      | 56 +++-----------------
 spec/lib/stylesheet/manager_spec.rb          | 21 --------
 spec/requests/application_controller_spec.rb | 12 -----
 7 files changed, 17 insertions(+), 107 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 60e23361be..d7bd742922 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,8 +49,7 @@ class ApplicationController < ActionController::Base
   after_action  :conditionally_allow_site_embedding
   after_action  :ensure_vary_header
   after_action  :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
-  after_action  :add_noindex_header_to_non_canonical, if: :spa_boot_request?
-  around_action :link_preload, if: :spa_boot_request?
+  after_action  :add_noindex_header_to_non_canonical, if: -> { request.get? && !(request.format && request.format.json?) && !request.xhr? }
 
   HONEYPOT_KEY ||= 'HONEYPOT_KEY'
   CHALLENGE_KEY ||= 'CHALLENGE_KEY'
@@ -1009,14 +1008,4 @@ class ApplicationController < ActionController::Base
 
     result
   end
-
-  def link_preload
-    @links_to_preload = []
-    yield
-    response.headers['Link'] = @links_to_preload.join(', ') if !@links_to_preload.empty?
-  end
-
-  def spa_boot_request?
-    request.get? && !(request.format && request.format.json?) && !request.xhr?
-  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d667a5f2c4..0ee00f928c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,16 +142,12 @@ module ApplicationHelper
   end
 
   def preload_script_url(url)
-    add_resource_preload_list(url, 'script')
     <<~HTML.html_safe
+      <link rel="preload" href="#{url}" as="script">
       <script defer src="#{url}"></script>
     HTML
   end
 
-  def add_resource_preload_list(resource_url, type)
-    @links_to_preload << %Q(<#{resource_url}>; rel="preload"; as="#{type}") if !@links_to_preload.nil?
-  end
-
   def discourse_csrf_tags
     # anon can not have a CSRF token cause these are all pages
     # that may be cached, causing a mismatch between session CSRF
@@ -593,7 +589,7 @@ module ApplicationHelper
         stylesheet_manager
       end
 
-    manager.stylesheet_link_tag(name, 'all', self.method(:add_resource_preload_list))
+    manager.stylesheet_link_tag(name, 'all')
   end
 
   def discourse_preload_color_scheme_stylesheets
@@ -609,10 +605,10 @@ module ApplicationHelper
 
   def discourse_color_scheme_stylesheets
     result = +""
-    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all', self.method(:add_resource_preload_list))
+    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all')
 
     if dark_scheme_id != -1
-      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)', self.method(:add_resource_preload_list))
+      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)')
     end
 
     result.html_safe
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7fa63d6b27..7db635e80d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,8 +21,8 @@
 
     <%= build_plugin_html 'server:before-script-load' %>
 
-    <% add_resource_preload_list(script_asset_path("start-discourse"), "script") %>
-    <% add_resource_preload_list(script_asset_path("browser-update"), "script") %>
+    <link rel="preload" href="<%= script_asset_path "start-discourse" %>" as="script">
+    <link rel="preload" href="<%= script_asset_path "browser-update" %>" as="script">
     <%= preload_script 'browser-detect' %>
 
     <%= preload_script "locales/#{I18n.locale}" %>
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 1ee4e8e557..72d4424d0c 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -196,11 +196,10 @@ class Stylesheet::Manager
     end.join("\n").html_safe
   end
 
-  def stylesheet_link_tag(target = :desktop, media = 'all', preload_callback = nil)
+  def stylesheet_link_tag(target = :desktop, media = 'all')
     stylesheets = stylesheet_details(target, media)
     stylesheets.map do |stylesheet|
       href = stylesheet[:new_href]
-      preload_callback.call(href, 'style') if preload_callback
       theme_id = stylesheet[:theme_id]
       data_theme_id = theme_id ? "data-theme-id=\"#{theme_id}\"" : ""
       theme_name = stylesheet[:theme_name]
@@ -312,13 +311,12 @@ class Stylesheet::Manager
     %[<link href="#{href}" rel="preload" as="style"/>].html_safe
   end
 
-  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all', preload_callback = nil)
+  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all')
     stylesheet = color_scheme_stylesheet_details(color_scheme_id, media)
 
     return '' if !stylesheet
 
     href = stylesheet[:new_href]
-    preload_callback.call(href, 'style') if preload_callback
 
     css_class = media == 'all' ? "light-scheme" : "dark-scheme"
 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 102f8d7c32..ee2f1cdc97 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,8 +3,9 @@
 
 RSpec.describe ApplicationHelper do
   describe "preload_script" do
-    def script_tag(url)
+    def preload_link(url)
       <<~HTML
+          <link rel="preload" href="#{url}" as="script">
           <script defer src="#{url}"></script>
       HTML
     end
@@ -31,7 +32,7 @@ RSpec.describe ApplicationHelper do
       helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
       link = helper.preload_script('discourse')
 
-      expect(link).to eq(script_tag("https://awesome.com/brotli_asset/discourse.js"))
+      expect(link).to eq(preload_link("https://awesome.com/brotli_asset/discourse.js"))
     end
 
     context "with s3 CDN" do
@@ -60,77 +61,36 @@ RSpec.describe ApplicationHelper do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.br.js"))
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.br.js"))
       end
 
       it "gives s3 cdn if asset host is not set" do
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "can fall back to gzip compression" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip'
         link = helper.preload_script('discourse')
-        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.gz.js"))
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.gz.js"))
       end
 
       it "gives s3 cdn even if asset host is set" do
         set_cdn_url "https://awesome.com"
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "gives s3 cdn but without brotli/gzip extensions for theme tests assets" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip, br'
         link = helper.preload_script('discourse/tests/theme_qunit_ember_jquery')
-        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
       end
     end
   end
 
-  describe "add_resource_preload_list" do
-    it "adds resources to the preload list when it's available" do
-      @links_to_preload = []
-      add_resource_preload_list('/assets/discourse.js', 'script')
-      add_resource_preload_list('/assets/discourse.css', 'style')
-
-      expect(@links_to_preload.size).to eq(2)
-    end
-
-    it "doesn't add resources to the preload list when it's not available" do
-      @links_to_preload = nil
-      add_resource_preload_list('/assets/discourse.js', 'script')
-      add_resource_preload_list('/assets/discourse.css', 'style')
-
-      expect(@links_to_preload).to eq(nil)
-    end
-
-    it "adds resources to the preload list when preload_script is called" do
-      @links_to_preload = []
-      helper.preload_script('discourse')
-
-      expect(@links_to_preload.size).to eq(1)
-    end
-
-    it "adds resources to the preload list when discourse_stylesheet_link_tag is called" do
-      @links_to_preload = []
-      helper.discourse_stylesheet_link_tag(:desktop)
-
-      expect(@links_to_preload.size).to eq(1)
-    end
-
-    it "adds resources as the correct type" do
-      @links_to_preload = []
-      helper.discourse_stylesheet_link_tag(:desktop)
-      helper.preload_script('discourse')
-
-      expect(@links_to_preload[0]).to match(/as="style"/)
-      expect(@links_to_preload[1]).to match(/as="script"/)
-    end
-  end
-
   describe "escape_unicode" do
     it "encodes tags" do
       expect(helper.escape_unicode("<tag>")).to eq("\u003ctag>")
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index caae0e9a83..218f2c4938 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -148,16 +148,6 @@ RSpec.describe Stylesheet::Manager do
       })
     end
 
-    it "stylesheet_link_tag calls the preload callback when set" do
-      preload_list = []
-      preload_callback = ->(href, type) { preload_list << [href, type] }
-
-      manager = manager(theme.id)
-      expect {
-        manager.stylesheet_link_tag(:desktop_theme, 'all', preload_callback)
-      }.to change(preload_list, :size)
-    end
-
     context "with stylesheet order" do
       let(:z_child_theme) do
         Fabricate(:theme, component: true, name: "ze component").tap do |z|
@@ -648,17 +638,6 @@ RSpec.describe Stylesheet::Manager do
       expect(details1[:new_href]).not_to eq(details2[:new_href])
     end
 
-    it "calls the preload callback when set" do
-      preload_list = []
-      cs = Fabricate(:color_scheme, name: 'Funky')
-      theme = Fabricate(:theme, color_scheme_id: cs.id)
-      preload_callback = ->(href, type) { preload_list << [href, type] }
-
-      expect {
-        manager.color_scheme_stylesheet_link_tag(theme.id, 'all', preload_callback)
-      }.to change(preload_list, :size).by(1)
-    end
-
     context "with theme colors" do
       let(:theme) { Fabricate(:theme).tap { |t|
         t.set_field(target: :common, name: "color_definitions", value: ':root {--special: rebeccapurple;}')
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 1828b1898c..d25d1a983d 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -1124,16 +1124,4 @@ RSpec.describe ApplicationController do
       end
     end
   end
-
-  describe 'preload Link header' do
-    it "should have the Link header with assets on full page requests" do
-      get("/latest")
-      expect(response.headers).to include('Link')
-    end
-
-    it "shouldn't have the Link header on xhr api requests" do
-      get("/latest.json")
-      expect(response.headers).not_to include('Link')
-    end
-  end
 end

From 26b9500983bd1915946e15f9f4b9fb4407a7d18e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 7 Oct 2022 19:34:28 +0100
Subject: [PATCH 085/332] DEV: Fix `bread-crumbs-right` `currentCategory`
 argument (#18491)

---
 .../discourse/app/templates/components/bread-crumbs.hbs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
index cb0ea1ecaf..b198aebbd1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
@@ -33,7 +33,7 @@
     additionalTags=this.additionalTags
     noSubcategories=this.noSubcategories
     showTagsSection=this.showTagsSection
-    currentCategory=this.currentCategory
+    currentCategory=this.category
     categoryBreadcrumbs=this.categoryBreadcrumbs
     editingCategory=this.editingCategory
     editingCategoryTab=this.editingCategoryTab

From e320bbe513dc4a713ee4e44f81412915b213d7ec Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 7 Oct 2022 16:02:03 -0600
Subject: [PATCH 086/332] FEATURE: Adds seeded default categories to the
 sidebar (#18512)

---
 lib/seed_data/categories.rb           | 17 +++++++++++++----
 spec/lib/seed_data/categories_spec.rb | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/lib/seed_data/categories.rb b/lib/seed_data/categories.rb
index 29fd67e1eb..acad6d9e57 100644
--- a/lib/seed_data/categories.rb
+++ b/lib/seed_data/categories.rb
@@ -64,7 +64,8 @@ module SeedData
           color: '808281',
           text_color: 'FFFFFF',
           permissions: { everyone: :full },
-          force_permissions: true
+          force_permissions: true,
+          sidebar: true
         },
         {
           site_setting_name: 'staff_category_id',
@@ -74,7 +75,8 @@ module SeedData
           color: 'E45735',
           text_color: 'FFFFFF',
           permissions: { staff: :full },
-          force_permissions: true
+          force_permissions: true,
+          sidebar: true
         },
         {
           site_setting_name: 'general_category_id',
@@ -84,7 +86,8 @@ module SeedData
           color: '25AAE2',
           text_color: 'FFFFFF',
           permissions: { everyone: :full },
-          force_permissions: true
+          force_permissions: true,
+          sidebar: true
         }
       ]
 
@@ -96,7 +99,7 @@ module SeedData
     end
 
     def create_category(site_setting_name:, name:, description:, position:, color:, text_color:,
-                        permissions:, force_permissions:, force_existence: false)
+                        permissions:, force_permissions:, force_existence: false, sidebar: false)
       category_id = SiteSetting.get(site_setting_name)
 
       if should_create_category?(category_id, force_existence)
@@ -114,6 +117,12 @@ module SeedData
         category.save!
 
         SiteSetting.set(site_setting_name, category.id)
+
+        if sidebar
+          sidebar_categories = SiteSetting.default_sidebar_categories.split('|')
+          sidebar_categories << category.id
+          SiteSetting.set('default_sidebar_categories', sidebar_categories.join('|'))
+        end
       elsif category = Category.find_by(id: category_id)
         if description.present? && (category.topic_id.blank? || !Topic.exists?(category.topic_id))
           category.description = description
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index 03b3d03a57..102813b799 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -109,6 +109,22 @@ RSpec.describe SeedData::Categories do
       expect(Category.last.name).to eq("General")
     end
 
+    it "adds default categories SiteSetting.default_sidebar_categories" do
+      create_category("staff_category_id")
+      staff_category = Category.last
+      create_category("meta_category_id")
+      site_feedback_category = Category.last
+      create_category("general_category_id")
+      general_category = Category.last
+      site_setting_ids = SiteSetting.default_sidebar_categories.split('|')
+      create_category("uncategorized_category_id")
+
+      expect(site_setting_ids[0].to_i).to eq(staff_category.id)
+      expect(site_setting_ids[1].to_i).to eq(site_feedback_category.id)
+      expect(site_setting_ids[2].to_i).to eq(general_category.id)
+      expect(site_setting_ids.count).to eq(3)
+    end
+
     it "does not override permissions of existing category when not forced" do
       create_category("lounge_category_id")
 

From ec65f3c1ad3bca57d30bc8b60acf662581443e68 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Sat, 8 Oct 2022 02:21:53 +0400
Subject: [PATCH 087/332] DEV: Pass a status object to the user-status-picker
 instead of passing emoji + description (#18513)

---
 .../app/components/user-status-picker.js      | 20 ++++---
 .../discourse/app/controllers/user-status.js  | 29 ++++------
 .../components/user-status-picker.hbs         | 10 ++--
 .../app/templates/modal/user-status.hbs       |  2 +-
 .../components/user-status-picker-test.js     | 54 +++++++++++++++++++
 5 files changed, 86 insertions(+), 29 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/user-status-picker-test.js

diff --git a/app/assets/javascripts/discourse/app/components/user-status-picker.js b/app/assets/javascripts/discourse/app/components/user-status-picker.js
index 691a4e683c..602f4b1679 100644
--- a/app/assets/javascripts/discourse/app/components/user-status-picker.js
+++ b/app/assets/javascripts/discourse/app/components/user-status-picker.js
@@ -8,12 +8,18 @@ export default class UserStatusPicker extends Component {
   tagName = "";
   isFocused = false;
   emojiPickerIsActive = false;
-  emoji = null;
-  description = null;
 
-  @computed("emoji")
+  didInsertElement() {
+    this._super(...arguments);
+
+    if (!this.status) {
+      this.set("status", {});
+    }
+  }
+
+  @computed("status.emoji")
   get emojiHtml() {
-    const emoji = escapeExpression(`:${this.emoji}:`);
+    const emoji = escapeExpression(`:${this.status.emoji}:`);
     return emojiUnescape(emoji);
   }
 
@@ -24,7 +30,7 @@ export default class UserStatusPicker extends Component {
 
   @action
   emojiSelected(emoji) {
-    this.set("emoji", emoji);
+    this.set("status.emoji", emoji);
     this.set("emojiPickerIsActive", false);
 
     scheduleOnce("afterRender", () => {
@@ -44,8 +50,8 @@ export default class UserStatusPicker extends Component {
 
   @action
   setDefaultEmoji() {
-    if (!this.emoji) {
-      this.set("emoji", "speech_balloon");
+    if (!this.status.emoji) {
+      this.set("status.emoji", "speech_balloon");
     }
   }
 
diff --git a/app/assets/javascripts/discourse/app/controllers/user-status.js b/app/assets/javascripts/discourse/app/controllers/user-status.js
index c438ac9c0d..b4a1bc61f3 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-status.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-status.js
@@ -12,25 +12,18 @@ import {
 
 export default Controller.extend(ModalFunctionality, {
   userStatusService: service("user-status"),
-
-  emoji: null,
-  description: null,
-  endsAt: null,
-
   showDeleteButton: false,
   prefilledDateTime: null,
   timeShortcuts: null,
   _itsatrap: null,
 
   onShow() {
-    const status = this.currentUser.status;
+    const currentStatus = { ...this.currentUser.status };
     this.setProperties({
-      emoji: status?.emoji,
-      description: status?.description,
-      endsAt: status?.ends_at,
-      showDeleteButton: !!status,
+      status: currentStatus,
+      showDeleteButton: !!this.currentUser.status,
       timeShortcuts: this._buildTimeShortcuts(),
-      prefilledDateTime: status?.ends_at,
+      prefilledDateTime: currentStatus?.ends_at,
     });
 
     this.set("_itsatrap", new ItsATrap());
@@ -42,7 +35,7 @@ export default Controller.extend(ModalFunctionality, {
     this.set("timeShortcuts", null);
   },
 
-  @discourseComputed("emoji", "description")
+  @discourseComputed("status.emoji", "status.description")
   statusIsSet(emoji, description) {
     return !!emoji && !!description;
   },
@@ -69,18 +62,18 @@ export default Controller.extend(ModalFunctionality, {
 
   @action
   onTimeSelected(_, time) {
-    this.set("endsAt", time);
+    this.set("status.endsAt", time);
   },
 
   @action
   saveAndClose() {
-    const status = {
-      description: this.description,
-      emoji: this.emoji,
-      ends_at: this.endsAt?.toISOString(),
+    const newStatus = {
+      description: this.status.description,
+      emoji: this.status.emoji,
+      ends_at: this.status.endsAt?.toISOString(),
     };
     this.userStatusService
-      .set(status)
+      .set(newStatus)
       .then(() => {
         this.send("closeModal");
       })
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
index d1b6d1002d..4737847fe8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
@@ -7,7 +7,7 @@
       {{on "focus" this.focus}}
       {{on "blur" this.blur}}
     >
-      {{#if @emoji}}
+      {{#if @status.emoji}}
         {{html-safe this.emojiHtml}}
       {{else}}
         {{d-icon "discourse-emojis"}}
@@ -15,11 +15,15 @@
     </button>
     <Input
       class="user-status-description"
-      @value={{@description}}
+      @value={{@status.description}}
       placeholder={{i18n "user_status.what_are_you_doing"}}
       {{on "input" this.setDefaultEmoji}}
       {{on "focus" this.focus}}
       {{on "blur" this.blur}} />
   </div>
 </div>
-<EmojiPicker @isActive={{this.emojiPickerIsActive}} @emojiSelected={{action "emojiSelected"}} @onEmojiPickerClose={{action "onEmojiPickerOutsideClick"}} @placement="bottom" />
+<EmojiPicker
+  @isActive={{this.emojiPickerIsActive}}
+  @emojiSelected={{action "emojiSelected"}}
+  @onEmojiPickerClose={{action "onEmojiPickerOutsideClick"}}
+  @placement="bottom"/>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs b/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
index 95d16a7f19..1d2adb7c5f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
@@ -1,7 +1,7 @@
 <DModalBody>
   <ConditionalLoadingSpinner @condition={{this.loading}}>
     <div class="control-group">
-      <UserStatusPicker @emoji={{this.emoji}} @description={{this.description}} />
+      <UserStatusPicker @status={{this.status}} />
     </div>
     <div class="control-group control-group-remove-status">
       <label class="control-label">
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-status-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-status-picker-test.js
new file mode 100644
index 0000000000..12c579bdf4
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-status-picker-test.js
@@ -0,0 +1,54 @@
+import { module, test } from "qunit";
+import { click, fillIn, render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { hbs } from "ember-cli-htmlbars";
+import { query } from "discourse/tests/helpers/qunit-helpers";
+
+module("Integration | Component | user-status-picker", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("it renders current status", async function (assert) {
+    const status = {
+      emoji: "tooth",
+      description: "off to dentist",
+    };
+    this.set("status", status);
+    await render(hbs`<UserStatusPicker @status={{this.status}} />`);
+    assert.equal(
+      query(".emoji").alt,
+      status.emoji,
+      "the status emoji is shown"
+    );
+    assert.equal(
+      query(".user-status-description").value,
+      status.description,
+      "the status description is shown"
+    );
+  });
+
+  test("it picks emoji", async function (assert) {
+    const status = {
+      emoji: "tooth",
+      description: "off to dentist",
+    };
+    this.set("status", status);
+    await render(hbs`<UserStatusPicker @status={{this.status}} />`);
+
+    const newEmoji = "mega";
+    await click(".btn-emoji");
+    await fillIn(".emoji-picker-content .filter", newEmoji);
+    await click(".results .emoji");
+
+    assert.equal(query(".emoji").alt, newEmoji);
+  });
+
+  test("it sets default emoji when user starts typing a description", async function (assert) {
+    const defaultEmoji = "speech_balloon";
+
+    this.set("status", null);
+    await render(hbs`<UserStatusPicker @status={{this.status}} />`);
+    await fillIn(".user-status-description", "s");
+
+    assert.equal(query(".emoji").alt, defaultEmoji);
+  });
+});

From 7009f9c95e6a7ac8262b2e906c48c11eddd49827 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Sat, 8 Oct 2022 01:06:20 +0200
Subject: [PATCH 088/332] UX: correct colour to nav instead of danger (#18515)

---
 .../admin/addon/templates/components/themes-list.hbs          | 4 ++--
 app/assets/stylesheets/common/admin/customize.scss            | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
index f71aa9dd52..e7055b7126 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
@@ -1,6 +1,6 @@
 <div class="themes-list-header">
-  <DButton @action={{action "changeView"}} @actionParam={{this.THEMES}} @class={{concat "themes-tab " "tab " (if this.themesTabActive "btn-danger active" "")}} @label="admin.customize.theme.title" />
-  <DButton @action={{action "changeView"}} @actionParam={{this.COMPONENTS}} @class={{concat "components-tab " "tab " (if this.componentsTabActive "btn-danger active" "")}} @label="admin.customize.theme.components" @icon="puzzle-piece" />
+  <DButton @action={{action "changeView"}} @actionParam={{this.THEMES}} @class={{concat "themes-tab " "tab " (if this.themesTabActive "active" "")}} @label="admin.customize.theme.title" />
+  <DButton @action={{action "changeView"}} @actionParam={{this.COMPONENTS}} @class={{concat "components-tab " "tab " (if this.componentsTabActive "active" "")}} @label="admin.customize.theme.components" @icon="puzzle-piece" />
 </div>
 
 <div class="themes-list-container">
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 2c876a8abf..bf18cfc2b4 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -189,6 +189,8 @@
       text-align: center;
 
       &.active {
+        background-color: var(--quaternary);
+        color: var(--secondary);
         font-weight: 700;
       }
     }

From b2a14eeb168331bdf294612a900a1ee38af3f54f Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 10 Oct 2022 14:47:55 +0800
Subject: [PATCH 089/332] FIX: Ensure group inboxes in messages section is
 sorted by group name (#18508)

---
 .../sidebar/user/messages-section.js          | 24 ++++++++++---------
 .../sidebar-user-messages-section-test.js     | 23 +++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
index c96c60b961..1dd19f44a5 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
@@ -122,18 +122,20 @@ export default class SidebarUserMessagesSection extends Component {
   get groupMessagesSectionLinks() {
     const links = [];
 
-    this.currentUser.groupsWithMessages.forEach((group) => {
-      GROUP_MESSAGES_INBOX_FILTERS.forEach((groupMessageLink) => {
-        links.push(
-          new GroupMessageSectionLink({
-            group,
-            type: groupMessageLink,
-            currentUser: this.currentUser,
-            pmTopicTrackingState: this.pmTopicTrackingState,
-          })
-        );
+    this.currentUser.groupsWithMessages
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .forEach((group) => {
+        GROUP_MESSAGES_INBOX_FILTERS.forEach((groupMessageLink) => {
+          links.push(
+            new GroupMessageSectionLink({
+              group,
+              type: groupMessageLink,
+              currentUser: this.currentUser,
+              pmTopicTrackingState: this.pmTopicTrackingState,
+            })
+          );
+        });
       });
-    });
 
     return links;
   }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
index f3ac3f2f4b..464d5422e8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
@@ -7,6 +7,7 @@ import {
   exists,
   publishToMessageBus,
   query,
+  queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
 import { NotificationLevels } from "discourse/lib/notification-levels";
@@ -175,7 +176,7 @@ acceptance(
       updateCurrentUser({
         groups: [
           {
-            name: "group1",
+            name: "group3",
             has_messages: true,
           },
           {
@@ -183,7 +184,7 @@ acceptance(
             has_messages: false,
           },
           {
-            name: "group3",
+            name: "group1",
             has_messages: true,
           },
         ],
@@ -191,18 +192,16 @@ acceptance(
 
       await visit("/");
 
-      assert.ok(
-        exists(
-          ".sidebar-section-messages .sidebar-section-link-group-messages-inbox.group1"
-        ),
-        "displays group1 inbox link"
+      const groupSectionLinks = queryAll(
+        ".sidebar-section-messages .sidebar-section-link"
       );
 
-      assert.ok(
-        exists(
-          ".sidebar-section-messages .sidebar-section-link-group-messages-inbox.group3"
-        ),
-        "displays group3 inbox link"
+      assert.deepEqual(
+        groupSectionLinks
+          .toArray()
+          .map((sectionLink) => sectionLink.textContent.trim()),
+        ["Inbox", "group1", "group3"],
+        "displays group section links sorted by name"
       );
 
       await visit("/u/eviltrout/messages/group/GrOuP1");

From 140200ae83eb5fd9d0e8194c1baf3fca10c43a4a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <er.ajalan@gmail.com>
Date: Mon, 10 Oct 2022 16:53:19 +0530
Subject: [PATCH 090/332] FIX: do not show welcome CTA banner if the welcome
 topic is deleted (#18528)

---
 app/models/site.rb       |  7 ++++++-
 spec/models/site_spec.rb | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 4a9c08488a..426299414f 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -215,7 +215,12 @@ class Site
     return show_welcome_topic_banner unless show_welcome_topic_banner.nil?
 
     show_welcome_topic_banner = if (user_id == User.first_login_admin_id)
-      Post.find_by("topic_id = :topic_id AND post_number = 1 AND version = 1 AND created_at > :created_at", topic_id: SiteSetting.welcome_topic_id, created_at: 1.month.ago).present?
+      Post.joins(:topic)
+        .find_by(
+          "topics.id = :topic_id AND topics.deleted_at IS NULL AND posts.post_number = 1 AND posts.version = 1 AND posts.created_at > :created_at",
+          topic_id: SiteSetting.welcome_topic_id,
+          created_at: 1.month.ago
+        ).present?
     else
       false
     end
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index c6db228378..c764d3ebb5 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -232,6 +232,18 @@ RSpec.describe Site do
       expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
       expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
     end
+
+    it "returns false when welcome topic has been deleted" do
+      admin = Fabricate(:admin)
+      UserAuthToken.generate!(user_id: admin.id)
+
+      topic = Fabricate(:topic, deleted_at: 1.minute.ago)
+      first_post = Fabricate(:post, topic: topic, created_at: 25.days.ago)
+      SiteSetting.welcome_topic_id = topic.id
+
+      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
+      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
+    end
   end
 
 end

From b06cc8a836cc38bf4166a8cf967d610748d3dd42 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Mon, 10 Oct 2022 17:45:21 +0400
Subject: [PATCH 091/332] DEV: Decouple the user status modal from current
 user's status (#18514)

---
 .../user-menu/profile-tab-content.js          |  7 +++++++
 .../discourse/app/controllers/user-status.js  | 19 ++++++++-----------
 .../app/widgets/quick-access-profile.js       |  6 ++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
index 92fb185c29..745bf760fa 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
@@ -6,6 +6,8 @@ import showModal from "discourse/lib/show-modal";
 export default class UserMenuProfileTabContent extends Component {
   @service currentUser;
   @service siteSettings;
+  @service userStatus;
+
   saving = false;
 
   get showToggleAnonymousButton() {
@@ -59,6 +61,11 @@ export default class UserMenuProfileTabContent extends Component {
     showModal("user-status", {
       title: "user_status.set_custom_status",
       modalClass: "user-status",
+      model: {
+        status: this.currentUser.status,
+        saveAction: (status) => this.userStatus.set(status),
+        deleteAction: () => this.userStatus.clear(),
+      },
     });
   }
 }
diff --git a/app/assets/javascripts/discourse/app/controllers/user-status.js b/app/assets/javascripts/discourse/app/controllers/user-status.js
index b4a1bc61f3..b13b71161d 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-status.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-status.js
@@ -1,7 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse-common/utils/decorators";
 import ItsATrap from "@discourse/itsatrap";
@@ -11,17 +10,16 @@ import {
 } from "discourse/lib/time-shortcut";
 
 export default Controller.extend(ModalFunctionality, {
-  userStatusService: service("user-status"),
   showDeleteButton: false,
   prefilledDateTime: null,
   timeShortcuts: null,
   _itsatrap: null,
 
   onShow() {
-    const currentStatus = { ...this.currentUser.status };
+    const currentStatus = { ...this.model.status };
     this.setProperties({
       status: currentStatus,
-      showDeleteButton: !!this.currentUser.status,
+      showDeleteButton: !!this.model.status,
       timeShortcuts: this._buildTimeShortcuts(),
       prefilledDateTime: currentStatus?.ends_at,
     });
@@ -54,8 +52,8 @@ export default Controller.extend(ModalFunctionality, {
 
   @action
   delete() {
-    this.userStatusService
-      .clear()
+    this.model
+      .deleteAction()
       .then(() => this.send("closeModal"))
       .catch((e) => this._handleError(e));
   },
@@ -72,11 +70,10 @@ export default Controller.extend(ModalFunctionality, {
       emoji: this.status.emoji,
       ends_at: this.status.endsAt?.toISOString(),
     };
-    this.userStatusService
-      .set(newStatus)
-      .then(() => {
-        this.send("closeModal");
-      })
+
+    this.model
+      .saveAction(newStatus)
+      .then(() => this.send("closeModal"))
       .catch((e) => this._handleError(e));
   },
 
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
index b30dbdf224..14acfe9ee9 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
@@ -26,6 +26,7 @@ createWidgetFrom(QuickAccessItem, "logout-item", {
 
 createWidgetFrom(QuickAccessItem, "user-status-item", {
   tagName: "li.user-status",
+  services: ["userStatus"],
 
   html() {
     const status = this.currentUser.status;
@@ -41,6 +42,11 @@ createWidgetFrom(QuickAccessItem, "user-status-item", {
     showModal("user-status", {
       title: "user_status.set_custom_status",
       modalClass: "user-status",
+      model: {
+        status: this.currentUser.status,
+        saveAction: (status) => this.userStatus.set(status),
+        deleteAction: () => this.userStatus.clear(),
+      },
     });
   },
 

From 08ab09c9289dbab6a3979dab4849eaa505ea7679 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 10 Oct 2022 19:21:51 +0300
Subject: [PATCH 092/332] FIX: Remove public topic invite functionality
 (#18488)

This can no longer be used from the user interface and could be used to
generate useless topic invites notifications. This commit adds site
setting max_topic_invitations_per_minute to prevent invite spam.
---
 app/controllers/topics_controller.rb    | 29 ++++----
 app/models/topic.rb                     | 16 +++--
 config/locales/server.en.yml            |  2 +
 config/site_settings.yml                |  1 +
 spec/models/topic_spec.rb               | 71 ++++++++++++++-----
 spec/requests/api/topics_spec.rb        |  2 +-
 spec/requests/topics_controller_spec.rb | 94 ++-----------------------
 7 files changed, 90 insertions(+), 125 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index be5f02f41a..67c844dbe6 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -687,11 +687,12 @@ class TopicsController < ApplicationController
 
   def invite_group
     group = Group.find_by(name: params[:group])
-    raise Discourse::NotFound unless group
+    raise Discourse::NotFound if !group
 
     topic = Topic.find_by(id: params[:topic_id])
+    raise Discourse::NotFound if !topic
 
-    unless pm_has_slots?(topic)
+    if !pm_has_slots?(topic)
       return render_json_error(
         I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
       )
@@ -708,29 +709,29 @@ class TopicsController < ApplicationController
 
   def invite
     topic = Topic.find_by(id: params[:topic_id])
-    raise Discourse::InvalidParameters.new unless topic
+    raise Discourse::NotFound if !topic
 
-    username_or_email = params[:user] ? fetch_username : fetch_email
+    if !topic.private_message?
+      return render_json_error(I18n.t("topic_invite.not_pm"))
+    end
 
-    groups = Group.lookup_groups(
-      group_ids: params[:group_ids],
-      group_names: params[:group_names]
-    )
-
-    unless pm_has_slots?(topic)
+    if !pm_has_slots?(topic)
       return render_json_error(
         I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
       )
     end
 
     guardian.ensure_can_invite_to!(topic)
-    group_ids = groups.map(&:id)
+
+    username_or_email = params[:user] ? fetch_username : fetch_email
+    group_ids = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    ).pluck(:id)
 
     begin
       if topic.invite(current_user, username_or_email, group_ids, params[:custom_message])
-        user = User.find_by_username_or_email(username_or_email)
-
-        if user
+        if user = User.find_by_username_or_email(username_or_email)
           render_json_dump BasicUserSerializer.new(user, scope: guardian, root: 'user')
         else
           render json: success_json
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 924b38f88c..88578cdce4 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1029,11 +1029,9 @@ class Topic < ActiveRecord::Base
   end
 
   def invite(invited_by, username_or_email, group_ids = nil, custom_message = nil)
-    target_user = User.find_by_username_or_email(username_or_email)
     guardian = Guardian.new(invited_by)
-    is_email = username_or_email =~ /^.+@.+$/
 
-    if target_user
+    if target_user = User.find_by_username_or_email(username_or_email)
       if topic_allowed_users.exists?(user_id: target_user.id)
         raise UserExists.new(I18n.t("topic_invite.user_exists"))
       end
@@ -1064,7 +1062,7 @@ class Topic < ActiveRecord::Base
       else
         !!invite_to_topic(invited_by, target_user, group_ids, guardian)
       end
-    elsif is_email && guardian.can_invite_via_email?(self)
+    elsif username_or_email =~ /^.+@.+$/ && guardian.can_invite_via_email?(self)
       !!Invite.generate(invited_by,
         email: username_or_email,
         topic: self,
@@ -1781,6 +1779,13 @@ class Topic < ActiveRecord::Base
       SiteSetting.max_topic_invitations_per_day,
       1.day.to_i
     ).performed!
+
+    RateLimiter.new(
+      invited_by,
+      "topic-invitations-per-minute",
+      SiteSetting.max_topic_invitations_per_minute,
+      1.day.to_i
+    ).performed!
   end
 
   def cannot_permanently_delete_reason(user)
@@ -1853,8 +1858,9 @@ class Topic < ActiveRecord::Base
       ))
     end
 
+    rate_limit_topic_invitation(invited_by)
+
     Topic.transaction do
-      rate_limit_topic_invitation(invited_by)
       topic_allowed_users.create!(user_id: target_user.id) unless topic_allowed_users.exists?(user_id: target_user.id)
 
       user_in_allowed_group = (user.group_ids & topic_allowed_groups.map(&:group_id)).present?
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 02a5f4e693..eab63f0735 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -279,6 +279,7 @@ en:
 
   topic_invite:
     failed_to_invite: "The user cannot be invited into this topic without a group membership in either one of the following groups: %{group_names}."
+    not_pm: "You can only invite to private messages."
     user_exists: "Sorry, that user has already been invited. You may only invite a user to a topic once."
     muted_topic: "Sorry, that user muted this topic."
     receiver_does_not_allow_pm: "Sorry, that user does not allow you to send them private messages."
@@ -1791,6 +1792,7 @@ en:
     max_personal_messages_per_day: "Maximum number of new personal message topics a user can create per day."
     max_invites_per_day: "Maximum number of invites a user can send per day."
     max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day."
+    max_topic_invitations_per_minute: "Maximum number of topic invitations a user can send per minute."
 
     max_logins_per_ip_per_hour: "Maximum number of logins allowed per IP address per hour"
     max_logins_per_ip_per_minute: "Maximum number of logins allowed per IP address per minute"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 8243bd1a7b..6ad7ebda53 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1893,6 +1893,7 @@ rate_limits:
   max_edits_per_day: 30
   max_invites_per_day: 10
   max_topic_invitations_per_day: 30
+  max_topic_invitations_per_minute: 5
   max_topics_in_first_day: 3
   max_replies_in_first_day: 10
   tl2_additional_likes_per_day_multiplier: 1.5
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 56abc419ae..3b569b901e 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -723,7 +723,6 @@ RSpec.describe Topic do
 
     context 'with rate limits' do
       before do
-        SiteSetting.max_topic_invitations_per_day = 1
         RateLimiter.enable
         Group.refresh_automatic_groups!
       end
@@ -732,30 +731,68 @@ RSpec.describe Topic do
         RateLimiter.clear_all!
       end
 
-      it "rate limits topic invitations" do
-        start = Time.now.tomorrow.beginning_of_day
-        freeze_time(start)
+      context 'when per day' do
+        before do
+          SiteSetting.max_topic_invitations_per_day = 1
+        end
 
-        topic = Fabricate(:topic, user: trust_level_2)
+        it "rate limits topic invitations" do
+          start = Time.now.tomorrow.beginning_of_day
+          freeze_time(start)
 
-        topic.invite(topic.user, user.username)
+          topic = Fabricate(:topic, user: trust_level_2)
 
-        expect {
-          topic.invite(topic.user, user1.username)
-        }.to raise_error(RateLimiter::LimitExceeded)
+          topic.invite(topic.user, user.username)
+
+          expect {
+            topic.invite(topic.user, user1.username)
+          }.to raise_error(RateLimiter::LimitExceeded)
+        end
+
+        it "rate limits PM invitations" do
+          start = Time.now.tomorrow.beginning_of_day
+          freeze_time(start)
+
+          topic = Fabricate(:private_message_topic, user: trust_level_2)
+
+          topic.invite(topic.user, user.username)
+
+          expect {
+            topic.invite(topic.user, user1.username)
+          }.to raise_error(RateLimiter::LimitExceeded)
+        end
       end
 
-      it "rate limits PM invitations" do
-        start = Time.now.tomorrow.beginning_of_day
-        freeze_time(start)
+      context 'when per minute' do
+        before do
+          SiteSetting.max_topic_invitations_per_minute = 1
+        end
 
-        topic = Fabricate(:private_message_topic, user: trust_level_2)
+        it "rate limits topic invitations" do
+          start = Time.now.tomorrow.beginning_of_minute
+          freeze_time(start)
 
-        topic.invite(topic.user, user.username)
+          topic = Fabricate(:topic, user: trust_level_2)
 
-        expect {
-          topic.invite(topic.user, user1.username)
-        }.to raise_error(RateLimiter::LimitExceeded)
+          topic.invite(topic.user, user.username)
+
+          expect {
+            topic.invite(topic.user, user1.username)
+          }.to raise_error(RateLimiter::LimitExceeded)
+        end
+
+        it "rate limits PM invitations" do
+          start = Time.now.tomorrow.beginning_of_minute
+          freeze_time(start)
+
+          topic = Fabricate(:private_message_topic, user: trust_level_2)
+
+          topic.invite(topic.user, user.username)
+
+          expect {
+            topic.invite(topic.user, user1.username)
+          }.to raise_error(RateLimiter::LimitExceeded)
+        end
       end
     end
 
diff --git a/spec/requests/api/topics_spec.rb b/spec/requests/api/topics_spec.rb
index 79dcf58525..ac690323c3 100644
--- a/spec/requests/api/topics_spec.rb
+++ b/spec/requests/api/topics_spec.rb
@@ -229,7 +229,7 @@ RSpec.describe 'topics' do
 
         let(:username) { Fabricate(:user).username }
         let(:request_body) { { user: username } }
-        let(:id) { Fabricate(:topic).id }
+        let(:id) { Fabricate(:private_message_topic).id }
 
         run_test! do |response|
           data = JSON.parse(response.body)
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 212c55466d..fe79743a80 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -4047,77 +4047,17 @@ RSpec.describe TopicsController do
         sign_in(user)
       end
 
-      context 'as a valid user' do
+      context 'when topic id is not PM' do
         fab!(:user_topic) { Fabricate(:topic, user: user) }
 
         it 'should return the right response' do
           user.update!(trust_level: SiteSetting.min_trust_level_to_allow_invite)
 
-          expect do
-            post "/t/#{user_topic.id}/invite.json", params: {
-              email: 'someguy@email.com'
-            }
-          end.to change { Invite.where(invited_by_id: user.id).count }.by(1)
-
-          expect(response.status).to eq(200)
-          expect(Jobs::InviteEmail.jobs.first['args'].first['invite_to_topic']).to be_truthy
-        end
-      end
-
-      context 'when user is a group manager' do
-        fab!(:group) { Fabricate(:group).tap { |g| g.add_owner(user) } }
-        fab!(:private_category)  { Fabricate(:private_category, group: group) }
-
-        fab!(:group_private_topic) do
-          Fabricate(:topic, category: private_category, user: user)
-        end
-
-        let!(:recipient) { 'jake@adventuretime.ooo' }
-
-        before_all do
-          user.update!(trust_level: SiteSetting.min_trust_level_to_allow_invite)
-        end
-
-        it "should attach group to the invite" do
-          post "/t/#{group_private_topic.id}/invite.json", params: {
-            user: recipient,
-            group_ids: "#{group.id},9999999"
+          post "/t/#{user_topic.id}/invite.json", params: {
+            email: 'someguy@email.com'
           }
 
-          expect(response.status).to eq(200)
-          expect(Invite.find_by(email: recipient).groups).to contain_exactly(group)
-        end
-
-        context 'when group is available to automatic groups only' do
-          before do
-            group.update!(automatic: true)
-          end
-
-          it 'should return the right response' do
-            post "/t/#{group_private_topic.id}/invite.json", params: {
-              user: user
-            }
-
-            expect(response.status).to eq(403)
-          end
-        end
-
-        context 'when user is not part of the required group' do
-          it 'should return the right response' do
-            post "/t/#{group_private_topic.id}/invite.json", params: {
-              user: user
-            }
-
-            expect(response.status).to eq(422)
-
-            response_body = response.parsed_body
-
-            expect(response_body["errors"]).to eq([
-              I18n.t("topic_invite.failed_to_invite",
-                group_names: group.name
-              )
-            ])
-          end
+          expect(response.status).to eq(422)
         end
       end
 
@@ -4129,13 +4069,13 @@ RSpec.describe TopicsController do
             email: user.email
           }
 
-          expect(response.status).to eq(400)
+          expect(response.status).to eq(404)
         end
       end
 
       it 'requires an email parameter' do
         post "/t/#{topic.id}/invite.json"
-        expect(response.status).to eq(400)
+        expect(response.status).to eq(422)
       end
 
       context "when PM has reached maximum allowed numbers of recipients" do
@@ -4180,28 +4120,6 @@ RSpec.describe TopicsController do
         end
       end
     end
-
-    context "when inviting a group to a topic" do
-      fab!(:group) { Fabricate(:group) }
-
-      before do
-        sign_in(admin)
-      end
-
-      it "should work correctly" do
-        email = 'hiro@from.heros'
-
-        post "/t/#{topic.id}/invite.json", params: {
-          email: email, group_ids: group.id
-        }
-
-        expect(response.status).to eq(200)
-
-        groups = Invite.find_by(email: email).groups
-        expect(groups.count).to eq(1)
-        expect(groups.first.id).to eq(group.id)
-      end
-    end
   end
 
   describe 'invite_group' do

From dc89b72d465329b041b0b26be4e6176343288176 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 10 Oct 2022 20:00:52 +0300
Subject: [PATCH 093/332] FIX: Show error if field is same as password (#18529)

* FIX: Show user fields validation errors

* FIX: Show error if user field is same as password
---
 .../app/mixins/user-fields-validation.js      | 50 +++++++++++++------
 .../templates/components/user-fields/text.hbs |  1 +
 .../app/templates/modal/create-account.hbs    |  2 +-
 .../create-account-user-fields-test.js        | 23 +++++++--
 config/locales/client.en.yml                  |  1 +
 5 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
index 1a503dfcc2..b5b01636c8 100644
--- a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
@@ -20,27 +20,49 @@ export default Mixin.create({
     this.set("userFields", userFields);
   },
 
-  // Validate required fields
   @discourseComputed("userFields.@each.value")
   userFieldsValidation() {
-    let userFields = this.userFields;
-    if (userFields) {
-      userFields = userFields.filterBy("field.required");
+    if (!this.userFields) {
+      return EmberObject.create({ ok: true });
     }
-    if (!isEmpty(userFields)) {
-      const emptyUserField = userFields.find((uf) => {
-        const val = uf.get("value");
-        return !val || isEmpty(val);
-      });
-      if (emptyUserField) {
-        const userField = emptyUserField.field;
-        return EmberObject.create({
+
+    this.userFields.forEach((userField) => {
+      let validation = EmberObject.create({ ok: true });
+
+      if (
+        userField.field.required &&
+        (!userField.value || isEmpty(userField.value))
+      ) {
+        validation = EmberObject.create({
           failed: true,
-          message: I18n.t("user_fields.required", { name: userField.name }),
-          element: userField.element,
+          reason: I18n.t("user_fields.required", {
+            name: userField.field.name,
+          }),
+          element: userField.field.element,
+        });
+      } else if (
+        this.accountPassword &&
+        userField.field.field_type === "text" &&
+        userField.value &&
+        userField.value
+          .toLowerCase()
+          .includes(this.accountPassword.toLowerCase())
+      ) {
+        validation = EmberObject.create({
+          failed: true,
+          reason: I18n.t("user_fields.same_as_password"),
+          element: userField.field.element,
         });
       }
+
+      userField.set("validation", validation);
+    });
+
+    const invalidUserField = this.userFields.find((f) => f.validation.failed);
+    if (invalidUserField) {
+      return invalidUserField.validation;
     }
+
     return EmberObject.create({ ok: true });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
index e09dca98b3..b504e8f15c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
@@ -4,5 +4,6 @@
 </label>
 <div class="controls">
   <Input id={{concat "user-" this.elementId}} @value={{this.value}} maxlength={{this.site.user_field_max_length}} />
+  <InputTip @validation={{this.validation}} />
   <div class="instructions">{{html-safe this.field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index 67943f5147..41da1f8a1d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -112,7 +112,7 @@
                       {{!-- adding the value-entered class here to
                       be able to detect if the user field has a value
                       entered --}}
-                      <UserField @field={{f.field}} @value={{f.value}} @class={{value-entered f.value}} />
+                      <UserField @field={{f.field}} @value={{f.value}} @class={{value-entered f.value}} @validation={{f.validation}} />
                     </div>
                   {{/each}}
                 </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
index 3a73c37288..b80fe1e43d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
@@ -46,9 +46,6 @@ acceptance("Create Account - User Fields", function (needs) {
 
     await fillIn("#new-account-name", "Dr. Good Tuna");
     await fillIn("#new-account-password", "cool password bro");
-    // without this double fill, field will sometimes being empty
-    // got consistent repro by having browser search bar focused when starting test
-    await fillIn("#new-account-email", "good.tuna@test.com");
     await fillIn("#new-account-email", "good.tuna@test.com");
     await fillIn("#new-account-username", "goodtuna");
 
@@ -78,4 +75,24 @@ acceptance("Create Account - User Fields", function (needs) {
       "hitting Enter triggers action"
     );
   });
+
+  test("shows validation error for user fields", async function (assert) {
+    await visit("/");
+    await click("header .sign-up-button");
+
+    await fillIn("#new-account-password", "cool password bro");
+    await fillIn(".user-field-whats-your-dad-like input", "cool password bro");
+
+    await click(".modal-footer .btn-primary");
+
+    assert.ok(
+      exists(".user-field-what-is-your-pets-name .tip.bad"),
+      "shows required field error"
+    );
+
+    assert.ok(
+      exists(".user-field-whats-your-dad-like .tip.bad"),
+      "shows same as password error"
+    );
+  });
 });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bf30b07949..f9459f5d46 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1038,6 +1038,7 @@ en:
     user_fields:
       none: "(select an option)"
       required: 'Please enter a value for "%{name}"'
+      same_as_password: 'Your password should not be repeated in other fields.'
 
     user:
       said: "%{username}:"

From cab173d3b5bc757ba964c1392d829ccc7facbe83 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 11 Oct 2022 09:04:51 +1000
Subject: [PATCH 094/332] DEV: Add specs for hashtags related code (#18526)

Adding a couple of small specs to code around hashtags
for tags and categories since I will be working in this
area soon and these were not covered.
---
 spec/lib/pretty_text/helpers_spec.rb      | 31 +++++++++++++++++++++++
 spec/requests/hashtags_controller_spec.rb | 10 ++++++++
 2 files changed, 41 insertions(+)

diff --git a/spec/lib/pretty_text/helpers_spec.rb b/spec/lib/pretty_text/helpers_spec.rb
index d1c72183f6..74544d18ee 100644
--- a/spec/lib/pretty_text/helpers_spec.rb
+++ b/spec/lib/pretty_text/helpers_spec.rb
@@ -15,4 +15,35 @@ RSpec.describe PrettyText::Helpers do
       expect(result[short_url][:url]).to eq("https://awesome.com#{upload.url}")
     end
   end
+
+  describe ".category_tag_hashtag_lookup" do
+    fab!(:tag) { Fabricate(:tag, name: "somecooltag") }
+    fab!(:category) do
+      Fabricate(:category, name: "Some Awesome Category", slug: "someawesomecategory")
+    end
+
+    it "handles tags based on slug with TAG_HASHTAG_POSTFIX" do
+      expect(
+        PrettyText::Helpers.category_tag_hashtag_lookup(
+          +"somecooltag#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}",
+        ),
+      ).to eq([tag.url, "somecooltag"])
+    end
+
+    it "handles categories based on slug" do
+      expect(PrettyText::Helpers.category_tag_hashtag_lookup("someawesomecategory")).to eq(
+        [category.url, "someawesomecategory"],
+      )
+    end
+
+    it "handles tags based on slug without TAG_HASHTAG_POSTFIX" do
+      expect(PrettyText::Helpers.category_tag_hashtag_lookup(+"somecooltag")).to eq(
+        [tag.url, "somecooltag"],
+      )
+    end
+
+    it "returns nil when no tag or category that matches exists" do
+      expect(PrettyText::Helpers.category_tag_hashtag_lookup("blah")).to eq(nil)
+    end
+  end
 end
diff --git a/spec/requests/hashtags_controller_spec.rb b/spec/requests/hashtags_controller_spec.rb
index df6d4f8f36..a157e2a153 100644
--- a/spec/requests/hashtags_controller_spec.rb
+++ b/spec/requests/hashtags_controller_spec.rb
@@ -32,6 +32,16 @@ RSpec.describe HashtagsController do
           )
         end
 
+        it "handles tags with the TAG_HASHTAG_POSTFIX" do
+          get "/hashtags.json", params: { slugs: ["#{tag.name}#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}"] }
+
+          expect(response.status).to eq(200)
+          expect(response.parsed_body).to eq(
+            "categories" => {},
+            "tags" => { tag.name => tag.full_url }
+          )
+        end
+
         it "does not return restricted categories or hidden tags" do
           get "/hashtags.json", params: { slugs: [private_category.slug, hidden_tag.name] }
 

From 49abcf965bfc9fc8728a3919dbd820c5bf59617a Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 10 Oct 2022 17:19:18 -0600
Subject: [PATCH 095/332] FEATURE: Hide Privacy Policy and TOS topics (#18533)

* FEATURE: Hide Privacy Policy and TOS topics

As a way to simplify new sites this change will hide the privacy policy
and the TOS topics from the topic list. They can still be accessed and
edited though.

* add tests
---
 lib/topic_query.rb                    |  3 +++
 spec/requests/list_controller_spec.rb | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index ec75d18206..cc66f51178 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -438,6 +438,9 @@ class TopicQuery
 
     topics = topics.to_a
 
+    # These don't need to be shown in the topic list
+    topics = topics.reject { |t| [SiteSetting.privacy_topic_id, SiteSetting.tos_topic_id].include?(t[:id]) }
+
     if options[:preload_posters]
       user_ids = []
       topics.each do |ft|
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index f105b1e8b0..30e948f88b 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -79,6 +79,19 @@ RSpec.describe ListController do
       expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
 
+    it 'filters out privacy policy and tos topics' do
+      tos_topic = create_topic
+      SiteSetting.tos_topic_id = tos_topic.id
+
+      pp_topic = create_topic
+      SiteSetting.privacy_topic_id = pp_topic.id
+
+      get "/latest.json"
+      expect(response.status).to eq(200)
+      parsed = response.parsed_body
+      expect(parsed["topic_list"]["topics"].length).to eq(1)
+    end
+
     it "shows correct title if topic list is set for homepage" do
       get "/latest"
 

From b02ece0bbb0fbf13c42de84269368ee70eb80101 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 11 Oct 2022 10:27:06 +1100
Subject: [PATCH 096/332] FEATURE: double color for subcategories prefix
 (#18525)

Subcategories should display color from parent category and subcategory to clearly indicate that it is a subcategory.
---
 .../sidebar/anonymous/categories-section.hbs  |  1 +
 .../sidebar/section-link-prefix.hbs           |  8 +++-
 .../app/components/sidebar/section-link.hbs   |  1 +
 .../app/components/sidebar/section-link.js    | 11 ++++--
 .../sidebar/user/categories-section.hbs       |  1 +
 .../category-section-link.js                  | 10 +++--
 .../sidebar-user-categories-section-test.js   | 37 +++++++++++--------
 .../common/base/sidebar-section-link.scss     |  7 +++-
 8 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
index c59afa73c5..7b7ee5b749 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
@@ -13,6 +13,7 @@
       @model={{sectionLink.model}}
       @prefixType={{sectionLink.prefixType}}
       @prefixValue={{sectionLink.prefixValue}}
+      @prefixCSS={{sectionLink.prefixCSS}}
       @prefixColor={{sectionLink.prefixColor}} >
     </Sidebar::SectionLink>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
index 0e4d9600d3..ee41f1194a 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
@@ -1,5 +1,5 @@
-{{#if @prefixValue}}
-  <span class={{concat-class "sidebar-section-link-prefix" @prefixType @prefixCSSClass}} style={{@prefixCSS}}>
+{{#if @prefixType}}
+  <span class={{concat-class "sidebar-section-link-prefix" @prefixType @prefixCSSClass}} style={{html-safe (concat "color: " @prefixColor)}}>
     {{#if (eq @prefixType "image")}}
       <img src={{@prefixValue}} class="prefix-image">
     {{/if}}
@@ -14,6 +14,10 @@
       {{d-icon @prefixValue class="prefix-icon"}}
     {{/if}}
 
+    {{#if (eq @prefixType "span")}}
+      <span style={{@prefixCSS}} class="prefix-span"></span>
+    {{/if}}
+
     {{#if @prefixBadge}}
       {{d-icon @prefixBadge class="prefix-badge"}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
index 6392680354..dd172a122b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
@@ -29,6 +29,7 @@
           @prefixValue={{@prefixValue}}
           @prefixCSSClass={{@prefixCSSClass}}
           @prefixCSS={{this.prefixCSS}}
+          @prefixColor={{this.prefixColor}}
           @prefixBadge={{@prefixBadge}}
         />
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index 7b87c8f8e6..6155739c72 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { htmlSafe } from "@ember/template";
 
 export default class SectionLink extends Component {
   willDestroy() {
@@ -42,13 +41,17 @@ export default class SectionLink extends Component {
     return [];
   }
 
-  get prefixCSS() {
+  get prefixColor() {
     const color = this.args.prefixColor;
 
     if (!color || !color.match(/^\w{6}$/)) {
-      return htmlSafe("");
+      return "";
     }
 
-    return htmlSafe("color: #" + color);
+    return "#" + color;
+  }
+
+  get prefixCSS() {
+    return this.args.prefixCSS;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 8f3f605c10..2d40a98883 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -19,6 +19,7 @@
         @prefixBadge={{sectionLink.prefixBadge}}
         @prefixType={{sectionLink.prefixType}}
         @prefixValue={{sectionLink.prefixValue}}
+        @prefixCSS={{sectionLink.prefixCSS}}
         @prefixColor={{sectionLink.prefixColor}} >
       </Sidebar::SectionLink>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 3fc33ea2df..e7172d5f04 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -49,11 +49,15 @@ export default class CategorySectionLink {
   }
 
   get prefixType() {
-    return "icon";
+    return "span";
   }
 
-  get prefixValue() {
-    return "square-full";
+  get prefixCSS() {
+    if (this.category.parentCategory) {
+      return `background: linear-gradient(90deg, #${this.category.parentCategory.color} 50%, #${this.category.color} 50%)`;
+    } else {
+      return `background: #${this.category.color}`;
+    }
   }
 
   get prefixColor() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index e7e617893e..42a9959883 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -88,12 +88,18 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     const category1 = categories[0];
     const category2 = categories[1];
     const category3 = categories[5];
+    const category4 = categories[24];
 
     updateCurrentUser({
-      sidebar_category_ids: [category1.id, category2.id, category3.id],
+      sidebar_category_ids: [
+        category1.id,
+        category2.id,
+        category3.id,
+        category4.id,
+      ],
     });
 
-    return { category1, category2, category3 };
+    return { category1, category2, category3, category4 };
   };
 
   test("clicking on section header link", async function (assert) {
@@ -170,13 +176,14 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.deepEqual(
       categoryNames,
-      ["abc", "aBC", "efg"],
+      ["abc", "aBC", "efg", "Sub Category"],
       "category section links are displayed in the right order"
     );
   });
 
   test("category section links", async function (assert) {
-    const { category1, category2, category3 } = setupUserSidebarCategories();
+    const { category1, category2, category3, category4 } =
+      setupUserSidebarCategories();
 
     await visit("/");
 
@@ -184,22 +191,15 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       count(
         ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
       ),
-      3,
-      "there should only be 3 section link under the section"
+      4,
+      "there should only be 4 section link under the section"
     );
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .prefix-icon.d-icon-square-full`
+        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: #${category1.color}"]`
       ),
-      "category1 section link is rendered with right prefix icon"
-    );
-
-    assert.ok(
-      exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix[style="color: #${category1.color}"]`
-      ),
-      "category1 section link is rendered with right prefix icon color"
+      "category1 section link is rendered with solid prefix icon color"
     );
 
     assert.strictEqual(
@@ -252,6 +252,13 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       ),
       "category3 section link is rendered with lock prefix badge icon as it is read restricted"
     );
+
+    assert.ok(
+      exists(
+        `.sidebar-section-link-${category4.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category4.parentCategory.color} 50%, #${category4.color} 50%)"]`
+      ),
+      "sub category section link is rendered with double prefix color"
+    );
   });
 
   test("category section link have the right title", async function (assert) {
diff --git a/app/assets/stylesheets/common/base/sidebar-section-link.scss b/app/assets/stylesheets/common/base/sidebar-section-link.scss
index 0b27b80828..b885a50bee 100644
--- a/app/assets/stylesheets/common/base/sidebar-section-link.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section-link.scss
@@ -121,7 +121,8 @@
       }
     }
 
-    &.icon {
+    &.icon,
+    &.span {
       position: relative;
       color: var(--primary-medium);
 
@@ -142,6 +143,10 @@
         margin-right: -0.2em;
       }
     }
+    .prefix-span {
+      width: 0.9em;
+      height: 0.9em;
+    }
   }
 
   .sidebar-section-link-hover {

From 086f4775cd65b61be6fd90c57c5677f4ede904f3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 11 Oct 2022 10:13:53 +1000
Subject: [PATCH 097/332] FIX: Hide old PM settings (#18535)

Follow up to e62e93f83a77adfa80b38fbfecf82bbee14e12fe.
It's confusing and unexpected that deprecated settings
unconditionally change the new setting's value via the
`SiteSettingsController`, even if `override` was set to `false`,
a follow-up PR will correct the issue in `SiteSettingsController`.
---
 config/site_settings.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6ad7ebda53..dd44b19c0a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -820,6 +820,7 @@ posting:
   enable_personal_messages:
     default: true
     client: true
+    hidden: true
   enable_system_message_replies:
     default: true
   personal_message_enabled_groups:
@@ -1558,6 +1559,7 @@ trust:
   min_trust_to_send_messages:
     default: 1
     enum: "TrustLevelSetting"
+    hidden: true
   min_trust_to_send_email_messages:
     default: "4"
     enum: "TrustLevelAndStaffSetting"

From a7bdd0a58ed4130867a72479772dce81d00f3448 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 11 Oct 2022 08:45:22 +0800
Subject: [PATCH 098/332] PERF: Exclude anon sidebar tags in site serializer
 for logged in user (#18527)

This commits excludes the `anonymous_default_sidebar_tags` property in `SiteSerializer` when user
is not anonymous and when tagging has been disabled.
---
 app/models/user.rb                       |  2 ++
 app/serializers/site_serializer.rb       |  2 +-
 spec/serializers/site_serializer_spec.rb | 46 +++++++++++++++++++-----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 773d37777d..3539bd3739 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1682,10 +1682,12 @@ class User < ActiveRecord::Base
 
   def sidebar_tags
     return custom_sidebar_tags if custom_sidebar_tags.present?
+
     if SiteSetting.default_sidebar_tags.present?
       tag_names = SiteSetting.default_sidebar_tags.split("|") - DiscourseTagging.hidden_tag_names(guardian)
       return Tag.where(name: tag_names)
     end
+
     Tag.none
   end
 
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index fa396d1a62..c403767ffe 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -224,7 +224,7 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def include_anonymous_default_sidebar_tags?
-    SiteSetting.default_sidebar_tags.present?
+    scope.anonymous? && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
   end
 
   private
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 02d39afc69..4decff31b9 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -125,15 +125,45 @@ RSpec.describe SiteSerializer do
     expect(serialized[:show_welcome_topic_banner]).to eq(true)
   end
 
-  it 'includes anonymous_default_sidebar_tags' do
-    Fabricate(:tag, name: "dev")
-    Fabricate(:tag, name: "random")
-    serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-    expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+  describe '#anonymous_default_sidebar_tags' do
+    fab!(:user) { Fabricate(:user) }
 
-    SiteSetting.default_sidebar_tags = "dev|random"
-    serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-    expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
+    it 'is not included in the serialised object when tagging is not enabled' do
+      SiteSetting.tagging_enabled = false
+      guardian = Guardian.new(user)
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+    end
+
+    describe 'when tagging is enabled and default sidebar tags have been configured' do
+      fab!(:tag) { Fabricate(:tag, name: 'dev') }
+      fab!(:tag2) { Fabricate(:tag, name: 'random') }
+
+      before do
+        SiteSetting.tagging_enabled = true
+        SiteSetting.default_sidebar_tags = "#{tag.name}|#{tag2.name}"
+      end
+
+      it 'is not included in the serialised object when user is not anonymous' do
+        guardian = Guardian.new(user)
+
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+        expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      end
+
+      it 'is not included in the serialisd object when default sidebar tags have not been configured' do
+        SiteSetting.default_sidebar_tags = ""
+
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+        expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      end
+
+      it 'is included in the serialised object when user is anonymous' do
+        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+        expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
+      end
+    end
   end
 
   describe '#top_tags' do

From b6854c2f88c655afe95c4b79c5d14b9bca5d5cc4 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 11 Oct 2022 11:14:13 +1000
Subject: [PATCH 099/332] FIX: Deprecated settings should not override from UI
 (#18536)

Unless we have specified `override = true` in the DeprecatedSettings
class for an old -> new settings map, we should not allow people
to change the old setting in the UI and have it affect the new
setting.
---
 app/controllers/admin/site_settings_controller.rb    |  9 +++++++--
 spec/requests/admin/site_settings_controller_spec.rb | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 524b47827a..846f4953a5 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -18,8 +18,13 @@ class Admin::SiteSettingsController < Admin::AdminController
     value = params[id]
     value.strip! if value.is_a?(String)
 
-    new_setting_name = SiteSettings::DeprecatedSettings::SETTINGS.find do |old_name, new_name, _, _|
-      break new_name if old_name == id
+    new_setting_name = SiteSettings::DeprecatedSettings::SETTINGS.find do |old_name, new_name, override, _|
+      if old_name == id
+        if !override
+          raise Discourse::InvalidParameters, "You cannot change this site setting because it is deprecated, use #{new_name} instead."
+        end
+        break new_name
+      end
     end
     id = new_setting_name if new_setting_name
 
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 9759ac3045..c573a89701 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -52,6 +52,16 @@ RSpec.describe Admin::SiteSettingsController do
         expect(SiteSetting.search_tokenize_chinese).to eq(true)
       end
 
+      it 'throws an error when trying to change a deprecated setting with override = false' do
+        SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
+        put "/admin/site_settings/enable_personal_messages.json", params: {
+          enable_personal_messages: false
+        }
+
+        expect(response.status).to eq(422)
+        expect(SiteSetting.personal_message_enabled_groups).to eq(Group::AUTO_GROUPS[:trust_level_4])
+      end
+
       it 'allows value to be a blank string' do
         put "/admin/site_settings/test_setting.json", params: {
           test_setting: ''

From 472abe532efc7f23ec6f918954b492ebcdb9d594 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 11 Oct 2022 13:15:16 +1000
Subject: [PATCH 100/332] DEV: Add experimental setting for
 hashtag-autocomplete changes (#18537)

This initial PR just adds a enable_experimental_hashtag_autocomplete
setting, and related JS & HBR files, replacing direct setup of
the autocomplete within d-editor and instead using the new
lib/hashtag-autocomplete. This is the beginning of preparations
to allow other data sources to be added to this autocomplete,
as well as a redesign of the menu and rendered tags in the composer
preview and posts.
---
 .../discourse/app/components/d-editor.js      | 27 ++-------
 .../discourse/app/lib/hashtag-autocomplete.js | 58 +++++++++++++++++++
 .../app/templates/hashtag-autocomplete.hbr    | 13 +++++
 config/site_settings.yml                      |  4 ++
 4 files changed, 79 insertions(+), 23 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
 create mode 100644 app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index f6d800b06d..bb3fbbeb15 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -17,7 +17,7 @@ import I18n from "I18n";
 import ItsATrap from "@discourse/itsatrap";
 import { Promise } from "rsvp";
 import { SKIP } from "discourse/lib/autocomplete";
-import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
+import { setupHashtagAutocomplete } from "discourse/lib/hashtag-autocomplete";
 import deprecated from "discourse-common/lib/deprecated";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
@@ -28,7 +28,6 @@ import { linkSeenMentions } from "discourse/lib/link-mentions";
 import { loadOneboxes } from "discourse/lib/load-oneboxes";
 import loadScript from "discourse/lib/load-script";
 import { resolveCachedShortUrls } from "pretty-text/upload-short-url";
-import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import { inject as service } from "@ember/service";
 import showModal from "discourse/lib/show-modal";
 import { siteDir } from "discourse/lib/text-direction";
@@ -463,27 +462,9 @@ export default Component.extend(TextareaTextManipulation, {
   },
 
   _applyCategoryHashtagAutocomplete() {
-    const siteSettings = this.siteSettings;
-
-    this._$textarea.autocomplete({
-      template: findRawTemplate("category-tag-autocomplete"),
-      key: "#",
-      afterComplete: (value) => {
-        this.set("value", value);
-        schedule("afterRender", this, this.focusTextArea);
-      },
-      transformComplete: (obj) => {
-        return obj.text;
-      },
-      dataSource: (term) => {
-        if (term.match(/\s/)) {
-          return null;
-        }
-        return searchCategoryTag(term, siteSettings);
-      },
-      triggerRule: (textarea, opts) => {
-        return categoryHashtagTriggerRule(textarea, opts);
-      },
+    setupHashtagAutocomplete(this._$textarea, this.siteSettings, (value) => {
+      this.set("value", value);
+      schedule("afterRender", this, this.focusTextArea);
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
new file mode 100644
index 0000000000..eba9dcf0d6
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
@@ -0,0 +1,58 @@
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
+
+// TODO: (martin) Make a more generic version of these functions.
+import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
+import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
+
+export function setupHashtagAutocomplete(
+  $textArea,
+  siteSettings,
+  afterComplete
+) {
+  if (siteSettings.enable_experimental_hashtag_autocomplete) {
+    _setupExperimental($textArea, siteSettings, afterComplete);
+  } else {
+    _setup($textArea, siteSettings, afterComplete);
+  }
+}
+
+function _setupExperimental($textArea, siteSettings, afterComplete) {
+  $textArea.autocomplete({
+    template: findRawTemplate("hashtag-autocomplete"),
+    key: "#",
+    afterComplete,
+    treatAsTextarea: $textArea[0].tagName === "INPUT",
+    transformComplete: (obj) => {
+      return obj.text;
+    },
+    dataSource: (term) => {
+      if (term.match(/\s/)) {
+        return null;
+      }
+      return searchCategoryTag(term, siteSettings);
+    },
+    triggerRule: (textarea, opts) => {
+      return categoryHashtagTriggerRule(textarea, opts);
+    },
+  });
+}
+
+function _setup($textArea, siteSettings, afterComplete) {
+  $textArea.autocomplete({
+    template: findRawTemplate("category-tag-autocomplete"),
+    key: "#",
+    afterComplete,
+    transformComplete: (obj) => {
+      return obj.text;
+    },
+    dataSource: (term) => {
+      if (term.match(/\s/)) {
+        return null;
+      }
+      return searchCategoryTag(term, siteSettings);
+    },
+    triggerRule: (textarea, opts) => {
+      return categoryHashtagTriggerRule(textarea, opts);
+    },
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
new file mode 100644
index 0000000000..f1ddde7111
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
@@ -0,0 +1,13 @@
+<div class='autocomplete hashtag-autocomplete'>
+  <ul>
+    {{#each options as |option|}}
+      <li>
+        {{#if option.model}}
+          <a href>{{category-link option.model allowUncategorized="true" link="false"}}</a>
+        {{else}}
+          <a href>{{d-icon 'tag'}}{{option.name}} x {{option.count}}</a>
+        {{/if}}
+      </li>
+    {{/each}}
+  </ul>
+</div>
diff --git a/config/site_settings.yml b/config/site_settings.yml
index dd44b19c0a..8bccaafaf0 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2021,6 +2021,10 @@ developer:
   enable_experimental_sidebar_hamburger:
     default: false
     client: true
+  enable_experimental_hashtag_autocomplete:
+    default: false
+    client: true
+    hidden: true
   enable_sidebar:
     default: true
     client: true

From b75dc04a2549f130572dafd265ac064080fb5c30 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 11 Oct 2022 13:33:50 +0800
Subject: [PATCH 101/332] UX: Hide tags section from anonymous user when site
 has no tags (#18538)

If there are no top tags that an anonymous user can see and the site do
not have default sidebar tags configured for anonymous users, hide the
tag section entirely.
---
 .../sidebar/anonymous/tags-section.hbs        | 34 +++++-----
 .../sidebar/anonymous/tags-section.js         |  7 ++
 .../sidebar-anonymous-tags-section-test.js    | 64 ++++++++-----------
 3 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
index b8b339f7e2..b750e8d3c2 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
@@ -1,18 +1,20 @@
-<Sidebar::Section
-  @sectionName="tags"
-  @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
-  @collapsable={{@collapsable}} >
+{{#if this.displaySection}}
+  <Sidebar::Section
+    @sectionName="tags"
+    @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
+    @collapsable={{@collapsable}} >
 
-  {{#each this.sectionLinks as |sectionLink|}}
-    <Sidebar::SectionLink
-      @route={{sectionLink.route}}
-      @content={{sectionLink.text}}
-      @currentWhen={{sectionLink.currentWhen}}
-      @prefixType={{sectionLink.prefixType}}
-      @prefixValue={{sectionLink.prefixValue}}
-      @models={{sectionLink.models}} >
-    </Sidebar::SectionLink>
-  {{/each}}
+    {{#each this.sectionLinks as |sectionLink|}}
+      <Sidebar::SectionLink
+        @route={{sectionLink.route}}
+        @content={{sectionLink.text}}
+        @currentWhen={{sectionLink.currentWhen}}
+        @prefixType={{sectionLink.prefixType}}
+        @prefixValue={{sectionLink.prefixValue}}
+        @models={{sectionLink.models}} >
+      </Sidebar::SectionLink>
+    {{/each}}
 
-  <Sidebar::Common::AllTagsSectionLink />
-</Sidebar::Section>
+    <Sidebar::Common::AllTagsSectionLink />
+  </Sidebar::Section>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
index 0dc3804ba5..3a3596ad52 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
@@ -8,6 +8,13 @@ export default class SidebarAnonymousTagsSection extends Component {
   @service topicTrackingState;
   @service site;
 
+  get displaySection() {
+    return (
+      this.site.anonymous_default_sidebar_tags?.length > 0 ||
+      this.site.top_tags?.length > 0
+    );
+  }
+
   @cached
   get sectionLinks() {
     let tags;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js
index dc2ba51e56..09d805069b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js
@@ -5,6 +5,7 @@ import {
   exists,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
+import Site from "discourse/models/site";
 
 acceptance("Sidebar - Anonymous Tags Section", function (needs) {
   needs.settings({
@@ -18,12 +19,13 @@ acceptance("Sidebar - Anonymous Tags Section", function (needs) {
     top_tags: ["design", "development", "fun"],
   });
 
-  test("tag section links", async function (assert) {
+  test("tag section links when site has top tags", async function (assert) {
     await visit("/");
 
     const categories = queryAll(
       ".sidebar-section-tags .sidebar-section-link-wrapper"
     );
+
     assert.strictEqual(categories.length, 4);
     assert.strictEqual(categories[0].textContent.trim(), "design");
     assert.strictEqual(categories[1].textContent.trim(), "development");
@@ -34,22 +36,11 @@ acceptance("Sidebar - Anonymous Tags Section", function (needs) {
       "all tags link is visible"
     );
   });
-});
 
-acceptance("Sidebar - Anonymous Tags Section - default tags", function (needs) {
-  needs.settings({
-    enable_experimental_sidebar_hamburger: true,
-    enable_sidebar: true,
-    suppress_uncategorized_badge: false,
-    tagging_enabled: true,
-  });
+  test("tag section links when site has default sidebar tags configured", async function (assert) {
+    const site = Site.current();
+    site.set("anonymous_default_sidebar_tags", ["random", "meta"]);
 
-  needs.site({
-    top_tags: ["design", "development", "fun"],
-    anonymous_default_sidebar_tags: ["random", "meta"],
-  });
-
-  test("tag section links", async function (assert) {
     await visit("/");
 
     const categories = queryAll(
@@ -64,26 +55,25 @@ acceptance("Sidebar - Anonymous Tags Section - default tags", function (needs) {
       "all tags link is visible"
     );
   });
+
+  test("tag section is hidden when tagging is disabled", async function (assert) {
+    this.siteSettings.tagging_enabled = false;
+
+    await visit("/");
+
+    assert.ok(!exists(".sidebar-section-tags"), "section is not visible");
+  });
+
+  test("tag section is hidden when anonymous has no visible top tags and site has not default sidebar tags configured", async function (assert) {
+    const site = Site.current();
+
+    site.setProperties({
+      top_tags: [],
+      anonymous_default_sidebar_tags: [],
+    });
+
+    await visit("/");
+
+    assert.ok(!exists(".sidebar-section-tags"), "section is not visible");
+  });
 });
-
-acceptance(
-  "Sidebar - Anonymous Tags Section - Tagging disabled",
-  function (needs) {
-    needs.settings({
-      enable_experimental_sidebar_hamburger: true,
-      enable_sidebar: true,
-      suppress_uncategorized_badge: false,
-      tagging_enabled: false,
-    });
-
-    needs.site({
-      top_tags: ["design", "development", "fun"],
-    });
-
-    test("tag section links", async function (assert) {
-      await visit("/");
-
-      assert.ok(!exists(".sidebar-section-tags"), "section is not visible");
-    });
-  }
-);

From a10a81244c0625c434b830817d254079c598120e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 11 Oct 2022 11:20:18 +0100
Subject: [PATCH 102/332] FIX: Ensure poll type toggle buttons function
 correctly (#18540)

Followup to 03b7b7d1bc7c978c280e441a610a5ef5c049c60c
---
 .../javascripts/controllers/poll-ui-builder.js  |  2 +-
 .../templates/modal/poll-ui-builder.hbs         |  6 +++---
 .../acceptance/poll-builder-enabled-test.js     | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
index 5b4f34f446..ad199be1a3 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
@@ -402,6 +402,6 @@ export default Controller.extend(ModalFunctionality, {
   @action
   updatePollType(pollType, event) {
     event?.preventDefault();
-    this.pollType = pollType;
+    this.set("pollType", pollType);
   },
 });
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index e2f24afa90..360c691e57 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,15 +1,15 @@
 <DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
   <div class="input-group poll-type">
-    <a href {{on "click" (fn this.updatePollType "regular")}} class="poll-type-value {{if this.isRegular "active"}}">
+    <a href {{on "click" (fn this.updatePollType "regular")}} class="poll-type-value poll-type-value-regular {{if this.isRegular "active"}}">
       {{i18n "poll.ui_builder.poll_type.regular"}}
     </a>
 
-    <a href {{on "click" (fn this.updatePollType "multiple")}} class="poll-type-value {{if this.isMultiple "active"}}">
+    <a href {{on "click" (fn this.updatePollType "multiple")}} class="poll-type-value poll-type-value-multiple {{if this.isMultiple "active"}}">
       {{i18n "poll.ui_builder.poll_type.multiple"}}
     </a>
 
     {{#if this.showNumber}}
-      <a href {{on "click" (fn this.updatePollType "number")}} class="poll-type-value {{if this.isNumber "active"}}">
+      <a href {{on "click" (fn this.updatePollType "number")}} class="poll-type-value poll-type-value-number {{if this.isNumber "active"}}">
         {{i18n "poll.ui_builder.poll_type.number"}}
       </a>
     {{/if}}
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js
index 3321e07c6d..8b86665f96 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js
@@ -3,6 +3,7 @@ import {
   exists,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click } from "@ember/test-helpers";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
 import { test } from "qunit";
@@ -24,6 +25,22 @@ acceptance("Poll Builder - polls are enabled", function (needs) {
       exists(".select-kit-row[data-value='showPollBuilder']"),
       "it shows the builder button"
     );
+
+    await click(".select-kit-row[data-value='showPollBuilder']");
+    assert.true(
+      exists(".poll-type-value-regular.active"),
+      "regular type is active"
+    );
+    await click(".poll-type-value-multiple");
+    assert.true(
+      exists(".poll-type-value-multiple.active"),
+      "multiple type is active"
+    );
+    await click(".poll-type-value-regular");
+    assert.true(
+      exists(".poll-type-value-regular.active"),
+      "regular type is active"
+    );
   });
 
   test("regular user - insufficient trust level", async function (assert) {

From 36f7fbebdca41279fbff3829c28b887c5ce1a7ea Mon Sep 17 00:00:00 2001
From: Jacob Michalskie <hel@lcp.world>
Date: Tue, 11 Oct 2022 12:25:13 +0200
Subject: [PATCH 103/332] DEV: Allow ManagedAuthenticator classes to match by
 username (#18517)

---
 lib/auth/managed_authenticator.rb           | 22 +++++++
 spec/lib/auth/managed_authenticator_spec.rb | 72 +++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/lib/auth/managed_authenticator.rb b/lib/auth/managed_authenticator.rb
index f42fe72012..5530f5bc6b 100644
--- a/lib/auth/managed_authenticator.rb
+++ b/lib/auth/managed_authenticator.rb
@@ -24,6 +24,11 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
     true
   end
 
+  # Depending on the authenticator, this could be insecure, so it's disabled by default
+  def match_by_username
+    false
+  end
+
   def primary_email_verified?(auth_token)
     # Omniauth providers should only provide verified emails in the :info hash.
     # This method allows additional checks to be added
@@ -67,6 +72,16 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
       association.user = user
     end
 
+    # Matching an account by username
+    if match_by_username &&
+        association.user.nil? &&
+        SiteSetting.username_change_period.zero? &&
+        (user = find_user_by_username(auth_token))
+
+      UserAssociatedAccount.where(user: user, provider_name: auth_token[:provider]).destroy_all # Destroy existing associations for the new user
+      association.user = user
+    end
+
     # Update all the metadata in the association:
     association.info = auth_token[:info] || {}
     association.credentials = auth_token[:credentials] || {}
@@ -122,6 +137,13 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
     end
   end
 
+  def find_user_by_username(auth_token)
+    username = auth_token.dig(:info, :nickname)
+    if username
+      User.find_by_username(username)
+    end
+  end
+
   def retrieve_avatar(user, url)
     return unless user && url
     return if user.user_avatar.try(:custom_upload_id).present?
diff --git a/spec/lib/auth/managed_authenticator_spec.rb b/spec/lib/auth/managed_authenticator_spec.rb
index e279ebf048..02faefcd73 100644
--- a/spec/lib/auth/managed_authenticator_spec.rb
+++ b/spec/lib/auth/managed_authenticator_spec.rb
@@ -254,6 +254,78 @@ RSpec.describe Auth::ManagedAuthenticator do
         expect(user.user_profile.location).to eq("DiscourseVille")
       end
     end
+
+    describe 'match by username' do
+      let(:user_match_authenticator) {
+        Class.new(described_class) do
+          def name
+            "myauth"
+          end
+          def match_by_email
+            false
+          end
+          def match_by_username
+            true
+          end
+        end.new
+      }
+
+      it 'works normally' do
+        SiteSetting.username_change_period = 0
+        user = Fabricate(:user)
+        result = user_match_authenticator.after_authenticate(hash.deep_merge(info: { nickname: user.username }))
+        expect(result.user.id).to eq(user.id)
+        expect(UserAssociatedAccount.find_by(provider_name: 'myauth', provider_uid: "1234").user_id).to eq(user.id)
+      end
+
+      it 'works if there is already an association with the target account' do
+        SiteSetting.username_change_period = 0
+        user = Fabricate(:user, username: "IAmGroot")
+        result = user_match_authenticator.after_authenticate(hash)
+        expect(result.user.id).to eq(user.id)
+      end
+
+      it 'works if the username is different case' do
+        SiteSetting.username_change_period = 0
+        user = Fabricate(:user, username: "IAMGROOT")
+        result = user_match_authenticator.after_authenticate(hash)
+        expect(result.user.id).to eq(user.id)
+      end
+
+      it 'does not match if username_change_period isn\'t 0' do
+        SiteSetting.username_change_period = 3
+        user = Fabricate(:user, username: "IAmGroot")
+        result = user_match_authenticator.after_authenticate(hash)
+        expect(result.user).to eq(nil)
+      end
+
+      it 'does not match if default match_by_username not overriden' do
+        SiteSetting.username_change_period = 0
+        authenticator = Class.new(described_class) do
+          def name
+            "myauth"
+          end
+        end.new
+        user = Fabricate(:user, username: "IAmGroot")
+        result = authenticator.after_authenticate(hash)
+        expect(result.user).to eq(nil)
+      end
+
+      it 'does not match if match_by_username is false' do
+        SiteSetting.username_change_period = 0
+        authenticator = Class.new(described_class) do
+          def name
+            "myauth"
+          end
+          def match_by_username
+            false
+          end
+        end.new
+        user = Fabricate(:user, username: "IAmGroot")
+        result = authenticator.after_authenticate(hash)
+        expect(result.user).to eq(nil)
+      end
+    end
   end
 
   describe 'description_for_user' do

From a0eb8092f072f35dd52d9779ccbde02a13d10123 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 11 Oct 2022 11:25:32 +0100
Subject: [PATCH 104/332] FIX: Ensure local date format shortcuts work
 correctly (#18541)

Followup to 03b7b7d1bc7c978c280e441a610a5ef5c049c60c
---
 .../components/discourse-local-dates-create-form.js   |  2 +-
 .../acceptance/local-dates-composer-test.js           | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 426f2ab4d6..3a880d715d 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -309,7 +309,7 @@ export default Component.extend({
   @action
   updateFormat(format, event) {
     event?.preventDefault();
-    this.format = format;
+    this.set("format", format);
   },
 
   actions: {
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
index 354e242752..3c4855cb61 100644
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
@@ -9,7 +9,10 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Local Dates - composer", function (needs) {
   needs.user();
-  needs.settings({ discourse_local_dates_enabled: true });
+  needs.settings({
+    discourse_local_dates_enabled: true,
+    discourse_local_dates_default_formats: "LLL|LTS|LL|LLLL",
+  });
 
   test("composer bbcode", async function (assert) {
     const getAttr = (attr) => {
@@ -121,5 +124,11 @@ acceptance("Local Dates - composer", function (needs) {
       query(".pika-table .is-selected"),
       "deleting selected TO date works"
     );
+
+    await click(".advanced-mode-btn");
+
+    assert.strictEqual(query("input.format-input").value, "");
+    await click("ul.formats a.moment-format");
+    assert.strictEqual(query("input.format-input").value, "LLL");
   });
 });

From f3e956a7a3818d0807e57c877a533168c11835bf Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 11 Oct 2022 12:17:36 +0100
Subject: [PATCH 105/332] FIX: Staff action log 'show details' links (#18542)

Followup to 03b7b7d1bc7c978c280e441a610a5ef5c049c60c
---
 .../admin-logs-staff-action-logs.js           | 22 +++++++++++++++++++
 .../routes/admin-logs-staff-action-logs.js    | 12 ----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index a8a297d47c..11e5324bd6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -5,6 +5,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import { scheduleOnce } from "@ember/runloop";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   queryParams: ["filters"],
@@ -147,4 +148,25 @@ export default Controller.extend({
   loadMore() {
     this.model.loadMore();
   },
+
+  @action
+  showDetailsModal(model, event) {
+    event?.preventDefault();
+    showModal("admin-staff-action-log-details", {
+      model,
+      admin: true,
+      modalClass: "log-details-modal",
+    });
+  },
+
+  @action
+  showCustomDetailsModal(model, event) {
+    event?.preventDefault();
+    let modal = showModal("admin-theme-change", {
+      model,
+      admin: true,
+      modalClass: "history-modal",
+    });
+    modal.loadDiff();
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
index f643d41e18..c00f1e135c 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
@@ -1,6 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
-import showModal from "discourse/lib/show-modal";
 
 export default DiscourseRoute.extend({
   queryParams: {
@@ -43,17 +42,6 @@ export default DiscourseRoute.extend({
   },
 
   actions: {
-    showDetailsModal(model) {
-      showModal("admin-staff-action-log-details", { model, admin: true });
-      this.controllerFor("modal").set("modalClass", "log-details-modal");
-    },
-
-    showCustomDetailsModal(model) {
-      let modal = showModal("admin-theme-change", { model, admin: true });
-      this.controllerFor("modal").set("modalClass", "history-modal");
-      modal.loadDiff();
-    },
-
     onFiltersChange(filters) {
       if (filters && Object.keys(filters) === 0) {
         this.transitionTo("adminLogs.staffActionLogs");

From f7db4150dadc90b8b8ebab22f151d9ae14c03704 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Tue, 11 Oct 2022 10:29:04 -0400
Subject: [PATCH 106/332] Update translations (#18543)

---
 config/locales/client.ar.yml    |  6 ++++--
 config/locales/client.be.yml    |  5 +++--
 config/locales/client.bg.yml    |  6 ++++--
 config/locales/client.bs_BA.yml |  6 ++++--
 config/locales/client.ca.yml    |  6 ++++--
 config/locales/client.cs.yml    |  6 ++++--
 config/locales/client.da.yml    |  6 ++++--
 config/locales/client.de.yml    | 10 ++++++++--
 config/locales/client.el.yml    |  6 ++++--
 config/locales/client.es.yml    | 24 ++++++++++++++++++++++--
 config/locales/client.et.yml    |  6 ++++--
 config/locales/client.fa_IR.yml | 10 ++++++++--
 config/locales/client.fi.yml    |  6 ++++--
 config/locales/client.fr.yml    |  6 ++++--
 config/locales/client.gl.yml    |  6 ++++--
 config/locales/client.he.yml    | 10 ++++++++--
 config/locales/client.hr.yml    |  6 ++++--
 config/locales/client.hu.yml    |  6 ++++--
 config/locales/client.hy.yml    |  6 ++++--
 config/locales/client.id.yml    |  5 ++++-
 config/locales/client.it.yml    |  6 ++++--
 config/locales/client.ja.yml    |  6 ++++--
 config/locales/client.ko.yml    |  6 ++++--
 config/locales/client.lt.yml    |  6 ++++--
 config/locales/client.lv.yml    |  6 ++++--
 config/locales/client.nb_NO.yml |  6 ++++--
 config/locales/client.nl.yml    |  6 ++++--
 config/locales/client.pl_PL.yml |  6 ++++--
 config/locales/client.pt.yml    |  6 ++++--
 config/locales/client.pt_BR.yml |  6 ++++--
 config/locales/client.ro.yml    |  6 ++++--
 config/locales/client.ru.yml    | 14 ++++++++++----
 config/locales/client.sk.yml    |  6 ++++--
 config/locales/client.sl.yml    |  6 ++++--
 config/locales/client.sq.yml    |  5 +++--
 config/locales/client.sr.yml    |  5 +++--
 config/locales/client.sv.yml    | 10 ++++++++--
 config/locales/client.sw.yml    |  4 +++-
 config/locales/client.te.yml    |  3 ++-
 config/locales/client.th.yml    |  6 ++++--
 config/locales/client.tr_TR.yml | 14 ++++++++++++--
 config/locales/client.uk.yml    |  6 ++++--
 config/locales/client.ur.yml    |  6 ++++--
 config/locales/client.vi.yml    |  6 ++++--
 config/locales/client.zh_CN.yml | 14 ++++++++++----
 config/locales/client.zh_TW.yml |  6 ++++--
 config/locales/server.ar.yml    |  9 ---------
 config/locales/server.bg.yml    |  1 -
 config/locales/server.bs_BA.yml |  1 -
 config/locales/server.ca.yml    |  2 --
 config/locales/server.de.yml    | 15 +++++++++++----
 config/locales/server.el.yml    |  1 -
 config/locales/server.es.yml    |  9 ---------
 config/locales/server.fa_IR.yml |  1 -
 config/locales/server.fi.yml    |  9 ---------
 config/locales/server.fr.yml    |  9 ---------
 config/locales/server.gl.yml    |  9 ---------
 config/locales/server.he.yml    | 11 ++---------
 config/locales/server.hu.yml    |  1 -
 config/locales/server.hy.yml    |  9 ---------
 config/locales/server.it.yml    |  2 --
 config/locales/server.ja.yml    |  9 ---------
 config/locales/server.ko.yml    |  9 ---------
 config/locales/server.nl.yml    |  9 ---------
 config/locales/server.pl_PL.yml |  9 ---------
 config/locales/server.pt.yml    |  1 -
 config/locales/server.pt_BR.yml |  9 ---------
 config/locales/server.ro.yml    |  1 -
 config/locales/server.ru.yml    | 17 ++++++++++++-----
 config/locales/server.sk.yml    |  1 -
 config/locales/server.sl.yml    |  9 ---------
 config/locales/server.sq.yml    |  1 -
 config/locales/server.sv.yml    | 27 +++++++++++++++++++++++++--
 config/locales/server.sw.yml    |  1 -
 config/locales/server.tr_TR.yml | 21 ++++++++++-----------
 config/locales/server.uk.yml    |  1 -
 config/locales/server.ur.yml    |  9 ---------
 config/locales/server.vi.yml    |  9 ---------
 config/locales/server.zh_CN.yml | 19 +++++++++++++++----
 config/locales/server.zh_TW.yml |  9 ---------
 80 files changed, 307 insertions(+), 278 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index e133872fca..7653c7b44c 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -302,6 +302,7 @@ ar:
     ok_value: "حسنًا"
     cancel_value: "إلغاء"
     submit: "إرسال"
+    delete: "حذف"
     generic_error: "عذرًا، حدث خطأ."
     generic_error_with_reason: "حدث خطأ: %{error}"
     sign_up: "الاشتراك"
@@ -1961,6 +1962,8 @@ ar:
       leave_message: "هل تريد حقًا مغادرة هذه الرسالة؟"
       remove_allowed_user: "هل تريد حقًا إزالة %{name} من هذه الرسالة؟"
       remove_allowed_group: "هل تريد حقًا إزالة %{name} من هذه الرسالة؟"
+      leave: "مغادرة"
+      remove_user: "إزالة مستخدم"
     email: "البريد الإلكتروني"
     username: "اسم المستخدم"
     last_seen: "آخر ظهور"
@@ -4159,7 +4162,6 @@ ar:
       tag_list_joiner: "، "
       delete_unused: "حذف الوسوم غير المستخدمة"
       delete_unused_description: "حذف جميع الوسوم غير المرتبطة بأي موضوعات أو رسائل خاصة"
-      cancel_delete_unused: "إلغاء"
       filters:
         without_category: "%{filter} موضوعات %{tag}"
         with_category: "موضوعات ‏%{filter} التي تحمل الوسم %{tag} في الفئة %{category}"
@@ -4286,7 +4288,7 @@ ar:
         few: "%{count} جديد"
         many: "%{count} جديدًا"
         other: "%{count} جديدة"
-      more: "المزيد..."
+      more: "المزيد"
       all_categories: "كل الفئات"
       sections:
         about:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 6b70c28a2b..dcd8ee2968 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -95,6 +95,7 @@ be:
     ok_value: "Добра"
     cancel_value: "адмяніць"
     submit: "Адправіць"
+    delete: "выдаляць"
     generic_error: "Выбачайце, здарылася памылка."
     generic_error_with_reason: "Паўстала памылка: %{error}"
     sign_up: "Рэгістрацыя"
@@ -728,6 +729,7 @@ be:
       disable: "Паказаць выдаленыя паведамленні"
     private_message_info:
       title: "Паказаць выдаленыя паведамленні..."
+      remove_user: "выдаліць карыстальніка"
     email: "Электронная пошта"
     username: "Імя карыстальніка"
     last_seen: "заўважаны апошні раз"
@@ -1314,7 +1316,6 @@ be:
       sort_by: "Сартаваць па:"
       sort_by_count: "падлічваць"
       sort_by_name: "Імя"
-      cancel_delete_unused: "адмяніць"
       notifications:
         watching:
           title: "Сачыць"
@@ -1346,7 +1347,7 @@ be:
         regular: "рэгулярны"
         leader: "лідэр"
     sidebar:
-      more: "Яшчэ ..."
+      more: "Больш"
       all_categories: "Усе катэгорыі"
       sections:
         about:
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 16a818da9b..7cf7a89261 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -200,6 +200,7 @@ bg:
     ok_value: "Ок"
     cancel_value: "Прекрати"
     submit: "Изпрати"
+    delete: "Изтрий"
     generic_error: "Съжаляваме, възникна грешка."
     generic_error_with_reason: "Грешка: %{error}"
     sign_up: "Регистрация"
@@ -1606,6 +1607,8 @@ bg:
       leave_message: "Сигурни ли сте, че искате да оставите това съобщение?"
       remove_allowed_user: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
       remove_allowed_group: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
+      leave: "Напусни"
+      remove_user: "Премахни потребител"
     email: "Имейл"
     username: "Потребителско име"
     last_seen: "Видяно"
@@ -2940,7 +2943,6 @@ bg:
       sort_by_count: "брой"
       sort_by_name: "име"
       manage_groups_description: "Дефинирай групи за организране на етикетите"
-      cancel_delete_unused: "Отмени"
       filters:
         without_category: "%{filter} %{tag} теми"
       notifications:
@@ -2998,7 +3000,7 @@ bg:
       new_count:
         one: "%{count} нов"
         other: "%{count} нови"
-      more: "Още..."
+      more: "Повече"
       all_categories: "Всички категории"
       sections:
         about:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index faa364b12e..e18a4e38e9 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -215,6 +215,7 @@ bs_BA:
     ok_value: "OK"
     cancel_value: "Odustani"
     submit: "Potvrdi"
+    delete: "Delete"
     generic_error: "Uff, došlo je do greške."
     generic_error_with_reason: "Došlo je do greške: %{error}"
     sign_up: "Učlani se"
@@ -1491,6 +1492,8 @@ bs_BA:
       leave_message: "Da li zaista želite da napustite ovu poruku?"
       remove_allowed_user: "Da li zaista želite da uklonite %{name} sa ove privatne poruke?"
       remove_allowed_group: "Da li zaista želite da uklonite %{name} sa ove poruke?"
+      leave: "Napusti"
+      remove_user: "Ukloni korisnika"
     email: "Email"
     username: "Ime"
     last_seen: "Viđen"
@@ -3003,7 +3006,6 @@ bs_BA:
       delete_no_unused_tags: "Nema neiskorištenih oznaka."
       delete_unused: "Brisanje neiskorištenih oznaka"
       delete_unused_description: "Izbrišite sve oznake koje nisu vezane za teme ili lične poruke"
-      cancel_delete_unused: "Odustani"
       filters:
         without_category: "%{filter} %{tag} topics"
         with_category: "%{filter} %{tag} teme ove kategorije %{category}"
@@ -3080,7 +3082,7 @@ bs_BA:
         one: "%{count} novi"
         few: "%{count} nova"
         other: "%{count} novih"
-      more: "Više..."
+      more: "Još"
       all_categories: "Sve kategorije"
       sections:
         about:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 2cae2caf73..f4535ad6d3 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -203,6 +203,7 @@ ca:
     ok_value: "D'acord"
     cancel_value: "Cancel·la"
     submit: "Envia"
+    delete: "Suprimeix"
     generic_error: "Ho sentim, s'ha produït un error."
     generic_error_with_reason: "Hi ha hagut un error: %{error}"
     sign_up: "Registre"
@@ -1419,6 +1420,8 @@ ca:
       leave_message: "Realment voleu deixar aquest missatge?"
       remove_allowed_user: "De debò voleu eliminar %{name} d'aquest missatge?"
       remove_allowed_group: "De debò voleu eliminar %{name} d'aquest missatge?"
+      leave: "Abandona"
+      remove_user: "Elimina usuari"
     email: "Correu electrònic"
     username: "Nom d'usuari"
     last_seen: "Vist"
@@ -2825,7 +2828,6 @@ ca:
         other: "%{tags} i %{count} més"
       delete_unused: "Suprimeix etiquetes no utilitzades"
       delete_unused_description: "Suprimeix totes les etiquetes que no estiguin lligades a cap tema o missatge personal"
-      cancel_delete_unused: "Cancel·la"
       filters:
         without_category: "%{filter} %{tag} temes"
         with_category: "%{filter} %{tag} temes en %{category}"
@@ -2898,7 +2900,7 @@ ca:
       new_count:
         one: "%{count} nou"
         other: "%{count} nous"
-      more: "Més..."
+      more: "Més"
       all_categories: "Totes les categories"
       sections:
         about:
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index c5633763e1..220fe1ca51 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -250,6 +250,7 @@ cs:
     ok_value: "OK"
     cancel_value: "Zrušit"
     submit: "Odeslat"
+    delete: "Smazat"
     generic_error: "Bohužel nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
     sign_up: "Registrace"
@@ -1441,6 +1442,8 @@ cs:
       leave_message: "Opravdu chcete opustit tuto zprávu?"
       remove_allowed_user: "Určitě chcete odstranit %{name} z této zprávy?"
       remove_allowed_group: "Opravdu chcete odstranit %{name} z této zprávy?"
+      leave: "Opustit skupinu"
+      remove_user: "Odebrat uživatele"
     email: "Email"
     username: "Uživatelské jméno"
     last_seen: "Naposledy viděn"
@@ -2811,7 +2814,6 @@ cs:
       upload: "Nahrát tagy"
       upload_instructions: "Jeden na řádek, případně se skupinou tagů ve formátu 'jméno_tagu,skupina_tagu'."
       upload_successful: "Tagy úspěšně nahrány"
-      cancel_delete_unused: "Zrušit"
       filters:
         without_category: "%{filter} %{tag} témata"
         with_category: "%{filter} %{tag} témata v %{category}"
@@ -2887,7 +2889,7 @@ cs:
         few: "%{count} nová"
         many: "%{count} nových"
         other: "%{count} nové"
-      more: "Více..."
+      more: "Více"
       all_categories: "Všechny kategorie"
       sections:
         about:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index aa6a5cb7f2..1b22d0d63e 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -205,6 +205,7 @@ da:
     ok_value: "OK"
     cancel_value: "Annuller"
     submit: "Udfør"
+    delete: "Slet"
     generic_error: "Beklager, der opstod en fejl."
     generic_error_with_reason: "Der opstod en fejl: %{error}"
     sign_up: "Tilmeld"
@@ -1676,6 +1677,8 @@ da:
       leave_message: "Vil du virkelig forlade denne besked?"
       remove_allowed_user: "Ønsker du virkelig at fjerne %{name} fra denne besked?"
       remove_allowed_group: "Er du sikker på du vil fjerne %{name} fra denne besked?"
+      leave: "Forlad"
+      remove_user: "Fjern bruger"
     email: "E-mail"
     username: "Brugernavn"
     last_seen: "Sidst set"
@@ -3445,7 +3448,6 @@ da:
       tag_list_joiner: ", "
       delete_unused: "Slet Ubrugte Mærker"
       delete_unused_description: "Slet alle mærker, der ikke er knyttet til nogen emner eller personlige beskeder"
-      cancel_delete_unused: "Annuller"
       filters:
         without_category: "%{filter} %{tag} emner"
         with_category: "%{filter} %{tag} emner i %{category}"
@@ -3562,7 +3564,7 @@ da:
       new_count:
         one: "%{count} ny"
         other: "%{count} nye"
-      more: "Mere..."
+      more: "Flere"
       all_categories: "Alle kategorier"
       sections:
         about:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 7d71cfe274..e6eb6e605f 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -229,6 +229,7 @@ de:
     ok_value: "OK"
     cancel_value: "Abbrechen"
     submit: "Absenden"
+    delete: "Löschen"
     generic_error: "Entschuldigung, ein Fehler ist aufgetreten."
     generic_error_with_reason: "Ein Fehler ist aufgetreten: %{error}"
     sign_up: "Registrieren"
@@ -969,6 +970,7 @@ de:
     user_fields:
       none: "(wähle eine Option aus)"
       required: 'Bitte gib einen Wert für „%{name}“ ein'
+      same_as_password: 'Dein Passwort sollte nicht in anderen Feldern wiederholt werden.'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -1745,6 +1747,9 @@ de:
       leave_message: "Möchtest du diese Unterhaltung wirklich verlassen?"
       remove_allowed_user: "Willst du %{name} wirklich aus dieser Nachricht entfernen?"
       remove_allowed_group: "Willst du %{name} wirklich aus dieser Nachricht entfernen?"
+      leave: "Verlassen"
+      remove_group: "Gruppe entfernen"
+      remove_user: "Benutzer entfernen"
     email: "E-Mail-Adresse"
     username: "Benutzername"
     last_seen: "Zuletzt gesehen"
@@ -1976,6 +1981,7 @@ de:
       edit_conflict: "Konflikt bearbeiten"
       esc: "esc"
       esc_label: "Klicken oder Esc drücken, um zu schließen"
+      ok_proceed: "Ok, weiter"
       group_mentioned_limit:
         one: "<b>Warnung!</b> Du erwähnst <a href='%{group_link}'>%{group}</a>, jedoch übersteigt die Mitgliederzahl der Gruppe das vom Administrator konfigurierte Erwähnungslimit von %{count} Benutzer. Deshalb wird niemand benachrichtigt."
         other: "<b>Warnung!</b> Du erwähnst <a href='%{group_link}'>%{group}</a>, jedoch übersteigt die Mitgliederzahl der Gruppe das vom Administrator konfigurierte Erwähnungslimit von %{count} Benutzern. Deshalb wird niemand benachrichtigt."
@@ -3162,6 +3168,7 @@ de:
       name: "Name der Kategorie"
       description: "Beschreibung"
       logo: "Logo für Kategorie"
+      logo_dark: "Logobild der Kategorie „Dunkelmodus“."
       background_image: "Hintergrundbild für Kategorie"
       badge_colors: "Farben des Abzeichens"
       background_color: "Hintergrundfarbe"
@@ -3688,7 +3695,6 @@ de:
       tag_list_joiner: ", "
       delete_unused: "Nicht verwendete Schlagwörter löschen"
       delete_unused_description: "Alle Schlagwörter löschen, die keinem Thema und keiner Nachricht zugeordnet sind."
-      cancel_delete_unused: "Abbrechen"
       filters:
         without_category: "%{filter} %{tag} Themen"
         with_category: "%{filter} %{tag} Themen in %{category}"
@@ -3815,7 +3821,7 @@ de:
         one: "%{count} neue"
         other: "%{count} neue"
       toggle_section: "Abschnitt umschalten"
-      more: "Mehr …"
+      more: "Mehr"
       all_categories: "Alle Kategorien"
       all_tags: "Alle Schlagwörter"
       sections:
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index fb81c20d34..3d2e9a192f 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -193,6 +193,7 @@ el:
     ok_value: "OK"
     cancel_value: "Ακύρωση"
     submit: "Υποβολή"
+    delete: "Σβήσιμο"
     generic_error: "Λυπάμαι, προέκυψε κάποιο σφάλμα."
     generic_error_with_reason: "Προέκυψε ένα σφάλμα: %{error}"
     sign_up: "Εγγραφή"
@@ -1445,6 +1446,8 @@ el:
       leave_message: "Σίγουρα θελετε να αφήσετε αυτό το μήνυμα;"
       remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτή τη συζήτηση;"
       remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτό το μήνυμα;"
+      leave: "Αποχώρηση"
+      remove_user: "Αφαίρεση χρήστη"
     email: "Email"
     username: "Όνομα Χρήστη"
     last_seen: "Εθεάθη"
@@ -2989,7 +2992,6 @@ el:
       delete_no_unused_tags: "Δεν υπάρχουν αχρησιμοποίητες ετικέτες."
       delete_unused: "Διαγραφή αχρησιμοποίητων ετικετών"
       delete_unused_description: "Διαγράψτε όλες τις ετικέτες που δεν επισυνάπτονται σε θέματα ή προσωπικά μηνύματα"
-      cancel_delete_unused: "Άκυρο"
       filters:
         without_category: "%{filter} %{tag} νήματα"
         with_category: "%{filter} %{tag} νήματα στην %{category}"
@@ -3070,7 +3072,7 @@ el:
       new_count:
         one: "%{count} νέο"
         other: "%{count} νέα"
-      more: "Περισσότερα..."
+      more: "Περισσότερα"
       all_categories: "Όλες οι κατηγορίες"
       sections:
         about:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index c9a916e0ee..7e8ec888fc 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -229,6 +229,7 @@ es:
     ok_value: "Aceptar"
     cancel_value: "Cancelar"
     submit: "Enviar"
+    delete: "Eliminar"
     generic_error: "Lo sentimos, ha ocurrido un error."
     generic_error_with_reason: "Ha ocurrido un error: %{error}"
     sign_up: "Registrarse"
@@ -1742,6 +1743,9 @@ es:
       leave_message: "¿Quieres abandonar este mensaje?"
       remove_allowed_user: "¿Quieres quitar a %{name} de este mensaje?"
       remove_allowed_group: "¿Quieres quitar a %{name} de este mensaje?"
+      leave: "Abandonar"
+      remove_group: "Quitar grupo"
+      remove_user: "Eliminar usuario"
     email: "Correo electrónico"
     username: "Nombre de usuario"
     last_seen: "Visto por última vez"
@@ -1971,6 +1975,9 @@ es:
       similar_topics: "Tu tema es similar a..."
       drafts_offline: "borradores sin conexión"
       edit_conflict: "conflicto de edición"
+      esc: "esc"
+      esc_label: "Haz clic o pulsa escape para cerrar"
+      ok_proceed: "Vale, continuar"
       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."
         other: "<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} usuarios) de una vez. No se notificará a nadie."
@@ -2073,6 +2080,9 @@ es:
         body: "¡Vas a enviarte este mensaje solo a ti mismo!"
       slow_mode:
         error: "Este tema está en modo lento. Hace poco que has publicado, pero podrás volver a hacerlo en %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "<b>%{usernames}</b> (la persona a la que le estás mandando un mensaje) hace tiempo que no se pasa por aquí – %{time_ago}. Puede que no reciba tu mensaje. Igual es mejor que busques otro método alternativo para contactar a %{usernames}."
+        multiple: "Las siguientes personas: <b>%{usernames}</b> hace tiempo que no se pasan por aquí – %{time_ago}. Puede que no reciban tu mensaje. Igual es mejor que busques otro método alternativo para contactarles."
       admin_options_title: "Configuración opcional del personal para este tema"
       composer_actions:
         reply: Responder
@@ -2170,6 +2180,9 @@ es:
           bookmarks:
             one: "¿Seguro? Tienes %{count} recordatorio de marcadores sin leer."
             other: "¿Seguro? Tienes %{count} recordatorios de marcadores sin leer."
+          messages:
+            one: "¿Seguro? Tienes %{count} mensaje personal sin leer."
+            other: "¿Seguro? Tienes %{count} mensajes personales sin leer."
         dismiss: "Descartar"
         cancel: "Cancelar"
       group_message_summary:
@@ -2361,7 +2374,14 @@ es:
           one: "Respuestas - %{count} sin leer"
           other: "Respuestas - %{count} sin leer"
         mentions: "Menciones"
+        mentions_with_unread:
+          one: "Menciones - %{count} mención sin leer"
+          other: "Menciones - %{count} menciones sin leer"
         likes: "Me gusta dados"
+        likes_with_unread:
+          one: "Me gusta - %{count} me gusta sin leer"
+          other: "Me gusta - %{count} me gusta sin leer"
+        messages: "Mensajes personales"
         bookmarks: "Marcadores"
         review_queue: "Cola de revisión"
         other_notifications: "Otras notificaciones"
@@ -3649,7 +3669,6 @@ es:
       tag_list_joiner: ", "
       delete_unused: "Eliminar etiquetas sin usar"
       delete_unused_description: "Eliminar todas las etiquetas que no estén asociadas a ningún tema o mensaje personal"
-      cancel_delete_unused: "Cancelar"
       filters:
         without_category: "%{filter} %{tag} temas"
         with_category: "%{filter} %{tag} temas en %{category}"
@@ -3775,7 +3794,7 @@ es:
         one: "%{count} nuevo"
         other: "%{count} nuevos"
       toggle_section: "mostrar/ocultar sección"
-      more: "Más..."
+      more: "Más"
       all_categories: "Todas las categorías"
       all_tags: "Todas las etiquetas"
       sections:
@@ -3835,6 +3854,7 @@ es:
             review:
               content: "Revisión"
               title: "revisión"
+              pending_count: "%{count} pendiente(s)"
     welcome_topic_banner:
       title: "Crea tu tema de bienvenida"
       description: 'Tu tema de bienvenid es lo primero que la gente nueva leerá al llegar. Piensa en este párrafo como si fuera un "discurso breve" o una "declaración de motivos"'
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index b97bc737e5..23c27d787a 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -182,6 +182,7 @@ et:
     ok_value: "OK"
     cancel_value: "Tühista"
     submit: "Saada"
+    delete: "Kustuta"
     generic_error: "Vabandust, tekkis viga."
     generic_error_with_reason: "Tekkis viga: %{error}"
     sign_up: "Liitu"
@@ -1225,6 +1226,8 @@ et:
       title: "Sõnum"
       remove_allowed_user: "Kas soovid tõesti %{name} sellest sõnumist eemaldada?"
       remove_allowed_group: "Kas soovid tõesti %{name} sellest sõnumist eemaldada?"
+      leave: "Lahku"
+      remove_user: "Eemalda kasutaja"
     email: "Meiliaadress"
     username: "Kasutajanimi"
     last_seen: "Vaadatud"
@@ -2471,7 +2474,6 @@ et:
       sort_by_name: "nimi"
       manage_groups: "Halda siltide gruppe"
       manage_groups_description: "Määra siltide organiseerimiseks grupid"
-      cancel_delete_unused: "Tühista"
       filters:
         without_category: "%{filter} %{tag} teemat"
         with_category: "%{filter} %{tag} teemat %{category} foorumis"
@@ -2540,7 +2542,7 @@ et:
       new_count:
         one: "%{count} uus"
         other: "%{count} uut"
-      more: "Veel..."
+      more: "Veel"
       all_categories: "Kõik foorumid"
       sections:
         about:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index e30c29a203..7e79d83511 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -204,6 +204,7 @@ fa_IR:
     ok_value: "تایید"
     cancel_value: "انصراف"
     submit: "ارسال"
+    delete: "حذف"
     generic_error: "متأسفیم، خطایی روی داده."
     generic_error_with_reason: "خطایی روی داد: %{error}"
     sign_up: "ثبت نام"
@@ -908,6 +909,7 @@ fa_IR:
       copied: "کپی شده"
     user_fields:
       none: "(یک گزینه انتخاب کنید)"
+      same_as_password: 'رمز عبور شما نباید در قسمت‌های دیگر تکرار شود.'
     user:
       said: "%{username}:"
       profile: "نمایه"
@@ -1614,6 +1616,9 @@ fa_IR:
       leave_message: "واقعا میخواهید این پیام را ترک کنید؟"
       remove_allowed_user: "آیا واقعا می خواهید اسم %{name} از پیام برداشته شود ؟ "
       remove_allowed_group: "آیا از حذف %{name} از این پیام اطمینان دارید؟"
+      leave: "ترک کردن"
+      remove_group: "حذف گروه"
+      remove_user: "حذف کاربر"
     email: "ایمیل"
     username: "نام‌کاربری"
     last_seen: "مشاهده شد"
@@ -1833,6 +1838,7 @@ fa_IR:
       similar_topics: "موضوع شما شبیه است به..."
       drafts_offline: "پیش‌نویس‌های آفلاین"
       edit_conflict: "ویرایش تناقض"
+      ok_proceed: "باشه، ادامه دهید"
       group_mentioned:
         one: "با اشاره به %{group}، به <a href='%{group_link}'>%{count} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
         other: "با اشاره به %{group}، به <a href='%{group_link}'>%{count} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
@@ -2780,6 +2786,7 @@ fa_IR:
       name: "نام دسته‌بندی"
       description: "توضیحات"
       logo: "تصویر لوگو برای دسته‌بندی"
+      logo_dark: "حالت تیره دسته‌بندی تصویر لوگو"
       background_image: "تصویر پس‌زمینه برای دسته‌بندی"
       badge_colors: "رنگ نشان‌ها"
       background_color: "رنگ پس‌زمینه"
@@ -3205,7 +3212,6 @@ fa_IR:
       tag_list_joiner: "، "
       delete_unused: "پاک کردن برچسب های استفاده نشده"
       delete_unused_description: "پاک کردن همه ی برچسب هایی که به هیچ مبحث یا پیامی تعلق ندارند"
-      cancel_delete_unused: "لغو کردن"
       filters:
         without_category: "%{filter} %{tag} موضوعات"
         with_category: "%{filter} %{tag} موضوعات در %{category}"
@@ -3295,7 +3301,7 @@ fa_IR:
         one: "%{count} تازه"
         other: "%{count} تازه"
       toggle_section: "تغییر بخش"
-      more: "بیشتر..."
+      more: "بیشتر"
       all_categories: "همه‌ی دسته‌بندی‌ها"
       all_tags: "همه برچسب‌ها"
       sections:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 074728fcd4..0e6440cd9d 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -199,6 +199,7 @@ fi:
     ok_value: "OK"
     cancel_value: "Peruuta"
     submit: "Lähetä"
+    delete: "Poista"
     generic_error: "On tapahtunut virhe."
     generic_error_with_reason: "Tapahtui virhe: %{error}"
     sign_up: "Rekisteröidy"
@@ -1651,6 +1652,8 @@ fi:
       leave_message: "Haluatko varmasti poistua tästä viestistä?"
       remove_allowed_user: "Haluatko varmasti poistaa käyttäjän %{name} tästä viestistä?"
       remove_allowed_group: "Haluatko varmasti poistaa käyttäjän %{name} tästä viestistä?"
+      leave: "Poistu"
+      remove_user: "Poista käyttäjä"
     email: "Sähköposti"
     username: "Käyttäjätunnus"
     last_seen: "Nähty"
@@ -3369,7 +3372,6 @@ fi:
       tag_list_joiner: ", "
       delete_unused: "Poista käyttämättömät tunnisteet"
       delete_unused_description: "Poista kaikki tunnisteet, joita ei ole liitetty ketjuihin tai yksityisviesteihin"
-      cancel_delete_unused: "Peruuta"
       filters:
         without_category: "%{filter} %{tag} ketjut"
         with_category: "%{filter} %{tag} ketjut alueella %{category}"
@@ -3467,7 +3469,7 @@ fi:
       new_count:
         one: "%{count} uusi"
         other: "%{count} uutta"
-      more: "Lisää..."
+      more: "Lisää"
       all_categories: "Kaikki alueet"
       sections:
         about:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 8951186479..8a8e75670c 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -229,6 +229,7 @@ fr:
     ok_value: "OK"
     cancel_value: "Annuler"
     submit: "Envoyer"
+    delete: "Supprimer"
     generic_error: "Nous sommes désolés, une erreur est survenue."
     generic_error_with_reason: "Une erreur est survenue : %{error}"
     sign_up: "S'inscrire"
@@ -1742,6 +1743,8 @@ fr:
       leave_message: "Voulez-vous vraiment quitter cette conversation ?"
       remove_allowed_user: "Voulez-vous vraiment supprimer %{name} de ce message direct ?"
       remove_allowed_group: "Voulez-vous vraiment supprimer %{name} de ce message direct ?"
+      leave: "Quitter"
+      remove_user: "Supprimer l'utilisateur"
     email: "Courriel"
     username: "Nom d'utilisateur"
     last_seen: "Vu"
@@ -3650,7 +3653,6 @@ fr:
       tag_list_joiner: ", "
       delete_unused: "Supprimer les étiquettes inutilisées"
       delete_unused_description: "Supprimer toutes les étiquettes qui ne sont pas associées à des sujets ou messages directs"
-      cancel_delete_unused: "Annuler"
       filters:
         without_category: "%{filter} %{tag} sujets"
         with_category: "%{filter} %{tag} sujets dans %{category}"
@@ -3772,7 +3774,7 @@ fr:
       new_count:
         one: "%{count} nouveau"
         other: "%{count} nouveaux"
-      more: "Plus…"
+      more: "Plus"
       all_categories: "Toutes les catégories"
       all_tags: "Toutes les étiquettes"
       sections:
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index c7d51de282..b9a510dafd 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -198,6 +198,7 @@ gl:
     ok_value: "De acordo"
     cancel_value: "Cancelar"
     submit: "Enviar"
+    delete: "Eliminar"
     generic_error: "Sentímolo pero produciuse un erro."
     generic_error_with_reason: "Produciuse un erro: %{error}"
     sign_up: "Crear unha conta"
@@ -1594,6 +1595,8 @@ gl:
       leave_message: "Confirma o abandono desta mensaxe?"
       remove_allowed_user: "Confirma que quere retirar a %{name} desta mensaxe?"
       remove_allowed_group: "Confirma que quere retirar a %{name} desta mensaxe?"
+      leave: "Abandonar"
+      remove_user: "Retirar usuario"
     email: "Correo electrónico"
     username: "Nome de usuario"
     last_seen: "Visto"
@@ -3272,7 +3275,6 @@ gl:
       tag_list_joiner: ", "
       delete_unused: "Eliminar etiquetas sen usar"
       delete_unused_description: "Eliminar todas as etiquetas que non estean asociadas a ningún tema ou mensaxe privada"
-      cancel_delete_unused: "Cancelar"
       filters:
         without_category: "%{filter} %{tag} temas"
         with_category: "%{filter}%{tag} temas en %{category}"
@@ -3358,7 +3360,7 @@ gl:
       new_count:
         one: "%{count} novo"
         other: "%{count} novos"
-      more: "Máis..."
+      more: "Máis"
       all_categories: "Todas as categorías"
       sections:
         about:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index f2f17a997b..154ace24d0 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -287,6 +287,7 @@ he:
     ok_value: "או קיי"
     cancel_value: "ביטול"
     submit: "הגשה"
+    delete: "מחיקה"
     generic_error: "ארעה שגיאה, עמך הסליחה."
     generic_error_with_reason: "ארעה שגיאה: %{error}"
     sign_up: "הרשמה"
@@ -1083,6 +1084,7 @@ he:
     user_fields:
       none: "(יש לבחור אפשרות)"
       required: 'נא למלא ערך עבור „%{name}”'
+      same_as_password: 'אין לחזור על הסיסמה שלך בשדות אחרים.'
     user:
       said: "%{username}:"
       profile: "פרופיל"
@@ -1891,6 +1893,9 @@ he:
       leave_message: "האם אתה באמת רוצה לעזוב את ההודעה הזו?"
       remove_allowed_user: "להסיר את %{name} מהודעה זו?"
       remove_allowed_group: "להסיר את %{name} מהודעה זו?"
+      leave: "עזוב"
+      remove_group: "הסרת קבוצה"
+      remove_user: "הסרת משתמש/ת"
     email: "דוא״ל"
     username: "שם משתמש"
     last_seen: "נצפה"
@@ -2134,6 +2139,7 @@ he:
       edit_conflict: "עריכת סתירה"
       esc: "esc"
       esc_label: "יש ללחוץ עם העכבר או על Esc כדי להתעלם"
+      ok_proceed: "בסדר, להמשיך"
       group_mentioned_limit:
         one: "<b>זהירות!</b> ציינת את <a href='%{group_link}'>%{group}</a>, אך בקבוצה זו יש יותר חברים מההגבלה שהוגדרה על ידי הנהלת המערכת של עד משתמש %{count}. אף אחד לא יקבל הודעה."
         two: "<b>זהירות!</b> ציינת את <a href='%{group_link}'>%{group}</a>, אך בקבוצה זו יש יותר חברים מההגבלה שהוגדרה על ידי הנהלת המערכת של עד %{count} משתמשים. אף אחד לא יקבל הודעה."
@@ -3428,6 +3434,7 @@ he:
       name: "שם הקטגוריה"
       description: "תיאור"
       logo: "תמונת לוגו לקטגוריה"
+      logo_dark: "תמונת לוגו של קטגוריה במצב כהה"
       background_image: "תמונת רקע לקטגוריה"
       badge_colors: "צבעי העיטורים"
       background_color: "צבע רקע"
@@ -4008,7 +4015,6 @@ he:
       tag_list_joiner: ", "
       delete_unused: "מחיקת תגיות שאינן בשימוש"
       delete_unused_description: "למחוק את כל התגיות שאינן מקושרות לנושאים או להודעות פרטיות כלל"
-      cancel_delete_unused: "ביטול"
       filters:
         without_category: "%{filter} %{tag} נושאים"
         with_category: "%{filter} %{tag} נושאים ב%{category}"
@@ -4139,7 +4145,7 @@ he:
         many: "חדש (%{count})"
         other: "חדש (%{count})"
       toggle_section: "החלפת מצב הצגת סעיף"
-      more: "עוד…"
+      more: "עוד"
       all_categories: "כל הקטגוריות"
       all_tags: "כל התגיות"
       sections:
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index b2d1feb868..031f6691a0 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -257,6 +257,7 @@ hr:
     ok_value: "U redu"
     cancel_value: "Odustani"
     submit: "Pošalji"
+    delete: "Pobriši"
     generic_error: "Dogodila se greška, ispričavamo se."
     generic_error_with_reason: "Dogodila se greška: %{error}"
     sign_up: "Učlani se"
@@ -1803,6 +1804,8 @@ hr:
       leave_message: "Želite li zaista ostaviti ovu poruku?"
       remove_allowed_user: "Želite li zaista ukloniti %{name} iz ove poruke?"
       remove_allowed_group: "Želite li zaista ukloniti %{name} iz ove poruke?"
+      leave: "Napustiti"
+      remove_user: "Ukloni korisnika"
     email: "E-mail"
     username: "Korisničko ime"
     last_seen: "Viđeno"
@@ -3772,7 +3775,6 @@ hr:
       tag_list_joiner: ", "
       delete_unused: "Izbriši neiskorištene oznake"
       delete_unused_description: "Izbrišite sve tagove koji nisu dodijeljeni niti jednoj temi ili privatnoj poruci."
-      cancel_delete_unused: "Odustani"
       filters:
         without_category: "%{filter} %{tag} teme"
         with_category: "%{filter} %{tag} tema u %{category}"
@@ -3896,7 +3898,7 @@ hr:
         one: "%{count} novi"
         few: "%{count} novih"
         other: "%{count} novi"
-      more: "Više..."
+      more: "Više"
       all_categories: "Sve kategorije"
       sections:
         about:
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 38275b9bda..d002927456 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -229,6 +229,7 @@ hu:
     ok_value: "Rendben"
     cancel_value: "Mégse"
     submit: "Beküldés"
+    delete: "Törlés"
     generic_error: "Sajnos hiba történt."
     generic_error_with_reason: "Hiba történt: %{error}"
     sign_up: "Regisztráció"
@@ -1731,6 +1732,8 @@ hu:
       leave_message: "Biztos, hogy elhagyja a beszélgetést?"
       remove_allowed_user: "Biztos, hogy eltávolítja a következőt ebből az üzenetből: %{name}?"
       remove_allowed_group: "Biztos, hogy eltávolítja a következőt ebből az üzenetből: %{name}?"
+      leave: "Elhagyás"
+      remove_user: "Felhasználó eltávolítása"
     email: "E-mail"
     username: "Felhasználónév"
     last_seen: "Látva"
@@ -3331,7 +3334,6 @@ hu:
       sort_by_count: "besorol"
       sort_by_name: "név"
       manage_groups: "Címke csoport kezelése"
-      cancel_delete_unused: "Visszavon"
       filters:
         without_category: "%{filter} %{tag} Témák"
         with_category: "%{filter} %{tag} Témák a %{category}"
@@ -3404,7 +3406,7 @@ hu:
       new_count:
         one: "%{count} új"
         other: "%{count} új"
-      more: "Továbbiak..."
+      more: "Több"
       all_categories: "Minden kategória"
       sections:
         about:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 477505b7ed..6966d7fe2d 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -189,6 +189,7 @@ hy:
     ok_value: "ՕԿ"
     cancel_value: "Չեղարկել"
     submit: "Հաստատել"
+    delete: "Ջնջել"
     generic_error: "Տեղի է ունեցել սխալ, ներողություն:"
     generic_error_with_reason: "Տեղի է ունեցել սխալ՝ %{error}"
     sign_up: "Գրանցվել"
@@ -1338,6 +1339,8 @@ hy:
       leave_message: "Դուք իսկապե՞ս ցանկանում եք թողնել այս հաղորդագրությունը:"
       remove_allowed_user: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
       remove_allowed_group: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
+      leave: "Լքել"
+      remove_user: "Հեռացնել օգտատիրոջը"
     email: "Էլ. հասցե"
     username: "Օգտանուն"
     last_seen: "Ակտիվ էր"
@@ -2809,7 +2812,6 @@ hy:
         other: "%{tags} և ևս %{count}"
       delete_unused: "Ջնջել Չօգտագործված Թեգերը"
       delete_unused_description: "Ջնջել բոլոր թեգերը, որոնք կցված չեն որևէ թեմայի կամ անձնական հաղորդագրության"
-      cancel_delete_unused: "Չեղարկել"
       filters:
         without_category: "%{filter} %{tag} թեմա"
         with_category: "%{filter} %{tag} թեմա %{category}-ում"
@@ -2881,7 +2883,7 @@ hy:
       new_count:
         one: "%{count} նոր"
         other: "%{count} նոր"
-      more: "Ավելին..."
+      more: "Ավելին"
       all_categories: "Բոլոր կատեգորիաները"
       sections:
         about:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index bba1c9703d..29086beaa9 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -198,6 +198,7 @@ id:
     ok_value: "OK"
     cancel_value: "Batal"
     submit: "Kirimkan"
+    delete: "Hapus"
     generic_error: "Maaf, terjadi kesalahan."
     generic_error_with_reason: "Terjadi kesalahan: %{error}"
     sign_up: "Daftar"
@@ -1303,6 +1304,8 @@ id:
       leave_message: "Apakah Anda yakin ingin meninggalkan pesan ini?"
       remove_allowed_user: "Apakah Anda yakin ingin menghapus %{name} dari pesan ini?"
       remove_allowed_group: "Apakah Anda yakin ingin menghapus %{name} dari pesan ini?"
+      leave: "Keluar"
+      remove_user: "Hapus pengguna"
     email: "Surel"
     username: "Nama Pengguna"
     last_seen: "Terlihat"
@@ -1763,7 +1766,6 @@ id:
       add_synonyms: "Menambahkan"
       sort_by_count: "menghitung"
       sort_by_name: "nama"
-      cancel_delete_unused: "Batal"
       filters:
         without_category: "%{filter} %{tag} topik"
         with_category: "%{filter} %{tag} topik dalam %{category}"
@@ -1799,6 +1801,7 @@ id:
     sidebar:
       new_count:
         other: "%{count} baru"
+      more: "Selengkapnya"
       sections:
         about:
           header_link_text: "Tentang"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 69514e68b3..1ec2d9e7b1 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -228,6 +228,7 @@ it:
     ok_value: "OK"
     cancel_value: "Annulla"
     submit: "Invia"
+    delete: "Cancella"
     generic_error: "Spiacenti, c'è stato un errore."
     generic_error_with_reason: "Si è verificato un errore: %{error}"
     sign_up: "Iscriviti"
@@ -1739,6 +1740,8 @@ it:
       leave_message: "Vuoi veramente abbandonare questo messaggio?"
       remove_allowed_user: "Vuoi davvero rimuovere %{name} da questo messaggio?"
       remove_allowed_group: "Vuoi davvero rimuovere %{name} da questo messaggio?"
+      leave: "Abbandona"
+      remove_user: "Rimuovi utente"
     email: "Email"
     username: "Nome utente"
     last_seen: "Ultima visita"
@@ -3634,7 +3637,6 @@ it:
       tag_list_joiner: ", "
       delete_unused: "Elimina Etichette Inutilizzate"
       delete_unused_description: "Elimina tutte le etichette che non sono usate in alcun argomento o messaggio personale"
-      cancel_delete_unused: "Annulla"
       filters:
         without_category: "%{filter} %{tag} argomenti"
         with_category: "%{filter} %{tag} argomenti in %{category}"
@@ -3760,7 +3762,7 @@ it:
         one: "%{count} nuovo"
         other: "%{count} nuovi"
       toggle_section: "inverti sezione"
-      more: "Altro..."
+      more: "Altro"
       all_categories: "Tutte le categorie"
       sections:
         about:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index c5cfc6a957..1c09e691dc 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -188,6 +188,7 @@ ja:
     ok_value: "OK"
     cancel_value: "キャンセル"
     submit: "送信"
+    delete: "削除"
     generic_error: "申し訳ありません。エラーが発生しました。"
     generic_error_with_reason: "エラーが発生しました: %{error}"
     sign_up: "アカウントを登録"
@@ -1623,6 +1624,8 @@ ja:
       leave_message: "このメッセージを閉じてもよろしいですか？"
       remove_allowed_user: "このメッセージから %{name} を削除してもよろしいですか？"
       remove_allowed_group: "このメッセージから %{name} を削除してもよろしいですか？"
+      leave: "退出"
+      remove_user: "ユーザーを削除"
     email: "メール"
     username: "ユーザー名"
     last_seen: "アクセス"
@@ -3304,7 +3307,6 @@ ja:
       tag_list_joiner: "、"
       delete_unused: "未使用のタグを削除"
       delete_unused_description: "どのトピックまたは個人メッセージにも添付されていないすべてのタグを削除します"
-      cancel_delete_unused: "キャンセル"
       filters:
         without_category: "%{filter} %{tag} トピック"
         with_category: "%{filter} %{category} の %{tag} 件のトピック"
@@ -3402,7 +3404,7 @@ ja:
         other: "未読 %{count}"
       new_count:
         other: "新規 %{count}"
-      more: "もっと..."
+      more: "もっと"
       all_categories: "すべてのカテゴリ"
       sections:
         about:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 53ae3209fd..5b49c86f0f 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -184,6 +184,7 @@ ko:
     ok_value: "확인"
     cancel_value: "취소"
     submit: "확인"
+    delete: "삭제하기"
     generic_error: "죄송합니다. 오류가 발생했습니다."
     generic_error_with_reason: "오류가 발생했습니다. %{error}"
     sign_up: "회원가입"
@@ -1622,6 +1623,8 @@ ko:
       leave_message: "이 메시지를 남길까요?"
       remove_allowed_user: "%{name} 님을 메시지에서 제거할까요?"
       remove_allowed_group: "%{name} 님을 메시지에서 제거할까요?"
+      leave: "나가기"
+      remove_user: "사용자 삭제"
     email: "이메일"
     username: "사용자명"
     last_seen: "마지막 접속"
@@ -3352,7 +3355,6 @@ ko:
       tag_list_joiner: ", "
       delete_unused: "사용하지 않은 태그 삭제"
       delete_unused_description: "주제 또는 개인 메시지에 첨부되지 않은 모든 태그 삭제"
-      cancel_delete_unused: "취소"
       filters:
         without_category: "%{filter} %{tag} 주제"
         with_category: "%{category}의 %{filter} %{tag} 주제"
@@ -3464,7 +3466,7 @@ ko:
         other: "%{count} unread"
       new_count:
         other: "%{count} new"
-      more: "더 보기..."
+      more: "더 보기"
       all_categories: "모든 카테고리"
       all_tags: "모든 태그"
       sections:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 181a56d1e1..1ec923cca9 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -247,6 +247,7 @@ lt:
     ok_value: "OK"
     cancel_value: "Atšaukti"
     submit: "Pateikti"
+    delete: "Pašalinti"
     generic_error: "Atsiprašome, įvyko klaida."
     generic_error_with_reason: "Įvyko klaida: %{error}"
     sign_up: "Registruotis"
@@ -1641,6 +1642,8 @@ lt:
       leave_message: "Ar tikrai norite palikti šį pranešimą?"
       remove_allowed_user: "Ar tikrai nori pašalinti %{name} iš šios žinutės?"
       remove_allowed_group: "Ar tikrai norite pašalinti %{name} iš šios žinutės?"
+      leave: "Palikti"
+      remove_user: "Pašalinti narį"
     email: "El. paštas"
     username: "Vartotojo vardas"
     last_seen: "Matytas"
@@ -3389,7 +3392,6 @@ lt:
       tag_list_joiner: ", "
       delete_unused: "Ištrinkite nepanaudotas žymas"
       delete_unused_description: "Ištrinkite visas žymas, nepriskirtas prie jokių temų ar asmeninių pranešimų"
-      cancel_delete_unused: "Atšaukti"
       filters:
         without_category: "%{filter}%{tag} temos"
         with_category: "%{filter}%{tag}temos, %{category}kategorijoje"
@@ -3510,7 +3512,7 @@ lt:
         few: "%{count} nauji"
         many: "%{count} nauja"
         other: "%{count} nauja"
-      more: "Daugiau..."
+      more: "Daugiau"
       all_categories: "Visos kategorijos"
       sections:
         about:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index c81ba54aed..a40ea0daa3 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -206,6 +206,7 @@ lv:
     ok_value: "Labi"
     cancel_value: "Atcelt"
     submit: "Iesniegt"
+    delete: "Dzēst"
     generic_error: "Atvainojiet, ir notikusi kļūda."
     generic_error_with_reason: "Notikusi kļūda: %{error}"
     sign_up: "Reģistrēties"
@@ -1543,6 +1544,8 @@ lv:
       leave_message: "Vai tiešām vēlaties atstāt šo ziņu?"
       remove_allowed_user: "Vai jūs tiešām gribat dzēst %{name} no šīs ziņas?"
       remove_allowed_group: "Vai jūs tiešām gribat dzēst %{name} no šīs ziņas?"
+      leave: "Iziet"
+      remove_user: "Noņemt lietotāju"
     email: "E-pasts"
     username: "Lietotājvārds"
     last_seen: "Redzēts"
@@ -2752,7 +2755,6 @@ lv:
       sort_by_name: "vārda"
       manage_groups: "Pārvaldīt tagu grupas"
       manage_groups_description: "Izveidot grupas, lai organizētu tagus"
-      cancel_delete_unused: "Atcelt"
       filters:
         without_category: "%{filter} %{tag} tēmas"
         with_category: "%{filter} %{tag} tēmas sadaļā %{category}"
@@ -2816,7 +2818,7 @@ lv:
         zero: "%{count} jaunas"
         one: "%{count} jauna"
         other: "%{count} jauna"
-      more: "Vairāk..."
+      more: "Vairāk"
       all_categories: "Visas sadaļas"
       sections:
         about:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 212dd97141..526524b912 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -200,6 +200,7 @@ nb_NO:
     ok_value: "OK"
     cancel_value: "Avbryt"
     submit: "Utfør"
+    delete: "Slett"
     generic_error: "Beklager, det har oppstått en feil."
     generic_error_with_reason: "Det oppstod et problem: %{error}"
     sign_up: "Registrer deg"
@@ -1637,6 +1638,8 @@ nb_NO:
       leave_message: "Ønsker du virkelig å legge igjen denne meldingen?"
       remove_allowed_user: "Er du sikker på at du vil fjerne %{name} fra denne meldingen?"
       remove_allowed_group: "Vil du virkelig fjerne %{name} fra denne meldingen?"
+      leave: "Forlat"
+      remove_user: "Slett bruker"
     email: "E-post"
     username: "Brukernavn"
     last_seen: "Sett"
@@ -3323,7 +3326,6 @@ nb_NO:
       tag_list_joiner: ", "
       delete_unused: "Slett ubrukte stikkord"
       delete_unused_description: "Slett alle tagger som ikke er knyttet til noen emner eller personlige meldinger"
-      cancel_delete_unused: "Avbryt"
       filters:
         without_category: "%{filter} %{tag} emner"
         with_category: "%{filter} %{tag} emner i %{category}"
@@ -3425,7 +3427,7 @@ nb_NO:
       new_count:
         one: "%{count} ny"
         other: "%{count} nye"
-      more: "Mer…"
+      more: "Mer"
       all_categories: "Alle kategorier"
       sections:
         about:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index d2b7c9c648..38457846d0 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -202,6 +202,7 @@ nl:
     ok_value: "OK"
     cancel_value: "Annuleren"
     submit: "Versturen"
+    delete: "Verwijderen"
     generic_error: "Sorry, er is iets fout gegaan."
     generic_error_with_reason: "Er is iets fout gegaan: %{error}"
     sign_up: "Registreren"
@@ -1646,6 +1647,8 @@ nl:
       leave_message: "Weet u zeker dat u dit bericht wilt verlaten?"
       remove_allowed_user: "Wilt u %{name} echt uit dit bericht verwijderen?"
       remove_allowed_group: "Wilt u %{name} echt uit dit bericht verwijderen?"
+      leave: "Verlaten"
+      remove_user: "Gebruiker verwijderen"
     email: "E-mailadres"
     username: "Gebruikersnaam"
     last_seen: "Gezien"
@@ -3396,7 +3399,6 @@ nl:
       tag_list_joiner: ", "
       delete_unused: "Ongebruikte tags verwijderen"
       delete_unused_description: "Alle tags verwijderen die niet aan topics of persoonlijke berichten zijn gekoppeld"
-      cancel_delete_unused: "Annuleren"
       filters:
         without_category: "%{filter} %{tag} topics"
         with_category: "%{filter} %{tag} topics in %{category}"
@@ -3497,7 +3499,7 @@ nl:
       new_count:
         one: "%{count} nieuw"
         other: "%{count} nieuw"
-      more: "Meer..."
+      more: "Meer"
       all_categories: "Alle categorieën"
       sections:
         about:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 98fd595382..a791733e56 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -287,6 +287,7 @@ pl_PL:
     ok_value: "OK"
     cancel_value: "Anuluj"
     submit: "Prześlij"
+    delete: "Usuń"
     generic_error: "Przepraszamy, wystąpił błąd."
     generic_error_with_reason: "Wystąpił błąd: %{error}"
     sign_up: "Rejestracja"
@@ -1883,6 +1884,8 @@ pl_PL:
       leave_message: "Czy naprawdę chcesz zostawić tę wiadomość?"
       remove_allowed_user: "Czy naprawdę chcesz usunąć %{name} z tej dyskusji?"
       remove_allowed_group: "Czy naprawdę chcesz usunąć %{name} z tej wiadomości?"
+      leave: "Opuść"
+      remove_user: "Usuń użytkownika"
     email: "Email"
     username: "Nazwa konta"
     last_seen: "Ostatnio oglądane"
@@ -3965,7 +3968,6 @@ pl_PL:
       tag_list_joiner: ", "
       delete_unused: "Usuń nieużywane tagi"
       delete_unused_description: "Usuń wszystkie tagi, które nie są dołączone do żadnych wątków ani wiadomości."
-      cancel_delete_unused: "Anuluj"
       filters:
         without_category: "%{filter} %{tag} tematy"
         with_category: "%{filter} %{tag} tematy w %{category}"
@@ -4093,7 +4095,7 @@ pl_PL:
         many: "%{count} nowych"
         other: "%{count} nowy"
       toggle_section: "przełącz sekcję"
-      more: "Więcej…"
+      more: "Więcej"
       all_categories: "Wszystkie kategorie"
       sections:
         about:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index ef1d8ccd2f..e13dfb637a 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -206,6 +206,7 @@ pt:
     ok_value: "CONFIRMAR"
     cancel_value: "Cancelar"
     submit: "Submeter"
+    delete: "Eliminar"
     generic_error: "Pedimos desculpa, ocorreu um erro."
     generic_error_with_reason: "Ocorreu um erro: %{error}"
     sign_up: "Inscrever-se"
@@ -1651,6 +1652,8 @@ pt:
       leave_message: "Quer mesmo deixar esta mensagem?"
       remove_allowed_user: "Deseja mesmo remover %{name} desta mensagem?"
       remove_allowed_group: "Deseja mesmo remover %{name} desta mensagem?"
+      leave: "Sair"
+      remove_user: "Remover utilizador"
     email: "E-mail"
     username: "Nome de utilizador"
     last_seen: "Visto"
@@ -3339,7 +3342,6 @@ pt:
       tag_list_joiner: ", "
       delete_unused: "Excluir tags não utilizadas"
       delete_unused_description: "Exclua todas as tags que não estão anexadas a algum tópico ou mensagem pessoal"
-      cancel_delete_unused: "Cancelar"
       filters:
         without_category: "%{filter} %{tag} tópicos"
         with_category: "%{filter} %{tag} tópicos em %{category}"
@@ -3434,7 +3436,7 @@ pt:
       new_count:
         one: "%{count} novo"
         other: "%{count} novos"
-      more: "Mais..."
+      more: "Mais"
       all_categories: "Todas as categorias"
       sections:
         about:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 2d924cd622..b2c0fb3d14 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -228,6 +228,7 @@ pt_BR:
     ok_value: "Ok"
     cancel_value: "Cancelar"
     submit: "Enviar"
+    delete: "Excluir"
     generic_error: "Desculpe, ocorreu um erro."
     generic_error_with_reason: "Ocorreu um erro: %{error}"
     sign_up: "Cadastrar-se"
@@ -1739,6 +1740,8 @@ pt_BR:
       leave_message: "Tem certeza de que quer sair desta mensagem?"
       remove_allowed_user: "Tem certeza de que quer remover %{name} desta mensagem?"
       remove_allowed_group: "Tem certeza de que quer remover %{name} desta mensagem?"
+      leave: "Sair"
+      remove_user: "Remover usuário"
     email: "E-mail"
     username: "Nome do(a) usuário(a)"
     last_seen: "Visto(a)"
@@ -3590,7 +3593,6 @@ pt_BR:
       tag_list_joiner: ", "
       delete_unused: "Excluir etiquetas não usadas"
       delete_unused_description: "Excluir todas as etiquetas que não foram anexadas a nenhum tópico ou mensagens pessoais"
-      cancel_delete_unused: "Cancelar"
       filters:
         without_category: "%{filter} %{tag} tópicos"
         with_category: "%{filter} %{tag} tópicos em %{category}"
@@ -3704,7 +3706,7 @@ pt_BR:
       new_count:
         one: "%{count} nova"
         other: "%{count} novas"
-      more: "Mais..."
+      more: "Mais"
       all_categories: "Todas as categorias"
       all_tags: "Todas as etiquetas"
       sections:
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 838224bafc..217274f00c 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -227,6 +227,7 @@ ro:
     ok_value: "Ok"
     cancel_value: "Anulare"
     submit: "Trimite"
+    delete: "Șterge"
     generic_error: "A apărut o eroare."
     generic_error_with_reason: "A apărut o eroare: %{error}"
     sign_up: "Înregistrare"
@@ -1514,6 +1515,8 @@ ro:
       leave_message: "Sigur părăsești acest mesaj?"
       remove_allowed_user: "Chiar dorești să îl elimini pe %{name} din acest mesaj privat?"
       remove_allowed_group: "Ești sigur că vrei să îl scoți pe %{name} din acest mesaj?"
+      leave: "Părăsește"
+      remove_user: "Șterge utilizator"
     email: "Email"
     username: "Nume utilizator"
     last_seen: "Văzut"
@@ -2853,7 +2856,6 @@ ro:
       sort_by_name: "nume"
       manage_groups: "Gestionare grupuri de etichete"
       manage_groups_description: "Definește grupuri pentru a organiza etichetele"
-      cancel_delete_unused: "Anulează"
       filters:
         without_category: "%{filter} %{tag} subiecte"
         with_category: "%{filter} %{tag} subiecte în %{category}"
@@ -2940,7 +2942,7 @@ ro:
         one: "%{count} nou"
         few: "%{count} noi"
         other: "%{count} nou"
-      more: "Mai multe..."
+      more: "Mai multe"
       all_categories: "Toate categoriile"
       sections:
         about:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 7bc8b2d310..b9125af0bf 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -287,6 +287,7 @@ ru:
     ok_value: "ОК"
     cancel_value: "Нет"
     submit: "Отправить"
+    delete: "Удалить"
     generic_error: "Извините, произошла ошибка."
     generic_error_with_reason: "Произошла ошибка: %{error}"
     sign_up: "Регистрация"
@@ -1083,6 +1084,7 @@ ru:
     user_fields:
       none: "(выберите)"
       required: 'Пожалуйста, введите значение для "%{name}"'
+      same_as_password: 'Указанный пароль не должен фигурировать в других полях.'
     user:
       said: "%{username}:"
       profile: "Профиль"
@@ -1891,6 +1893,9 @@ ru:
       leave_message: "Вы действительно хотите выйти из этого сообщения?"
       remove_allowed_user: "Вы действительно хотите удалить %{name} из этого сообщения?"
       remove_allowed_group: "Вы действительно хотите удалить %{name} из этого сообщения?"
+      leave: "Покинуть"
+      remove_group: "Удалить группу"
+      remove_user: "Удалить пользователя"
     email: "Email"
     username: "Псевдоним"
     last_seen: "Был"
@@ -2123,7 +2128,7 @@ ru:
       more_emoji: "ещё..."
       options: "Настройки"
       whisper: "скрытое сообщение"
-      unlist: "Тема скрыта"
+      unlist: "тема скрыта"
       add_warning: "Официальное предупреждение"
       toggle_whisper: "Скрытое сообщение"
       toggle_unlisted: "Скрыть"
@@ -2134,6 +2139,7 @@ ru:
       edit_conflict: "редактировать конфликт"
       esc: "Esc"
       esc_label: "Нажмите клавишу 'Esc' для закрытия"
+      ok_proceed: "OK"
       group_mentioned_limit:
         one: "<b>Внимание!</b> Вы упомянули <a href='%{group_link}'>%{group}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на %{count} пользователя. Никто не получит уведомление."
         few: "<b>Внимание!</b> Вы упомянули <a href='%{group_link}'>%{group}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на %{count} пользователей. Никто не получит уведомление."
@@ -3464,6 +3470,7 @@ ru:
       name: "Название раздела"
       description: "Описание"
       logo: "Логотип раздела"
+      logo_dark: "Логотип, используемый в тёмном режиме"
       background_image: "Фоновое изображение раздела"
       badge_colors: "Цвета наград"
       background_color: "Цвет фона"
@@ -3574,7 +3581,7 @@ ru:
         appearance: "Внешний вид"
         email: "Email"
       list_filters:
-        all: "Все непрочитанные темы"
+        all: "Все темы"
         none: "Без подразделов"
       colors_disabled: "Вы не можете выбирать цвета, поскольку не указан стиль раздела."
     flagging:
@@ -4046,7 +4053,6 @@ ru:
       tag_list_joiner: ", "
       delete_unused: "Удалить неиспользуемые теги"
       delete_unused_description: "Удалите все теги, которые не прикреплены к темам или личным сообщениям"
-      cancel_delete_unused: "Отменить"
       filters:
         without_category: "%{filter} темы с тегом %{tag}"
         with_category: "%{filter} темы с тегом %{tag} в разделе %{category}"
@@ -4177,7 +4183,7 @@ ru:
         many: "%{count} новых"
         other: "%{count} непрочитанных"
       toggle_section: "Свернуть / развернуть секцию"
-      more: "Ещё..."
+      more: "Ещё"
       all_categories: "Все разделы"
       all_tags: "Все теги"
       sections:
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index d8c9edf79d..7e4bde9be6 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -216,6 +216,7 @@ sk:
     ok_value: "OK"
     cancel_value: "Zrušiť"
     submit: "Odoslať"
+    delete: "Odstrániť"
     generic_error: "Ľutujeme, nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
     sign_up: "Registrácia"
@@ -1173,6 +1174,8 @@ sk:
       title: "Správa"
       remove_allowed_user: "Skutočne chcete odstrániť %{name} z tejto správy?"
       remove_allowed_group: "Skutočne chcete odstrániť %{name} z tejto správy?"
+      leave: "Opustiť"
+      remove_user: "Odstrániť používateľa"
     email: "Email"
     username: "Používateľské meno"
     last_seen: "Videné"
@@ -2225,7 +2228,6 @@ sk:
       sort_by_name: "mena"
       manage_groups: "Spravovať skupinu štítkov"
       manage_groups_description: "Zadefinujte skupiny pre usporiadanie štítkov"
-      cancel_delete_unused: "Zrušiť"
       filters:
         without_category: "%{filter} %{tag} tém"
       notifications:
@@ -2287,7 +2289,7 @@ sk:
         few: "%{count} nové"
         many: "%{count} nových"
         other: "%{count} nových"
-      more: "Viac ..."
+      more: "Viac"
       all_categories: "Všetky kategórie"
       sections:
         about:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 8c55a77a2d..e3ca1e5e1f 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -238,6 +238,7 @@ sl:
     ok_value: "V redu"
     cancel_value: "Prekliči"
     submit: "Išči"
+    delete: "Izbriši"
     generic_error: "Ups, prišlo je do napake."
     generic_error_with_reason: "Napaka: %{error}"
     sign_up: "Registracija"
@@ -1605,6 +1606,8 @@ sl:
       leave_message: "Ali hočete res zapustiti to sporočilo?"
       remove_allowed_user: "Ali resnično želite odstraniti %{name} s tega sporočila?"
       remove_allowed_group: "Ali resnično želite odstraniti %{name} s tega sporočila?"
+      leave: "Zapusti"
+      remove_user: "Odstrani uporabnika"
     email: "E-naslov"
     username: "Uporabniško ime"
     last_seen: "Viden"
@@ -3301,7 +3304,6 @@ sl:
       tag_list_joiner: ", "
       delete_unused: "Izbriši neuporabljene oznake"
       delete_unused_description: "Izbriši vse oznake, ki se ne uporabljajo na nobeni temi ali zasebnem sporočilu"
-      cancel_delete_unused: "Prekliči"
       filters:
         without_category: "%{filter} %{tag} teme"
         with_category: "%{filter} %{tag} teme v %{category}"
@@ -3390,7 +3392,7 @@ sl:
         two: "%{count} novi"
         few: "%{count} nove"
         other: "%{count} novih"
-      more: "Več..."
+      more: "Več"
       all_categories: "Vse kategorije"
       sections:
         about:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 4f6bcb9919..3fadb847a4 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -163,6 +163,7 @@ sq:
     yes_value: "Po"
     ok_value: "OK"
     cancel_value: "Anulo"
+    delete: "Fshij"
     generic_error: "Na vjen keq, por sapo ndodhi një gabim."
     generic_error_with_reason: "Pati një gabim: %{error}"
     sign_up: "Regjistrohu"
@@ -925,6 +926,7 @@ sq:
       title: "Mesazh"
       remove_allowed_user: "A doni vërtet të hiqni %{name} nga ky mesazh?"
       remove_allowed_group: "Doni me të vërtetë të hiqni %{name} nga ky mesazh? "
+      remove_user: "Hiq anëtar"
     email: "Email"
     username: "Emri i përdoruesit"
     last_seen: "Shikuar"
@@ -1882,7 +1884,6 @@ sq:
       sort_by: "Rendit sipas:"
       sort_by_count: "numri"
       sort_by_name: "emër"
-      cancel_delete_unused: "Anulo"
       filters:
         without_category: "%{filter} %{tag} temat"
         with_category: "%{filter} %{tag} temat në %{category}"
@@ -1946,7 +1947,7 @@ sq:
       new_count:
         one: "%{count} e re"
         other: "%{count} të reja"
-      more: "Më shuMë..."
+      more: "Më shumë"
       all_categories: "Të gjitha kategoritë"
       sections:
         about:
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 516b0b9261..8496a9f0f5 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -227,6 +227,7 @@ sr:
     ok_value: "U redu"
     cancel_value: "Odustani"
     submit: "Potvrdi"
+    delete: "Obriši"
     generic_error: "Izvinite, pojavila se greška."
     generic_error_with_reason: "Došlo je do greške: %{error}"
     sign_up: "Registrujte se"
@@ -1018,6 +1019,7 @@ sr:
       disable: "Prikaži Obrisane Poruke"
     private_message_info:
       title: "Privatna poruka"
+      remove_user: "Ukloni člana"
     email: "E-mail"
     username: "Korisničko Ime"
     last_seen: "Viđen"
@@ -1772,7 +1774,6 @@ sr:
       description: "Opis"
       sort_by_count: "broj"
       sort_by_name: "ime foruma"
-      cancel_delete_unused: "Odustani"
       filters:
         without_category: "%{filter} %{tag} teme"
       notifications:
@@ -1817,7 +1818,7 @@ sr:
         one: "%{count} nova"
         few: "%{count} novih"
         other: "%{count} nova"
-      more: "Više..."
+      more: "Više"
       sections:
         about:
           header_link_text: "O nama"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 11d8a5257a..f041ac3500 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -229,6 +229,7 @@ sv:
     ok_value: "OK"
     cancel_value: "Avbryt"
     submit: "Skicka"
+    delete: "Radera"
     generic_error: "Tyvärr, ett fel har inträffat."
     generic_error_with_reason: "Ett fel inträffade: %{error}"
     sign_up: "Registrera"
@@ -969,6 +970,7 @@ sv:
     user_fields:
       none: "(välj ett alternativ)"
       required: 'Ange ett värde för "%{name}"'
+      same_as_password: 'Ditt lösenord ska inte upprepas i andra fält.'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -1745,6 +1747,9 @@ sv:
       leave_message: "Vill du verkligen lämna detta meddelande?"
       remove_allowed_user: "Vill du verkligen ta bort %{name} från det här meddelandet?"
       remove_allowed_group: "Vill du verkligen ta bort %{name} från det här meddelandet?"
+      leave: "Lämna"
+      remove_group: "Ta bort grupp"
+      remove_user: "Ta bort användare"
     email: "E-post"
     username: "Användarnamn"
     last_seen: "Sedd"
@@ -1976,6 +1981,7 @@ sv:
       edit_conflict: "redigera konflikt"
       esc: "esc"
       esc_label: "Klicka eller tryck på Esc för att avfärda"
+      ok_proceed: "Ok, fortsätt"
       group_mentioned_limit:
         one: "<b>Varning!</b> Du nämnde <a href='%{group_link}'>%{group}</a> och denna grupp har fler medlemmar än vad administratorn tillåter för omnämningar. Begränsningsregeln för omnämnanden är satt till %{count} användare. Ingen kommer därför att aviseras."
         other: "<b>Varning!</b> Du nämnde <a href='%{group_link}'>%{group}</a> och denna grupp har fler medlemmar än vad administratorn tillåter för omnämningar. Begränsningsregeln för omnämnanden är satt till %{count} användare. Ingen kommer därför att aviseras."
@@ -3162,6 +3168,7 @@ sv:
       name: "Kategorinamn"
       description: "Beskrivning"
       logo: "Kategori logotypbild"
+      logo_dark: "Kategorilogotypbild för mörkt läge"
       background_image: "Kategori bakgrundsbild"
       badge_colors: "Utmärkelsefärg"
       background_color: "Bakgrundsfärg"
@@ -3688,7 +3695,6 @@ sv:
       tag_list_joiner: ", "
       delete_unused: "Radera oanvända taggar"
       delete_unused_description: "Radera alla taggar som inte är kopplade till något ämne eller personliga meddelanden"
-      cancel_delete_unused: "Avbryt"
       filters:
         without_category: "%{filter} %{tag} ämnen"
         with_category: "%{filter} %{tag} ämnen i %{category}"
@@ -3815,7 +3821,7 @@ sv:
         one: "%{count} ny"
         other: "%{count} nya"
       toggle_section: "växla avsnitt"
-      more: "Mer..."
+      more: "Mer"
       all_categories: "Alla kategorier"
       all_tags: "Alla taggar"
       sections:
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 9f50754618..9652e7fa03 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -169,6 +169,7 @@ sw:
     ok_value: "Vema"
     cancel_value: "Ghairi"
     submit: "Wasilisha"
+    delete: "Futa"
     generic_error: "Samahani, hitilafu imetokea."
     generic_error_with_reason: "Hitilafu imetokea: %{error}"
     sign_up: "Jiunge"
@@ -1057,6 +1058,8 @@ sw:
       leave_message: "Je, ni unataka kuiacha huu ujumbe?"
       remove_allowed_user: "Je, unataka kuondoa %{name} kutoka kwenye huu ujumbe?"
       remove_allowed_group: "Je, unataka kuondoa %{name} kutoka kwenye huu ujumbe?"
+      leave: "Ondoka"
+      remove_user: "Ondoa mtumiaji"
     email: "Barua pepe"
     username: "Jina la mtumiaji"
     last_seen: "Imetazamwa"
@@ -2200,7 +2203,6 @@ sw:
       sort_by_name: "jina"
       manage_groups: "Dhibiti makundi ya lebo"
       manage_groups_description: "Fasili makundi kwa ajili ya kurakibisha lebo"
-      cancel_delete_unused: "Ghairi"
       filters:
         without_category: "mada %{filter}%{tag}"
         with_category: "mada%{filter} %{tag} za %{category}"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index f1f1546cd8..53686a055e 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -109,6 +109,7 @@ te:
     yes_value: "అవును"
     ok_value: "సరే"
     cancel_value: "రద్దుచేయి"
+    delete: "తొలగించు"
     generic_error: "క్షమించాలి, ఒక దోషం తలెత్తింది"
     generic_error_with_reason: "ఒక దోషం జరిగింది: %{error}"
     sign_up: "సైన్ అప్"
@@ -1321,7 +1322,6 @@ te:
       add_synonyms: "కలుపు"
       description: "వివరణ"
       sort_by_name: "పేరు"
-      cancel_delete_unused: "రద్దుచేయి"
       filters:
         without_category: "%{filter} %{tag} విషయాలు"
       notifications:
@@ -1365,6 +1365,7 @@ te:
       new_count:
         one: "%{count} కొత్త"
         other: "%{count} కొత్త"
+      more: "ఇంకా"
       sections:
         about:
           header_link_text: "గురించి"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 273b180cb7..8650943eeb 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -191,6 +191,7 @@ th:
     ok_value: "ตกลง"
     cancel_value: "ยกเลิก"
     submit: "ตกลง"
+    delete: "ลบ"
     generic_error: "ขออภัย เกิดข้อผิดพลาดขึ้น"
     generic_error_with_reason: "เกิดข้อผิดพลาดขึ้น: %{error}"
     sign_up: "สมัครสมาชิก"
@@ -1219,6 +1220,8 @@ th:
       leave_message: "คุณต้องการละทิ้งข้อความนี้จริงๆใช่หรือไม่"
       remove_allowed_user: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
       remove_allowed_group: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
+      leave: "ออก"
+      remove_user: "ลบผู้ใช้"
     email: "อีเมล"
     username: "ชื่อผู้ใช้"
     last_seen: "เห็น"
@@ -2402,7 +2405,6 @@ th:
         other: "%{tags}และอีก%{count}"
       delete_unused: "ลบแท็กที่ไม่ได้ใช้"
       delete_unused_description: "ลบแท็กทั้งหมดที่ไม่ได้ถูกติดในกระทู้หรือข้อความส่วนตัวใดๆ"
-      cancel_delete_unused: "ยกเลิก"
       filters:
         without_category: "%{filter} %{tag} กระทู้"
         with_category: "%{filter} %{tag} กระทู้ใน %{category}"
@@ -2451,7 +2453,7 @@ th:
         other: "%{count} ยังไม่อ่าน"
       new_count:
         other: "%{count} ใหม่"
-      more: "อื่นๆ..."
+      more: "อื่น"
       all_categories: "หมวดหมู่ทั้งหมด"
       sections:
         about:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 8e24491f40..6221c41b9f 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -213,6 +213,7 @@ tr_TR:
     ok_value: "Tamam"
     cancel_value: "İptal et"
     submit: "Gönder"
+    delete: "Sil"
     generic_error: "Üzgünüz, bir hata oluştu."
     generic_error_with_reason: "Bir hata oluştu: %{error}"
     sign_up: "Kayıt Ol"
@@ -1656,6 +1657,8 @@ tr_TR:
       enabled: "Bu site salt-okunur modda. Lütfen taramayı sürdürün; ancak yanıtlama, beğenme ve diğer eylemler şu an için devre dışı durumda."
       login_disabled: "Site salt-okunur modda iken giriş işlemi devre dışı bırakılır ."
       logout_disabled: "Site salt-okunur modda iken çıkış işlemi yapılamaz."
+    staff_writes_only_mode:
+      enabled: "Bu site sadece personellerinin kullanabileceği moddadır. Lütfen göz atmaya devam edin, ancak yanıtlama, beğenme ve diğer işlemler yalnızca personel üyeleriyle sınırlıdır."
     too_few_topics_and_posts_notice_MF: >-
       Haydi <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">tartışmaya başlayalım!</a> Şu an{currentTopics, plural, one { <strong>#</strong> konu} other { <strong>#</strong> konu}} ve {currentPosts, plural, one {<strong>#</strong> gönderi} other {<strong>#</strong> gönderi}} var. Ziyaretçilerin okumak ve yanıtlamak için daha fazlasına ihtiyacı var - en azından {requiredTopics, plural, one {<strong>#</strong> konu} other {<strong>#</strong> konu}} ve {requiredPosts, plural, one {<strong>#</strong> gönderi} other {<strong>#</strong> gönderi}} olmasını tavsiye ediyoruz. Bu iletiyi yalnızca personel görebilir.
     too_few_topics_notice_MF: >-
@@ -1710,6 +1713,8 @@ tr_TR:
       leave_message: "Gerçekten bu iletiden çıkmak mı istiyorsunuz?"
       remove_allowed_user: "Bu iletiden %{name} adlı kullanıcıyı çıkarmak istediğinize emin misiniz?"
       remove_allowed_group: "Gerçekten %{name} adlı kullanıcıyı bu iletiden kaldırmak istiyor musunuz?"
+      leave: "Ayrıl"
+      remove_user: "Kullanıcıyı kaldır"
     email: "E-posta"
     username: "Kullanıcı Adı"
     last_seen: "Görülen"
@@ -1937,6 +1942,8 @@ tr_TR:
       similar_topics: "Konun şunlara benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
       edit_conflict: "çakışmayı düzenle"
+      esc: "esc"
+      esc_label: "Kapatmak için tıklayın veya Esc tuşuna basın"
       group_mentioned_limit:
         one: "<b>Uyarı!</b> <a href='%{group_link}'>%{group}</a> grubundan bahsettiniz; ancak bu grubun yönetici tarafından yapılandırılan %{count} kullanıcılı ifade sınırından daha fazla üyesi var. Kimseye haber verilmeyecek."
         other: "<b>Uyarı!</b> Bahsettiğiniz <a href='%{group_link}'>%{group}</a> bu grubun yöneticisi tarafından yapılandırılmış %{count} kullanıcı sınırından daha fazla üyesi vardır. Kimseye haber verilmeyecek."
@@ -2031,6 +2038,9 @@ tr_TR:
         body: "Bu ileti şu an yalnızca size gönderiliyor!"
       slow_mode:
         error: "Bu konu yavaş kipte. Son zamanlarda zaten bir şeyler yazdınız; %{timeLeft} yeniden yazabilirsiniz."
+      user_not_seen_in_a_while:
+        single: "Mesaj yazdığınız kişi, <b>%{usernames}</b>, çok uzun zamandır buralarda görülmedi – %{time_ago}. Mesajınızı almayacak olabilirler. %{usernames} ile iletişime geçmek için alternatif yöntemler denemek isteyebilirsiniz."
+        multiple: "Mesaj yazdığınız kişiler, <b>%{usernames}</b>, çok uzun zamandır buralarda görülmedi – %{time_ago}. Mesajınızı almayacak olabilirler. Onlarla iletişime geçmek için alternatif yöntemler denemek isteyebilirsiniz."
       admin_options_title: "Bu başlık için isteğe bağlı görevli ayarları"
       composer_actions:
         reply: Yanıt
@@ -3069,6 +3079,7 @@ tr_TR:
       name: "Kategori Adı"
       description: "Açıklama"
       logo: "Kategori Logo Resmi"
+      logo_dark: "Karanlık Mod Kategorisi Logo Resmi"
       background_image: "Kategori Arka Plan Resmi"
       badge_colors: "Rozet renkleri"
       background_color: "Arka plan rengi"
@@ -3587,7 +3598,6 @@ tr_TR:
       tag_list_joiner: ", "
       delete_unused: "Kullanılmayan Etiketleri Sil"
       delete_unused_description: "Hiçbir konuya veya kişisel mesaja eklenmeyen tüm etiketleri sil"
-      cancel_delete_unused: "İptal"
       filters:
         without_category: "%{filter} %{tag} konular"
         with_category: "%{category} içerisindeki konular %{filter} %{tag}"
@@ -3707,7 +3717,7 @@ tr_TR:
         one: "%{count} yeni"
         other: "%{count} yeni"
       toggle_section: "bölümü değiştir"
-      more: "Daha..."
+      more: "Daha fazla"
       all_categories: "Tüm kategoriler"
       all_tags: "Tüm etiketler"
       sections:
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index bbfb58e17c..cd14086556 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -287,6 +287,7 @@ uk:
     ok_value: "OK"
     cancel_value: "Скасувати"
     submit: "Надіслати"
+    delete: "Видалити"
     generic_error: "Даруйте, виникла помилка."
     generic_error_with_reason: "Виникла помилка: %{error}"
     sign_up: "Зареєструватись"
@@ -1889,6 +1890,8 @@ uk:
       leave_message: "Ви дійсно хочете залишити це повідомлення?"
       remove_allowed_user: "Ви впевнені, що хочете видалити %{name} з цього повідомлення?"
       remove_allowed_group: "Ви впевнені, що хочете видалити %{name} з цього повідомлення?"
+      leave: "Покинути"
+      remove_user: "Вилучити користувача"
     email: "Електронна пошта"
     username: "Ім'я користувача"
     last_seen: "Помічено востаннє"
@@ -4039,7 +4042,6 @@ uk:
       tag_list_joiner: ", "
       delete_unused: "Вилучити невикористовувані мітки"
       delete_unused_description: "Вилучити усі мітки, які не прикріплені до жодної теми чи особистих повідомлень"
-      cancel_delete_unused: "Скасувати"
       filters:
         without_category: "%{filter} %{tag} тем"
         with_category: "%{filter} %{tag} тем у %{category}"
@@ -4170,7 +4172,7 @@ uk:
         many: "%{count} нова"
         other: "%{count} нова"
       toggle_section: "Переключити розділ"
-      more: "Ще..."
+      more: "Більше"
       all_categories: "Всі категорії"
       all_tags: "Всі теги"
       sections:
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index a3cf73c860..da0d237c2c 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -209,6 +209,7 @@ ur:
     ok_value: "ٹھیک ہے"
     cancel_value: "منسوخ"
     submit: "شائع"
+    delete: "مٹائیں"
     generic_error: "معذرت، ایک تکنیکی خرابی کا سامنا کرنا پڑا ہے۔"
     generic_error_with_reason: "ایک تکنیکی خرابی پیش آئی: %{error}"
     sign_up: "سائن اپ"
@@ -1689,6 +1690,8 @@ ur:
       leave_message: "کیا آپ واقعی یہ پیغام بھیجنا چاہتے ہیں؟"
       remove_allowed_user: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
       remove_allowed_group: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
+      leave: "چھوڑ دیں"
+      remove_user: "صارف خارج کریں"
     email: "اِی میل"
     username: "صارف نام"
     last_seen: "دیکھا گیا"
@@ -3523,7 +3526,6 @@ ur:
       tag_list_joiner: "، "
       delete_unused: "غیر استعمال شدہ ٹیگز مٹائیں"
       delete_unused_description: "تمام اُن ٹیگز کو مٹائیں جو کسی بھی ٹاپک یا ذاتی پیغام سے منسلک نہیں ہیں"
-      cancel_delete_unused: "منسوخ"
       filters:
         without_category: "%{filter} %{tag} ٹاپکس"
         with_category: "%{filter} %{tag} ٹاپکس %{category} میں"
@@ -3643,7 +3645,7 @@ ur:
       new_count:
         one: "%{count} نیا"
         other: "%{count} نئے"
-      more: "مزید..."
+      more: "مزید"
       all_categories: "تمام زُمرَہ جات"
       sections:
         about:
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index abe6c9798b..e070aecc05 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -200,6 +200,7 @@ vi:
     ok_value: "OK"
     cancel_value: "Huỷ"
     submit: "Gửi đi"
+    delete: "Xóa"
     generic_error: "Rất tiếc, đã có lỗi xảy ra."
     generic_error_with_reason: "Đã xảy ra lỗi: %{error}"
     sign_up: "Đăng ký"
@@ -1663,6 +1664,8 @@ vi:
       leave_message: "Bạn có thực sự muốn để lại tin nhắn này không?"
       remove_allowed_user: "Bạn thực sự muốn xóa %{name} từ tin nhắn này?"
       remove_allowed_group: "Bạn thực sự muốn xóa %{name} từ tin nhắn này?"
+      leave: "Rời nhóm"
+      remove_user: "Xoá người dùng"
     email: "Email"
     username: "Username"
     last_seen: "Đã xem"
@@ -3475,7 +3478,6 @@ vi:
       tag_list_joiner: ", "
       delete_unused: "Xóa thẻ không sử dụng"
       delete_unused_description: "Xóa tất cả các thẻ không được đính kèm với bất kỳ chủ đề hoặc tin nhắn cá nhân nào"
-      cancel_delete_unused: "Hủy"
       filters:
         without_category: "%{filter} %{tag} chủ đề"
         with_category: "%{filter} %{tag} chủ đề trong %{category}"
@@ -3598,7 +3600,7 @@ vi:
       new_count:
         other: "%{count} mới"
       toggle_section: "phần chuyển đổi"
-      more: "Thêm..."
+      more: "Thêm"
       all_categories: "Tất cả danh mục"
       sections:
         about:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 0399c49fba..642e36f4bf 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -200,6 +200,7 @@ zh_CN:
     ok_value: "确定"
     cancel_value: "取消"
     submit: "提交"
+    delete: "删除"
     generic_error: "抱歉，出错了。"
     generic_error_with_reason: "出错了：%{error}"
     sign_up: "注册"
@@ -355,7 +356,7 @@ zh_CN:
     switch_to_anon: "进入匿名模式"
     switch_from_anon: "退出匿名模式"
     banner:
-      close: "关闭此横幅"
+      close: "忽略此横幅"
       edit: "编辑"
     pwa:
       install_banner: "要<a href>在此设备上安装%{title}</a> 吗？"
@@ -912,6 +913,7 @@ zh_CN:
     user_fields:
       none: "（选择一个选项）"
       required: '请为“%{name}”输入一个值。'
+      same_as_password: '你的密码不应重复出现在其他字段中。'
     user:
       said: "%{username}："
       profile: "个人资料"
@@ -1672,6 +1674,9 @@ zh_CN:
       leave_message: "真的要离开此消息吗？"
       remove_allowed_user: "真的要将 %{name} 从此消息中移除吗？"
       remove_allowed_group: "真的要将 %{name} 从此消息中移除吗？"
+      leave: "离开"
+      remove_group: "移除群组"
+      remove_user: "移除用户"
     email: "电子邮件"
     username: "用户名"
     last_seen: "最后活动"
@@ -1896,7 +1901,8 @@ zh_CN:
       drafts_offline: "离线草稿"
       edit_conflict: "编辑冲突"
       esc: "esc"
-      esc_label: "单击或按 Esc 关闭"
+      esc_label: "单击或按 Esc 忽略"
+      ok_proceed: "好的，继续"
       group_mentioned_limit:
         other: "<b>警告</b>！您提及了 <a href='%{group_link}'> %{group} </a>，但是此群组的成员数量超过了管理员配置的 %{count} 个用户的最大可提及数量限制。没有人会收到通知。"
       group_mentioned:
@@ -3011,6 +3017,7 @@ zh_CN:
       name: "类别名称"
       description: "描述"
       logo: "类别徽标图片"
+      logo_dark: "深色模式类别 Logo 图片"
       background_image: "类别背景图片"
       badge_colors: "徽章颜色"
       background_color: "背景色"
@@ -3509,7 +3516,6 @@ zh_CN:
       tag_list_joiner: "，"
       delete_unused: "删除未使用的标签"
       delete_unused_description: "删除所有未与话题或个人消息关联的标签"
-      cancel_delete_unused: "取消"
       filters:
         without_category: "%{filter}%{tag}话题"
         with_category: "%{category}中的%{filter}%{tag}话题"
@@ -3634,7 +3640,7 @@ zh_CN:
       new_count:
         other: "%{count} 新"
       toggle_section: "切换部分"
-      more: "更多…"
+      more: "更多"
       all_categories: "所有类别"
       all_tags: "所有标签"
       sections:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index d033c32566..402bebd7bc 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -198,6 +198,7 @@ zh_TW:
     ok_value: "確定"
     cancel_value: "取消"
     submit: "送出"
+    delete: "刪除"
     generic_error: "抱歉，發生錯誤。"
     generic_error_with_reason: "發生錯誤: %{error}"
     sign_up: "註冊"
@@ -1421,6 +1422,8 @@ zh_TW:
       leave_message: "確定要移除這個訊息嗎？"
       remove_allowed_user: "確定將 %{name} 從對話中移除？"
       remove_allowed_group: "確定將 %{name} 從對話中移除？"
+      leave: "離開"
+      remove_user: "移除使用者"
     email: "電子郵件"
     username: "使用者名稱"
     last_seen: "出現時間"
@@ -2736,7 +2739,6 @@ zh_TW:
         other: "%{tags}以及其他%{count}個"
       delete_unused: "刪除未被使用的標籤"
       delete_unused_description: "刪除所有未被附加在任何話題或個人訊息的標籤"
-      cancel_delete_unused: "取消"
       filters:
         without_category: "%{tag}的%{filter}話題"
         with_category: "%{filter} %{tag}話題在%{category}"
@@ -2811,7 +2813,7 @@ zh_TW:
         other: "%{count} 個未讀"
       new_count:
         other: "%{count} 近期"
-      more: "更多..."
+      more: "更多"
       all_categories: "所有分類"
       sections:
         about:
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index f12f5f29f9..ef9020fb84 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -2881,18 +2881,9 @@ ar:
     bulk_invite_succeeded:
       title: "نجحت الدعوة الجماعية"
       subject_template: "تمت معالجة الدعوة الجماعية للمستخدمين بنجاح"
-      text_body_template: "تمت معالجة الدعوة الجماعية للمستخدمين، وتم إرسال %{sent} دعوة عبر البريد."
     bulk_invite_failed:
       title: "فشلت الدعوة الجماعية"
       subject_template: "تمت معالجة الدعوة الجماعية للمستخدمين مع وجود أخطاء"
-      text_body_template: |
-        تمت معالجة ملف الدعوة الجماعية للمستخدمين، تم إرسال %{sent} دعوة بالبريد وحدث %{failed} خطأ.
-
-        إليك السجل:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "تمت إضافتك إلى المجموعة كمالك"
       subject_template: "تمت إضافتك كمالك إلى المجموعة %{group_name}"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index ae6b805802..c80ac9c6bf 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -1047,7 +1047,6 @@ bg:
       subject_template: "Възстановяването се провали"
     bulk_invite_succeeded:
       subject_template: "Груповата потребителска покана e обработена успешно"
-      text_body_template: "Вашата групова потребителска покана от файл е обработена, %{sent} имейл покани бяха изпратени."
     bulk_invite_failed:
       subject_template: "Груповата потребителска покана завърши с грешки"
     csv_export_failed:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 4af0205e92..2bc7d14c89 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -874,7 +874,6 @@ bs_BA:
       subject_template: "Restore failed"
     bulk_invite_succeeded:
       subject_template: "Bulk user invite processed successfully"
-      text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
     bulk_invite_failed:
       subject_template: "Bulk user invite processed with errors"
     csv_export_failed:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index bf1de13eb1..efdc4a7130 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -2034,11 +2034,9 @@ ca:
     bulk_invite_succeeded:
       title: "Invitació massiva reeixida"
       subject_template: "La invitació d'usuaris massiva s'ha processat amb èxit"
-      text_body_template: "S'ha processat el fitxer d'invitació massiva; %{sent} invitacions enviades."
     bulk_invite_failed:
       title: "Invitació massiva fallida"
       subject_template: "La invitació massiva d'usuaris s'ha processat amb errors"
-      text_body_template: "S'ha processat el fitxer d'invitació massiva. %{sent} invitacions enviades amb %{failed} error(s). \n\nVet aquí el registre: \n\n```text\n%{logs}\n```\n"
     csv_export_succeeded:
       title: "Exportació de CSV reeixida"
       subject_template: "[%{export_title}] Exportació de dades completada"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index f856903866..072a80ec71 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -259,6 +259,7 @@ de:
     max_redemptions_limit: "sollte zwischen 2 und %{max_limit} sein."
   topic_invite:
     failed_to_invite: "Der Benutzer kann nicht in dieses Thema eingeladen werden, ohne Mitglied in einer der folgenden Gruppen zu sein: %{group_names}"
+    not_pm: "Du kannst nur zu privaten Nachrichten einladen."
     user_exists: "Entschuldige, dieser Benutzer ist bereits eingeladen worden. Du kannst einen Benutzer nur einmal zu einem Thema einladen."
     muted_topic: "Entschuldige, dieser Benutzer hat dieses Thema stummgeschaltet."
     receiver_does_not_allow_pm: "Entschuldige, dieser Benutzer erlaubt es dir nicht, ihm private Nachrichten zu senden."
@@ -1674,6 +1675,7 @@ de:
     max_personal_messages_per_day: "Maximale Anzahl neuer persönlicher Nachrichtenthemen, die ein Benutzer pro Tag erstellen kann."
     max_invites_per_day: "Maximale Anzahl an Einladungen, die ein Benutzer pro Tag verschicken kann."
     max_topic_invitations_per_day: "Maximale Anzahl an Thema-Einladungen, die ein Benutzer pro Tag verschicken kann."
+    max_topic_invitations_per_minute: "Maximale Anzahl an Thema-Einladungen, die ein Benutzer pro Minute verschicken kann."
     max_logins_per_ip_per_hour: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
     max_logins_per_ip_per_minute: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Minute"
     max_post_deletions_per_minute: "Maximale Anzahl von Beiträgen, die ein Benutzer pro Minute löschen kann. Auf 0 setzen, um das Löschen von Beiträgen zu deaktivieren."
@@ -2793,18 +2795,23 @@ de:
     bulk_invite_succeeded:
       title: "Masseneinladung erfolgreich"
       subject_template: "Masseneinladung von Benutzern erfolgreich verarbeitet"
-      text_body_template: "Deine Masseneinladung von Benutzern wurde erfolgreich verarbeitet, insgesamt wurden %{sent} Einladungen per E-Mail verschickt."
+      text_body_template: |
+        Deine Masseneinladungsdatei wurde verarbeitet, %{sent} Einladungen verschickt, %{skipped} übersprungen und %{warnings} Warnung(en).
+
+        ```` Text
+        %{logs}
+        ````
     bulk_invite_failed:
       title: "Masseneinladung fehlgeschlagen"
       subject_template: "Bei der Verarbeitung der Masseneinladung von Benutzern sind Fehler aufgetreten"
       text_body_template: |
-        Deine Datei zur Massenbenutzereinladung wurde verarbeitet, %{sent} Einladungen wurden verschickt mit %{failed} Fehler(n).
+        Deine Masseneinladungsdatei wurde verarbeitet, %{sent} Einladungen verschickt, %{skipped} übersprungen, %{warnings} Warnung(en) und %{failed} Fehler.
 
         Hier ist das Protokoll:
 
-        ``` text
+        ```` Text
         %{logs}
-        ```
+        ````
     user_added_to_group_as_owner:
       title: "Als Eigentümer zur Gruppe hinzugefügt"
       subject_template: "Du wurdest als Eigentümer der Gruppe %{group_name} hinzugefügt"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 0671c6edc1..5ef1311d76 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1560,7 +1560,6 @@ el:
     bulk_invite_succeeded:
       title: "Η μαζική πρόσκληση ήταν επιτυχής"
       subject_template: "Μαζική πρόσκληση χρηστών επεξεργάστηκε επιτυχώς"
-      text_body_template: "Η επεξεργασία του αρχείου μαζικής πρόσκλησης χρηστών ολοκληρώθηκε, %{sent} προσκλήσεις στάλθηκαν."
     bulk_invite_failed:
       title: "Μαζική πρόσκληση απέτυχε"
       subject_template: "Η επεξεργασία του αρχείου μαζικής πρόσκλησης χρηστών ολοκληρώθηκε με λάθη."
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index bd67164c4c..1c9fd3cd2d 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -2774,18 +2774,9 @@ es:
     bulk_invite_succeeded:
       title: "Invitación en masa realizada con éxito"
       subject_template: "Invitación masiva procesada con éxito"
-      text_body_template: "Tu archivo de invitación masiva ha sido procesada, se han enviado %{sent} invitaciones por correo electrónico."
     bulk_invite_failed:
       title: "La invitación en masa falló"
       subject_template: "Invitación masiva procesada con algunos errores"
-      text_body_template: |
-        Tu archivo de invitación masiva ha sido procesado, se han enviado por correo electrónico %{sent} invitaciones con %{failed} error(es).
-
-        Este es el registro:
-
-        ```text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Te han añadido como propietario a un grupo"
       subject_template: "Te han añadido como propietario al grupo %{group_name}"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 22dbf90a52..d307533b01 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1536,7 +1536,6 @@ fa_IR:
     bulk_invite_succeeded:
       title: "دعوت عمومی موفق"
       subject_template: "دعوت گروهی کاربران با موفقیت انجام شد"
-      text_body_template: "فایل دعوت گروهی کاربر شما پردازش شد، %{sent} دعوتنامه ارسال شد. "
     bulk_invite_failed:
       title: "دعوت گروهی ناموفق"
       subject_template: "دعوت انبوه کاربر با مشکل پردازش شد"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 890d7be686..fd703369f8 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -2538,18 +2538,9 @@ fi:
     bulk_invite_succeeded:
       title: "Massakutsun lähetys onnistui"
       subject_template: "Massakutsun käsittely onnistui"
-      text_body_template: "Massakutsutiedostosi on käsitelty, %{sent} kutsua lähetetty."
     bulk_invite_failed:
       title: "Massakutsun lähetys epäonnistui"
       subject_template: "Massakutsun käsittelyssä tapahtui virhe"
-      text_body_template: |
-        Massakutsutiedostosi käsiteltiin, %{sent} kutsua lähetettiin, joista %{failed} virhe(ttä).
-
-        Tässä loki:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Lisätty ryhmään omistajana"
       subject_template: "Sinut on lisätty ryhmän %{group_name} omistajaksi"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 2a7cf3ab69..fda1c54b07 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -2762,18 +2762,9 @@ fr:
     bulk_invite_succeeded:
       title: "Invitation en masse réussie"
       subject_template: "Envoi des invitations en masse réussi"
-      text_body_template: "Votre envoi d'invitations en masse a été effectué. %{sent} invitations ont été envoyées."
     bulk_invite_failed:
       title: "Invitation en masse échouée"
       subject_template: "Envoi des invitations en masse effectué avec des erreurs"
-      text_body_template: |
-        Votre envoi d'invitations en masse a été effectué. %{sent} invitations ont été envoyées avec %{failed} erreur(s).
-
-        Voici le détail :
-
-        ```text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Désigné(e) comme propriétaire du groupe"
       subject_template: "Vous avez été désigné(e) comme l'un(e) des propriétaire du groupe %{group_name}"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 665affd2bd..aee5a58a15 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -2472,18 +2472,9 @@ gl:
     bulk_invite_succeeded:
       title: "Convite en masa correcto"
       subject_template: "O convite en masa procesouse correctamente"
-      text_body_template: "O seu ficheiro de convites en masa foi procesado; enviáronse %{sent} convites por correo electrónico."
     bulk_invite_failed:
       title: "Erro no convite en masa"
       subject_template: "Convites en masa procesados con algúns erros"
-      text_body_template: |
-        O seu ficheiro de convites en masa foi procesado; enviáronse %{sent} convites por correo electrónico con %{failed} erros.
-
-        Velaquí está o rexistro:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Engadido ao grupo como propietario"
       subject_template: "Vostede foi engadido como un propietario do grupo %{group_name}"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 81cc945b55..2201302967 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -277,6 +277,7 @@ he:
     max_redemptions_limit: "אמור להיות בין 2 לבין %{max_limit}."
   topic_invite:
     failed_to_invite: "לא ניתן להזמין את המשתמש לנושא הזה בהעדר חברות באחת הקבוצות הבאות: %{group_names}"
+    not_pm: "אפשר להזמין להודעות פרטיות בלבד."
     user_exists: "כבר נשלחה הזמנה למשתמש זה. ניתן להזמין משתמש לנושא פעם אחת בלבד, עמך הסליחה."
     muted_topic: "המשתמש הזה השתיק את הנושא הזה, עמך הסליחה."
     receiver_does_not_allow_pm: "משתמש זה לא מאשר לך לשלוח אליו הודעות פרטיות, עמך הסליחה."
@@ -1778,6 +1779,7 @@ he:
     max_personal_messages_per_day: "מספר ההודעות האישיות החדשות המרבי שמשתמשים יכולים ליצור ביום."
     max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמשים לשלוח ביום."
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. "
+    max_topic_invitations_per_minute: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח בדקה."
     max_logins_per_ip_per_hour: "מספר כניסות מרבי מורשה לכל כתובת IP בשעה"
     max_logins_per_ip_per_minute: "מספר כניסות מרבי מורשה לכל כתובת IP בדקה"
     max_post_deletions_per_minute: "מספר הפוסטים המרבי שמשתמש יכול למחוק בדקה אחת. 0 ישבית מחיקת פוסטים."
@@ -2936,18 +2938,9 @@ he:
     bulk_invite_succeeded:
       title: "הזמנה קבוצתית הצליחה"
       subject_template: "ההזמנה הקבוצתית עובדה בהצלחה"
-      text_body_template: "ההזמנה המרוכזת שלך עובדה, %{sent} הזמנות נשלחו."
     bulk_invite_failed:
       title: "הזמנה קבוצתית נכשלה"
       subject_template: "ההזמנה המרוכזת עובדה עם שגיאות"
-      text_body_template: |
-        ההזמנה הקבוצתית שלך עברה עיבוד, %{sent} הזמנות נשלחו בדוא״ל עם %{failed} תקלה/ות.
-
-        הנה התיעוד:
-        ``` text
-
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "נוסף לקבוצה כבעלים"
       subject_template: "נוספת לקבוצה %{group_name} כבעלים"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index ebd792a82d..3b0644a2d1 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -1183,7 +1183,6 @@ hu:
       subject_template: "Visszaállítás sikertelen"
     bulk_invite_succeeded:
       subject_template: "A csoportos felhasználó-meghívás feldolgozása sikeres"
-      text_body_template: "A csoportos felhasználó-meghívás feldolgozása sikeres, %{sent} meghívó lett kiküldve."
     bulk_invite_failed:
       subject_template: "Hiba a csoportos felhasználó-meghívás feldolgozásakor"
     csv_export_succeeded:
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index f5216a7ee7..e53cd23abc 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1905,18 +1905,9 @@ hy:
     bulk_invite_succeeded:
       title: "Զանգվածային Հրավերը Հաջողվեց"
       subject_template: "Օգտատերերի զանգվածային հրավերը հաջողությամբ իրագործված է:"
-      text_body_template: "Օգտատերերի Ձեր զանգվածային հրավերը գործարկված է, ուղարկվել է %{sent} հրավեր:"
     bulk_invite_failed:
       title: "Զանգվածային Հրավերը Ձախողվեց"
       subject_template: "Օգտատերերի զանգվածային հրավերը իրականացվել է սխալներով"
-      text_body_template: |
-        Օգտատերերի զանգվածային հրավերի Ձեր ֆայլը մշակված է, %{sent} հրավերները ուղարկվել են %{failed} սխալ(ներ)ով:
-
-        Ահա գրառումը՝
-
-        ``` տեքստ
-        %{logs}
-        ```
     csv_export_succeeded:
       title: "CSV Արտահանումը Հաջողվեց"
       subject_template: "[%{export_title}] Տվյալների արտահանումը ավարտվեց"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index d0269f354a..5033fa0339 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -2643,11 +2643,9 @@ it:
     bulk_invite_succeeded:
       title: "Invito di Massa Riuscito"
       subject_template: "Invito di massa processato con successo"
-      text_body_template: "Il tuo file con l'invito di massa è stato processato, %{sent} inviti spediti."
     bulk_invite_failed:
       title: "Invito di Massa Fallito"
       subject_template: "Invito di massa processato con errori"
-      text_body_template: "Il tuo file di invito di utenti in massa è stato elaborato, %{sent} inviti inviati con errore/i %{failed}. \n\nEcco il registro:\n\n``` text\n%{logs}\n```\n"
     user_added_to_group_as_owner:
       title: "Aggiunto al gruppo come proprietario"
       subject_template: "Sei stato aggiunto come proprietario del gruppo %{group_name}"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 52e93296af..fe9a4b4b2f 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -2470,18 +2470,9 @@ ja:
     bulk_invite_succeeded:
       title: "一括招待に成功しました"
       subject_template: "ユーザーの一括招待に成功しました"
-      text_body_template: "ユーザーの一括招待ファイルが処理され、%{sent} 件の招待が送信されました。"
     bulk_invite_failed:
       title: "一括招待に失敗しました"
       subject_template: "ユーザーの一括招待中にエラーが発生しました"
-      text_body_template: |
-        あなたの一括ユーザー招待ファイルは処理されました。招待を %{sent} 通メール送信し、%{failed} 個のエラーが発生しました。
-
-        こちらがログです。
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "オーナーとしてグループに追加しました"
       subject_template: "%{group_name} グループのオーナーとして追加されました"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 4a9a5172a3..7892e672c9 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -2560,18 +2560,9 @@ ko:
     bulk_invite_succeeded:
       title: "일괄 초대 성공"
       subject_template: "일괄 사용자 초대가 처리되었습니다"
-      text_body_template: "일괄 사용자 초대 파일이 처리되어 %{sent}명에게 초대를 발송했습니다."
     bulk_invite_failed:
       title: "일괄 초대 실패"
       subject_template: "일괄 사용자 초대 처리 중에 오류가 발생했습니다"
-      text_body_template: |
-        일괄 사용자 초대 파일이 처리되어 %{sent}명에게 초대를 발송했고 %{failed}개의 오류가 발생했습니다.
-
-        로그:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "그룹에 소유자로 추가됨"
       subject_template: "%{group_name} 그룹의 소유자로 추가되었습니다"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 3b4ededa8b..5086463479 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -2195,18 +2195,9 @@ nl:
     bulk_invite_succeeded:
       title: "Bulkuitnodiging geslaagd"
       subject_template: "Bulkuitnodiging aan gebruikers verwerkt"
-      text_body_template: "Uw bestand voor een bulkuitnodiging aan gebruikers is verwerkt. Er zijn %{sent} uitnodigingen verstuurd."
     bulk_invite_failed:
       title: "Bulkuitnodiging mislukt"
       subject_template: "Bulkuitnodiging aan gebruikers verwerkt, met fouten"
-      text_body_template: |
-        Uw bestand voor bulkuitnodiging aan gebruikers is verwerkt, %{sent} uitnodigingen verstuurd met %{failed} fout(en).
-
-        Hier zijn de details:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Toegevoegd aan groep als eigenaar"
     user_added_to_group_as_member:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index d336e49acd..375ca61e4b 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -2906,18 +2906,9 @@ pl_PL:
     bulk_invite_succeeded:
       title: "Zaproszenia hurtowe udane"
       subject_template: "Przetwarzanie masowej ilości zaproszeń zakończyło się sukcesem."
-      text_body_template: "Plik z zaproszeniami został przetworzony. Wysłanych zaproszeń: %{sent}."
     bulk_invite_failed:
       title: "Zaproszenia hurtowe Nieudane"
       subject_template: "Plik z zaproszeniami został przetworzony z błędami."
-      text_body_template: |
-        Twój zbiorczy plik zaproszeń użytkowników został przetworzony, %{sent} zaproszeń wysłanych z %{failed} błędem(-ami).
-
-        Oto dziennik:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Dodano do grupy jako właściciel"
       subject_template: "Zostałeś/łaś dodany jako właściciel grupy %{group_name}"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index e662bd4c83..6a1e94655e 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1526,7 +1526,6 @@ pt:
       subject_template: "A restauração falhou"
     bulk_invite_succeeded:
       subject_template: "Convites de utilizadores em massa processados com sucesso"
-      text_body_template: "O seu ficheiro de convites de utilizadores em massa foi processado, %{sent} convites enviados."
     bulk_invite_failed:
       subject_template: "Convite de utilizadores em massa processado com erros"
     csv_export_succeeded:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index b346ab55e7..f76e4d44c8 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -2721,18 +2721,9 @@ pt_BR:
     bulk_invite_succeeded:
       title: "Convites em massa realizados"
       subject_template: "Seus convites foram enviados com êxito."
-      text_body_template: "Seu arquivo de convites em massa para usuários(as) foi processado: %{sent} convites enviados por e-mail."
     bulk_invite_failed:
       title: "Os convites em massa falharam"
       subject_template: "Seus convites em massa não foram enviados, entre em contato com os(as) moderadores(as)."
-      text_body_template: |
-        Seu arquivo de convites em massa para usuários(as) foi processado, %{sent} convites foram enviados por e-mail com %{failed} erro(s).
-
-        Aqui está o registro:
-
-        ``` texto
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Adicionado ao grupo como proprietário(a)"
       subject_template: "Você foi adicionado(a) como um(a) dos(as) proprietários(as) do grupo %{group_name}"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 971b084844..059eea8105 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1317,7 +1317,6 @@ ro:
       subject_template: "Restaurare eşuată"
     bulk_invite_succeeded:
       subject_template: "Invitația multiplă a fost procesată cu succes"
-      text_body_template: "Fișierul tău de invitații multiple a fost procesat, %{sent} (de) invitații trimise."
     bulk_invite_failed:
       subject_template: "Invitația multiplă a fost procesată cu erori"
     csv_export_failed:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index e1ed333976..cb06bc23a5 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -277,6 +277,7 @@ ru:
     max_redemptions_limit: "Значение должно быть в интервале от 2 до %{max_limit}."
   topic_invite:
     failed_to_invite: "Пользователь не может быть приглашён в эту тему без членства в одной из следующих групп: %{group_names}."
+    not_pm: "Вы можете приглашать только в личные сообщения."
     user_exists: "К сожалению, этот пользователь уже был приглашён. Вы можете пригласить пользователя в тему только один раз."
     muted_topic: "Извините, но этот пользователь отключил возможность получать уведомления для этой темы."
     receiver_does_not_allow_pm: "Извините, но этот пользователь не позволяет вам отправлять ему личные сообщения."
@@ -1778,7 +1779,8 @@ ru:
     max_topics_per_day: "Максимальное количество тем, которое пользователь может создать за один день."
     max_personal_messages_per_day: "Максимальное количество новых личных сообщений, которые пользователь может создать за день."
     max_invites_per_day: "Максимальное количество приглашений, которое пользователь может отправить за один день."
-    max_topic_invitations_per_day: "Максимальное количество приглашений в тему, которое может отправить пользователь за один день."
+    max_topic_invitations_per_day: "Максимальное количество приглашений в тему, которое может отправить пользователь в течение дня."
+    max_topic_invitations_per_minute: "Максимальное количество приглашений в тему, которое может отправить пользователь в течение одной минуты."
     max_logins_per_ip_per_hour: "Максимальное количество входов в систему с одного IP-адреса в течение часа"
     max_logins_per_ip_per_minute: "Максимальное количество входов в систему с одного IP-адреса в течение минуты"
     max_post_deletions_per_minute: "Максимальное количество сообщений, которые пользователь может удалить в минуту. Установите значение в 0, чтобы отключить удаление сообщений."
@@ -2937,15 +2939,20 @@ ru:
     bulk_invite_succeeded:
       title: "Массовое приглашение"
       subject_template: "Массовое приглашение пользователей успешно выполнено"
-      text_body_template: "Ваш файл для массового приглашения пользователей был успешно обработан, отправлено приглашений: %{sent}."
+      text_body_template: |
+        Файл массового приглашения пользователей успешно обработан, приглашений отправлено: %{sent} , пропущено: %{skipped} , выдано предупреждений: %{warnings}.
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "Не удалось выполнить массовое приглашение"
       subject_template: "Массовое приглашение пользователей выполнено с ошибками"
       text_body_template: |
-        Ваш файл для массового приглашения пользователей был обработан, %{sent} приглашений отправлено с ошибкой %{failed}.
+        Файл массового приглашения пользователей был обработан, приглашений отправлено: %{sent} , пропущено: %{skipped} , выдано предупреждений: %{warnings}, возникло ошибок: %{failed}.
 
-        Вот журнал:
-        ```text %{logs}
+        ``` text
+        %{logs}
         ```
     user_added_to_group_as_owner:
       title: "Добавление в группу в качестве владельца"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index d60fd14704..f5c5fdab8c 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -1167,7 +1167,6 @@ sk:
       subject_template: "Obnova zlyhala"
     bulk_invite_succeeded:
       subject_template: "Zpracovanie pozvania viacerých používateľov bolo úspešné"
-      text_body_template: "Váš súbor na hromadné pozvanie používateľov bol zpracovaný, emailom bolo poslaných %{sent} prihlášok."
     bulk_invite_failed:
       subject_template: "Zpracovanie pozvania viacerých používateľov dopadlo s chybami"
     csv_export_failed:
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 413a89a24e..2d2d5f618d 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1051,18 +1051,9 @@ sl:
     bulk_invite_succeeded:
       title: "Množično povabilo je uspelo"
       subject_template: "Množično povabilo uporabnikov je uspelo"
-      text_body_template: "Vaše datoteka za množično povabilo uporabnikov je bila obdelana, %{sent} poslanih povabil."
     bulk_invite_failed:
       title: "Množično povabilo ni uspelo"
       subject_template: "Množično pobvabilo uporabnikov je končalo z napakami"
-      text_body_template: |
-        Vaša datoteka za množično povabilo uporabnikov je bila obdelana, %{sent} poslanih povabil z %{failed} napakami.
-
-        Tukaj je dnevnik napak:
-
-        ``` text
-        %{logs}
-        ```
     csv_export_succeeded:
       title: "CSV izvoz uspel"
       subject_template: "[%{export_title}] Izvoz podatkov končan"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 11b7839321..aa8cb90b12 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -941,7 +941,6 @@ sq:
       subject_template: "Restore failed"
     bulk_invite_succeeded:
       subject_template: "Bulk user invite processed successfully"
-      text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
     bulk_invite_failed:
       subject_template: "Bulk user invite processed with errors"
     csv_export_failed:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index cf2737ff80..6d405c7133 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -200,6 +200,7 @@ sv:
       page_publishing_requirements: "Sidpublicering kan inte aktiveras om säkra medier är aktiverade."
       s3_backup_requires_s3_settings: "Du kan inte använda S3 som säkerhetskopieringsplats innan du har angivit '%{setting_name}'."
       s3_bucket_reused: "Du kan inte använda samma behållare för 's3_upload_bucket' och 's3_backup_bucket'. Välj en annan behållare eller använd en annan sökväg för varje behållare."
+      secure_uploads_requirements: "S3-uppladdningar måste ha aktiverats innan du aktiverar säkra uppladdningar."
       share_quote_facebook_requirements: "Du måste ange ett Facebook-app-id för att möjliggöra delning av citat på Facebook."
       second_factor_cannot_enforce_with_socials: "Du kan inte tvinga 2FA med sociala inloggningar aktiverade. Du måste först inaktivera inloggning via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan inte genomdriva 2FA om lokala inloggningar är inaktiverade."
@@ -246,6 +247,9 @@ sv:
       invalid_access: "Du har inte behörighet att visa den efterfrågade resursen."
     requires_groups: "Inbjudan sparades inte eftersom det angivna ämnet är otillgängligt. Lägg till en av följande grupper: %{groups}."
     domain_not_allowed: "Din e-post kan inte användas för att lösa in denna inbjudan."
+    max_redemptions_allowed_one: "för e-postinbjudningar ska vara 1."
+    redemption_count_less_than_max: "bör vara mindre än %{max_redemptions_allowed}."
+    email_xor_domain: "E-post- och domänfält är inte tillåtna samtidigt"
   bulk_invite:
     file_should_be_csv: "De uppladdade filerna skall vara i csv-format."
     max_rows: "De första %{max_bulk_invites} inbjudningarna har skickats ut. Prova att dela upp filen i mindre delar."
@@ -255,6 +259,7 @@ sv:
     max_redemptions_limit: "bör vara mellan 2 och %{max_limit}."
   topic_invite:
     failed_to_invite: "Användaren kan inte bjudas in till detta ämne utan gruppmedlemskap i någon av de följande grupperna: %{group_names}."
+    not_pm: "Du kan bara bjuda in till privata meddelanden."
     user_exists: "Tyvärr har den användaren redan bjudits in. Du kan endast bjuda in en användare till ett ämne en gång."
     muted_topic: "Tyvärr tystade den användaren detta ämne."
     receiver_does_not_allow_pm: "Tyvärr tillåter inte den användaren att du skickar privata meddelanden till dem."
@@ -1477,6 +1482,8 @@ sv:
     summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'"
     summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta detta ämne'"
     summary_timeline_button: "Visa en \"Sammanfatta\"-knapp på tidslinjen"
+    enable_personal_messages: "UTFASAT, använd inställningen \"personal message enabled groups\" istället. Tillåt användare med förtroendenivå 1 (konfigurera genom minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen alltid kan skicka meddelanden oavsett."
+    personal_message_enabled_groups: "Tillåt användare inom dessa grupper att skapa meddelanden och svara på meddelanden. Förtroendenivågrupper omfattar alla förtroendenivåer över det numret, om till exempel förtroendenivå_1 väljs tillåts också användare på förtroendenivå_2, 3, 4 att skicka PM. Observera att personal alltid kan skicka meddelanden oavsett vad."
     enable_system_message_replies: "Tillåter användare att svara på systemmeddelanden, även om personliga meddelanden har inaktiverats"
     enable_chunked_encoding: "Aktivera packade kodningssvar (chunked) från servern. Den här funktionen fungerar på de flesta inställningar, men vissa proxyservrar kan buffra, vilket gör att svaren fördröjs"
     long_polling_base_url: "URL som används för long polling (när en CDN levererar dynamiskt innehåll, kontrollera att det här är inställt till origin pull) se: http://origin.site.com"
@@ -1668,6 +1675,7 @@ sv:
     max_personal_messages_per_day: "Max antal nya privatmeddelandeämnen en användare kan skapa per dag."
     max_invites_per_day: "Max antal inbjudningar en användare kan skicka per dag."
     max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag."
+    max_topic_invitations_per_minute: "Max. antal ämnesinbjudningar en användare kan skicka per minut."
     max_logins_per_ip_per_hour: "Maximalt antal inloggningar tillåtna per IP-adress per timme"
     max_logins_per_ip_per_minute: "Maximalt antal inloggningar tillåtna per IP-adress per minut"
     max_post_deletions_per_minute: "Maximalt antal inlägg som en användare kan radera per minut. Ställ in till 0 för att inaktivera inläggsraderingar."
@@ -1746,6 +1754,7 @@ sv:
     min_trust_to_edit_wiki_post: "Lägsta förtroendenivå som krävs för att redigera inlägg markerade som wiki."
     min_trust_to_edit_post: "Lägsta förtroendenivå som krävs för att skapa ett inlägg."
     min_trust_to_allow_self_wiki: "Lägsta förtroendenivå som krävs för att göra användares egna inlägg wiki."
+    min_trust_to_send_messages: "UTFASAT, använd inställningen \"personal message enabled group\" istället. Den lägsta förtroendenivån som krävs för att skapa nya personliga meddelanden."
     min_trust_to_send_email_messages: "Lägsta förtroendenivå som krävs för att skicka privata meddelanden via e-post."
     min_trust_to_flag_posts: "Lägsta förtroendenivå som krävs för att flagga ett inlägg."
     min_trust_to_post_links: "Lägsta förtroendenivå som krävs för att inkludera länkar i ett inlägg."
@@ -1870,6 +1879,7 @@ sv:
     raw_email_max_length: "Hur många tecken ska lagras för inkommande e-post."
     raw_rejected_email_max_length: "Hur många tecken ska lagras för avvisad inkommande e-post."
     delete_rejected_email_after_days: "Ta bort avvisade e-postmeddelanden som är äldre än (n) dagar."
+    require_change_email_confirmation: "Kräv att användare som inte är anställda bekräftar sin gamla e-postadress innan de ändrar den. Gäller inte personalanvändare, de behöver alltid bekräfta sin gamla e-postadress."
     manual_polling_enabled: "Flytta e-post med hjälp av API för e-postsvar."
     pop3_polling_enabled: "Poll via POP3 för e-postsvar."
     pop3_polling_ssl: "Använd SSL vid anslutning till POP3-servern. (Rekommenderat)"
@@ -1948,6 +1958,7 @@ sv:
     enable_mobile_theme: "Mobila enheter använder ett mobilvänligt tema, med möjligheten att byta till standardsidan. Inaktivera detta om du vill använda en anpassad stilmall som är helt responsiv."
     dominating_topic_minimum_percent: "Procentandel av antalet inlägg som en användare måste skriva i ett ämne innan de påminns om att de är för dominerande."
     disable_avatar_education_message: "Inaktivera hjälpmeddelande för byte av avatar."
+    pm_warn_user_last_seen_months_ago: "När du skapar ett nytt PM varnas användare om det är mer än n månader sedan målmottagaren sågs till."
     suppress_uncategorized_badge: "Visa inte utmärkelsen för okategoriserade ämnen i ämneslistan."
     header_dropdown_category_count: "Hur många kategorier kan visas i rubrikens rullgardinsmeny."
     permalink_normalizations: "Tillämpa följande regex innan matchning av permalänkar, till exempel: /(topic.*)\\?.*/\\1 kommer att rensa bort söksträngar från ämnesvägen. Formatet är regex+sträng, använd \\1 osv. för att komma åt grupperingar."
@@ -1995,7 +2006,12 @@ sv:
     delete_merged_stub_topics_after_days: "Antal dagar att vänta innan helt sammanslagna stub-ämnen raderas automatiskt. Ställ in till 0 för att aldrig radera stub-ämnen."
     bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
     prevent_anons_from_downloading_files: "Förhindra att anonyma användare hämtar bilagor."
+    secure_media: 'UTFASAT: Använd inställningen secure_uploads istället, kommer att tas bort i Discourse 3.0.'
+    secure_uploads: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf, zip med flera). Om "login required" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Se detaljer i <a target="_blank" href="https://meta.discourse.org/t/-/140017">ämnet för säkra uppladdningar i Meta</a>.'
     secure_media_allow_embed_images_in_emails: "UTFASAT: Använd secure_uploads_allow_embed_images_in_emails, kommer att tas bort i Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "Gör det möjligt att bädda in säkra bilder som normalt skulle begränsas i e-postmeddelanden, under förutsättning att deras storlek är mindre än inställningen för säkra medias maxstorlek för inbäddning av bild, 'secure uploads max email embed image size kb'."
+    secure_media_max_email_embed_image_size_kb: "UTFASAT: Använd secure_uploads_max_email_embed_image_size_kb, kommer att tas bort i Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "Storleksbegränsningen för säkra bilder som kommer att bäddas in i e-postmeddelanden om inställningen för att tillåta inbäddningar för säkra uppladdningar i e-post är aktiverad, 'secure uploads allow embed in emails' . Om inställningen inte är aktiverad har den här inställningen ingen effekt."
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
     enable_emoji: "Aktivera emoji"
     enable_emoji_shortcuts: "Vanlig smileytext som :): p :( kommer att konverteras till emojier"
@@ -2089,6 +2105,7 @@ sv:
     heading_font: "Typsnitt som används för rubriker på webbplatsen. Teman kan åsidosätta via CSS-anpassade egenskapen `--heading-font-family`."
     enable_sitemap: "Skapa en webbplatskarta för din webbplats och inkludera den i filen robots.txt."
     sitemap_page_size: "Antal webbadresser som ska inkluderas på varje webbplatskartsida. Max 50.000"
+    enable_user_status: "(experimentell) Tillåt användare att ställa in anpassat statusmeddelande (emoji + beskrivning)."
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Den bör begränsas till 12 tecken."
     dashboard_hidden_reports: "Tillåt att de specificerade rapporterna döljs från översiktspanelen."
     dashboard_visible_tabs: "Välj vilka flikar på översiktspanelen som ska vara synliga."
@@ -2134,6 +2151,7 @@ sv:
       reply_by_email_address_is_empty: "Du måste ställa in en 'reply by email address' innan du aktiverar svar via e-post."
       email_polling_disabled: "Du måste aktivera antingen manuell polling eller POP3-polling innan du aktiverar svar via e-post."
       user_locale_not_enabled: "Du måste först aktivera 'allow user locale' innan du aktiverar den här inställningen."
+      personal_message_enabled_groups_invalid: "Du måste ange minst en grupp för den här inställningen. Om du inte vill att någon förutom personal ska skicka PM, välj personalgrupp."
       invalid_regex: "Vanligt uttryck är ogiltigt eller inte tillåtet."
       invalid_regex_with_message: "Det har uppstått ett fel i regex '%{regex}': %{message}"
       email_editable_enabled: "Du måste inaktivera 'e-post kan redigeras' innan du aktiverar den här inställningen."
@@ -2741,12 +2759,17 @@ sv:
     bulk_invite_succeeded:
       title: "Massinbjudan lyckades"
       subject_template: "Massinbjudan av användare behandlades utan fel"
-      text_body_template: "Din massinbjudan av användare behandlades, %{sent} inbjudningar skickades."
+      text_body_template: |
+        Din fil för massinbjudan av användare behandlades, %{sent} inbjudningar skickades, %{skipped} hoppades över, med %{warnings} varning(ar).
+
+        `` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "Massinbjudan misslyckades"
       subject_template: "Massinbjudan av användare genererade fel"
       text_body_template: |
-        Din inbjudningsfil för användare per bulk behandlades, %{sent}inbjudningar skickades med %{failed}fel .
+        Din fil för massinbjudan av användare behandlades, %{sent} inbjudningar skickades, %{skipped} hoppades över, med %{warnings} varning(ar) och %{failed} fel.
 
         Här är loggen:
 
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 979f53886a..d6b8d0b8e4 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -1207,7 +1207,6 @@ sw:
     bulk_invite_succeeded:
       title: "Mualiko wa Watumiaji Wengi Umefanikiwa"
       subject_template: "Mualiko wa Watumiaji Wengi umefanikiwa"
-      text_body_template: "Mualiko wa Watumiaji Wengi wa faili umefanyiwa uchakataji, mialiko %{sent} imetumwa."
     bulk_invite_failed:
       title: "Mualiko wa Watumiaji Wengi Umeshindikana"
       subject_template: "Mualiko wa Watumiaji Wengi umepata hitilafu"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 01cd18c13d..7abe0b142b 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -130,6 +130,7 @@ tr_TR:
         unsubscribe_not_allowed: "Bu kullanıcı için e-posta aboneliği iptal edilmiş."
         email_not_allowed: "E-posta adresi izin verilenler listesinde olmadığında veya engellenenler listesinde olduğunda gerçekleşir."
       unrecognized_error: "Bilinmeyen Hata"
+    secure_uploads_placeholder: "Düzeltildi: Bu sitede güvenli yükleme modu etkin, konuyu ziyaret edin veya ekli yüklemeleri görmek için Medyayı Görüntüle'yi tıklayın."
     view_redacted_media: "Medyayı Görüntüle"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -199,6 +200,7 @@ tr_TR:
       page_publishing_requirements: "Güvenli ortam etkinleştirilirse sayfa yayınlama etkinleştirilemez."
       s3_backup_requires_s3_settings: "'%{setting_name} verisini sağlamadıysanız S3'ü yedekleme konumu olarak kullanamazsınız."
       s3_bucket_reused: "Aynı sepeti 's3_upload_bucket' ve 's3_backup_bucket' için kullanamazsınız. Farklı bir sepet seçin veya her sepet için farklı bir yol kullanın."
+      secure_uploads_requirements: "Güvenli yükleme modunu etkinleştirilmeden önce S3 yüklemeleri etkinleştirilmelidir."
       share_quote_facebook_requirements: "Facebook paylaşımını etkinleştirmek için bir Facebook uygulaması kimliği ayarlamanız gerekir."
       second_factor_cannot_enforce_with_socials: "Sosyal oturum açma etkinken 2FA'yı zorunlu kılamazsınız. Önce şu yollarla oturum açmayı devre dışı bırakmalısınız: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Yerel girişler devre dışı bırakılmışsa 2FA'yı uygulayamazsınız."
@@ -241,6 +243,9 @@ tr_TR:
       invalid_access: "İstenilen kaynağı görüntüleyebilmeniz için izniniz yok."
     requires_groups: "Belirtilen konuya erişilemediğinden davet kaydedilmedi. Aşağıdaki gruplardan birini ekleyin: %{groups}."
     domain_not_allowed: "E-postanız bu daveti değerlendirmek için kullanılamaz."
+    max_redemptions_allowed_one: "e-posta davetleri için 1 olmalıdır."
+    redemption_count_less_than_max: "%{max_redemptions_allowed} değerinden küçük olmalıdır."
+    email_xor_domain: "E-posta ve alan adı alanları aynı anda kullanılamaz"
   bulk_invite:
     file_should_be_csv: "Yüklenen dosya csv formatında olmalıdır."
     max_rows: "İlk olarak %{max_bulk_invites} davetiyeleri gönderildi. Dosyayı daha küçük parçalara bölmeyi deneyin."
@@ -250,6 +255,7 @@ tr_TR:
     max_redemptions_limit: "2 ile %{max_limit} arasında olmalıdır."
   topic_invite:
     failed_to_invite: "Kullanıcı, aşağıdaki gruplardan birinde grup üyeliği olmadan bu konuya davet edilemez: %{group_names}."
+    not_pm: "Sadece özel mesajlara davet edebilirsiniz."
     user_exists: "Üzgünüz, bu kullanıcı zaten davet edildi. Konuya yalnızca bir kullanıcı davet edebilirsiniz."
     muted_topic: "Üzgünüz, o kullanıcı bu konuyu sessize aldı."
     receiver_does_not_allow_pm: "Üzgünüz, bu kullanıcı onlara özel ileti göndermenize izin vermiyor."
@@ -1642,6 +1648,7 @@ tr_TR:
     max_personal_messages_per_day: "Bir kullanıcının günlük oluşturabileceği maksimum yeni kişisel ileti konusu sayısı."
     max_invites_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla davet sayısı."
     max_topic_invitations_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla başlık daveti sayısı."
+    max_topic_invitations_per_minute: "Bir dakikada, bir kullanıcının yollayabileceği en fazla başlık daveti sayısı."
     max_logins_per_ip_per_hour: "Her IP adresi için saat başına izin verilen maksimum giriş sayısı"
     max_logins_per_ip_per_minute: "Her IP adresi için dakika başına izin verilen maksimum giriş sayısı"
     max_post_deletions_per_minute: "Bir kullanıcının dakikada silebileceği maksimum gönderi sayısı. Gönderi silme işlemlerini devre dışı bırakmak için 0 girin."
@@ -1840,6 +1847,7 @@ tr_TR:
     raw_email_max_length: "Gelen e-posta için kaç karakter saklanması gerektiği."
     raw_rejected_email_max_length: "Reddedilmiş gelen e-posta için kaç karakter saklanması gerektiği."
     delete_rejected_email_after_days: "(n) günden daha eski reddedilen e-postaları silin."
+    require_change_email_confirmation: "Personel dışı kullanıcıların, değiştirmeden önce eski e-posta adreslerini onaylamalarını isteyin. Personel kullanıcıları için geçerli değildir, çünkü onların zaten her zaman eski e-posta adreslerini onaylamaları gerekir."
     manual_polling_enabled: "E-posta yanıtları için API'yı kullanarak e-postaları aktarın."
     pop3_polling_enabled: "E-posta yanıtları için POP3 üzerinden sorgula"
     pop3_polling_ssl: "POP3 sunucusuna bağlanırken SSL kullanın. (Tavsiye edilir)"
@@ -1913,6 +1921,7 @@ tr_TR:
     enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir biçim kullanıyorsanız bunu devre dışı bırakın."
     dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir."
     disable_avatar_education_message: "Avatar değiştirme için eğitici iletileri kapat."
+    pm_warn_user_last_seen_months_ago: "Yeni bir PM oluştururken, hedef alıcı n aydan daha uzun bir süre görülmediyse kullanıcıları uyarın."
     suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme."
     header_dropdown_category_count: "Kaç kategori aşağı açılır menüde gösterilebilir."
     permalink_normalizations: "Kalıcı bağlantıları eşleştirmeden önce aşağıdaki regex'i uygula, mesela: /(\\/topic.*)\\?.*/\\1 konu yönlendirmelerindeki sorgu dizelerini kaldırır. Formatlama regex+string, yakalamalara erişmek \\1 vs."
@@ -1955,6 +1964,7 @@ tr_TR:
     delete_drafts_older_than_n_days: "(n) günden eski taslakları sil."
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
     prevent_anons_from_downloading_files: "Anonim kullanıcıların ekleri indirmesini önle."
+    secure_media: 'KALDIRILDI: Bunun yerine secure_uploads ayarını kullanın, Discourse 3.0''da kaldırılacaktır.'
     slug_generation_method: "Slug üretim yöntemi seçin. 'kodlanmış' seçeneği yüzde kodlamalı metin oluşturur. 'hiçbiri' seçeneği slug'ı devre dışı bırakır."
     enable_emoji: "Emojiyi etkinleştir"
     enable_emoji_shortcuts: ":): p :( gibi yaygın gülen yüz ifadeleri emojilere dönüştürülecek"
@@ -2588,20 +2598,9 @@ tr_TR:
     bulk_invite_succeeded:
       title: "Toplu Davet Başarılı"
       subject_template: "Toplu davet gönderimi başarıyla tamamlandı"
-      text_body_template: "Toplu davet dosyanız işlendi, %{sent} davetiye gönderildi."
     bulk_invite_failed:
       title: "Toplu Davet Başarısız Oldu"
       subject_template: "Toplu davet gönderiminde hata oluştu"
-      text_body_template: |
-        Toplu davet dosyanız işlendi, %{sent} davetiye %{failed} hata(lar) ile gönderildi.
-
-        Kayıtları aşağıda bulabilirsiniz:
-
-        ```
-        ``` text
-        %{logs}
-
-        ```
     user_added_to_group_as_owner:
       title: "Grup Sahibi Olarak Eklendi"
       subject_template: "%{group_name} grubuna grubun sahibi olarak eklendiniz"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 5e18d0ba2d..c8f9492a4b 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -2712,7 +2712,6 @@ uk:
     bulk_invite_succeeded:
       title: "Запрошення вдалося успішно"
       subject_template: "Масове запрошення користувачів оброблено успішно"
-      text_body_template: "Ваш файл для масового запршення користувачів було успішно оброблено, віправлено запрошень - %{sent}."
     bulk_invite_failed:
       title: "Помилка масового запрошення"
       subject_template: "Масове запрошення користувачів оброблено з помилками"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 53d19f8ae6..6cf62f22d9 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -2395,18 +2395,9 @@ ur:
     bulk_invite_succeeded:
       title: "بَلک مدعو کامیاب"
       subject_template: "بَلک صارف دعوت ناموں پر کامیابی سے عملدرآمد ہو گیا"
-      text_body_template: "آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں۔"
     bulk_invite_failed:
       title: "بَلک مدعو ناکام"
       subject_template: "بَلک صارف دعوت ناموں پر خرابں کے ساتھ عملدرآمد ہو گیا"
-      text_body_template: |
-        آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں اور %{failed} خرابی(وں) کا سامنا کرنا پڑا۔
-
-        یہ لاگ ہے:
-
-        ``` text
-        %{logs}
-        ```
     csv_export_succeeded:
       title: "CSV ایکسپورٹ کامیاب"
       subject_template: "[%{export_title}] ڈَیٹا ایکسپورٹ مکمل"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index e97f01d7e7..b5dc212931 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -1582,18 +1582,9 @@ vi:
     bulk_invite_succeeded:
       title: "Mời hàng loạt thành công"
       subject_template: "Mời thành viên hàng loạt đã được thực hiện thành công"
-      text_body_template: "File mời thành viên hàng loạt của bạn đã được thực hiện, %{sent} lời mời đã được gửi."
     bulk_invite_failed:
       title: "Mời hàng loạt không thành công"
       subject_template: "Có lỗi khi thực hiện mời thành viên hàng loạt"
-      text_body_template: |
-        Tệp mời người dùng hàng loạt của bạn đã được xử lý, %{sent} lời mời được gửi qua thư với %{failed} (các) lỗi.
-
-        Đây là nhật ký:
-
-        ``` text
-        %{logs}
-        ```
     user_added_to_group_as_owner:
       title: "Đã thêm vào Nhóm với tư cách là Chủ sở hữu"
       subject_template: "Bạn đã được thêm vào với tư cách là chủ sở hữu của nhóm %{group_name}"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index ad7817e073..e72a0778e6 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -249,6 +249,7 @@ zh_CN:
     max_redemptions_limit: "应介于 2 和 %{max_limit} 之间。"
   topic_invite:
     failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入此话题：%{group_names}。"
+    not_pm: "你只能邀请接收私人消息。"
     user_exists: "抱歉，该用户已被邀请。您一次只可以邀请一个用户加入话题。"
     muted_topic: "抱歉，该用户已将此话题设为免打扰。"
     receiver_does_not_allow_pm: "抱歉，该用户不允许您向他们发送私信。"
@@ -1621,6 +1622,7 @@ zh_CN:
     max_personal_messages_per_day: "用户每天可以创建的新个人消息话题的最大数量。"
     max_invites_per_day: "用户每天可以发送的最大邀请数。"
     max_topic_invitations_per_day: "用户每天可以发送的最大话题邀请数。"
+    max_topic_invitations_per_minute: "用户每分钟可发送的最大话题邀请数。"
     max_logins_per_ip_per_hour: "每个 IP 地址每小时允许的最大登录次数"
     max_logins_per_ip_per_minute: "每个 IP 地址每分钟允许的最大登录次数"
     max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。设置为 0 将禁用帖子删除。"
@@ -1952,6 +1954,10 @@ zh_CN:
     bootstrap_mode_min_users: "禁用引导模式所需的最小用户数（设置为 0 将禁用）"
     prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
     secure_media: '已弃用：改用 secure_uploads 设置，将在 Discourse 3.0 中删除。'
+    secure_media_allow_embed_images_in_emails: "已弃用：使用 secure_uploads_allow_embed_images_in_emails，将在 Discourse 3.0 中删除。"
+    secure_uploads_allow_embed_images_in_emails: "如果小于 'secure media max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全上传。"
+    secure_media_max_email_embed_image_size_kb: "已弃用：使用 secure_uploads_max_email_embed_image_size_kb，将在 Discourse 3.0 中删除。"
+    secure_uploads_max_email_embed_image_size_kb: "如果启用了 'secure media allow embed in emails' 设置，将被嵌入到电子邮件的安全上传的大小限制；如果不启用，则此设置无效。"
     slug_generation_method: "选择一种缩略名生成方法。'encoded' 将生成百分比编码字符串。'none' 将完全禁用缩略名。"
     enable_emoji: "启用表情符号"
     enable_emoji_shortcuts: "常见的笑脸文字（如 :) :p :(）将被转换为表情符号"
@@ -2709,16 +2715,21 @@ zh_CN:
     bulk_invite_succeeded:
       title: "批量邀请成功"
       subject_template: "批量用户邀请处理成功"
-      text_body_template: "您的批量用户邀请文件已被处理，发送了 %{sent} 个邀请。"
+      text_body_template: |
+        你的批量用户邀请文件已被处理， %{sent}个邀请已发送，其中 %{skipped} 个跳过和 %{warnings} 个警告。
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "批量邀请失败"
       subject_template: "批量用户邀请已被处理，但存在错误"
       text_body_template: |
-        您的批量用户邀请已被处理，%{sent} 个邀请已发送，其中 %{failed} 个存在错误。
+        你的批量用户邀请文件已被处理， %{sent}个邀请已发送，其中 %{skipped} 个跳过， %{warnings} 个警告和 %{failed} 个错误。
 
-        以下为日志：
+        下面是日志：
 
-        ```text
+        ``` text
         %{logs}
         ```
     user_added_to_group_as_owner:
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index f1fcc49aca..9771a35885 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1913,18 +1913,9 @@ zh_TW:
     bulk_invite_succeeded:
       title: "批量邀請成功"
       subject_template: "批次使用者邀請已完成處理"
-      text_body_template: "你的批次使用者邀請已經完成，寄出 %{sent} 封邀請郵件。"
     bulk_invite_failed:
       title: "批量邀請失敗"
       subject_template: "批次使用者邀請處理已經完成，發生了些錯誤"
-      text_body_template: |
-        大量邀請已經完成，發出了 %{sent} 個邀請並且 %{failed} 個失敗。
-
-        查看系統日誌（log）：
-
-        ```
-        %{logs}
-        ```
     csv_export_succeeded:
       title: "CSV 檔匯出成功"
       subject_template: "[%{export_title}] 資料匯出已完成"

From 4d525a70be26671494d0888410451be87572b62f Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 11 Oct 2022 11:33:07 -0300
Subject: [PATCH 107/332] DEV: Increase nginx proxy buffer size (#18530)

* DEV: Increase nginx proxy buffer size

This is needed so we can reland the patch to move our asset preloading
from link tags in the response document to response headers.
---
 config/nginx.sample.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 970f845ba0..99f05f075f 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -14,8 +14,10 @@ upstream discourse {
 # max_size limits the size of the cache
 proxy_cache_path /var/nginx/cache inactive=1440m levels=1:2 keys_zone=one:10m max_size=600m;
 
-# see: https://meta.discourse.org/t/x/74060
-proxy_buffer_size 8k;
+# Increased from the default value to acommodate large cookies during oAuth2 flows
+# like in https://meta.discourse.org/t/x/74060 and large CSP and Link (preload) headers
+proxy_buffer_size 16k;
+proxy_buffers 4 16k;
 
 # If you are going to use Puma, use these:
 #

From ac9fbb56a4b47eb35f10cf62cea7bfb23f18d2e6 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Tue, 11 Oct 2022 18:33:09 +0300
Subject: [PATCH 108/332] DEV: Improve UX for user menu tabs when they're empty
 (#18520)

This commit adds more helpful/education messages that show up in the replies and "other notifications" tabs when they're empty. Internal topic: t/76879.
---
 .../other-notifications-list-empty-state.hbs  | 10 ++++++
 .../user-menu/other-notifications-list.js     |  9 +++---
 .../user-menu/replies-notifications-list.js   |  4 +++
 .../other-notifications-list-test.js          | 31 +++++++++++++++++++
 .../replies-notifications-list-test.js        | 31 +++++++++++++++++++
 config/locales/client.en.yml                  |  3 ++
 6 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list-empty-state.hbs
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/user-menu/other-notifications-list-test.js
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/user-menu/replies-notifications-list-test.js

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list-empty-state.hbs b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list-empty-state.hbs
new file mode 100644
index 0000000000..e9b156afac
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list-empty-state.hbs
@@ -0,0 +1,10 @@
+<div class="empty-state">
+  <span class="empty-state-title">
+    {{i18n "user.no_other_notifications_title"}}
+  </span>
+  <div class="empty-state-body">
+    <p>
+      {{html-safe (i18n "user.no_other_notifications_body")}}
+    </p>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
index 6b064e7f3c..7cb132b583 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
@@ -1,15 +1,14 @@
 import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
-import { inject as service } from "@ember/service";
 
 export default class UserMenuOtherNotificationsList extends UserMenuNotificationsList {
-  @service currentUser;
-  @service siteSettings;
-  @service site;
-
   get dismissTypes() {
     return this.filterByTypes;
   }
 
+  get emptyStateComponent() {
+    return "user-menu/other-notifications-list-empty-state";
+  }
+
   dismissWarningModal() {
     return null;
   }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
index 8d4134c870..1773d5651a 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
@@ -8,4 +8,8 @@ export default class UserMenuRepliesNotificationsList extends UserMenuNotificati
   dismissWarningModal() {
     return null;
   }
+
+  get emptyStateComponent() {
+    return "user-menu/notifications-list-empty-state";
+  }
 }
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/other-notifications-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/other-notifications-list-test.js
new file mode 100644
index 0000000000..0798714513
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/other-notifications-list-test.js
@@ -0,0 +1,31 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import I18n from "I18n";
+
+module(
+  "Integration | Component | user-menu | other-notifications-list",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(() => {
+      pretender.get("/notifications", () => {
+        return response({ notifications: [] });
+      });
+    });
+
+    const template = hbs`<UserMenu::OtherNotificationsList/>`;
+
+    test("empty state when there are no notifications", async function (assert) {
+      await render(template);
+      assert.ok(exists(".empty-state .empty-state-body"));
+      assert.strictEqual(
+        query(".empty-state .empty-state-title").textContent.trim(),
+        I18n.t("user.no_other_notifications_title")
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/replies-notifications-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/replies-notifications-list-test.js
new file mode 100644
index 0000000000..5763702fe9
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/replies-notifications-list-test.js
@@ -0,0 +1,31 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import I18n from "I18n";
+
+module(
+  "Integration | Component | user-menu | replies-notifications-list",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(() => {
+      pretender.get("/notifications", () => {
+        return response({ notifications: [] });
+      });
+    });
+
+    const template = hbs`<UserMenu::RepliesNotificationsList/>`;
+
+    test("empty state when there are no notifications", async function (assert) {
+      await render(template);
+      assert.ok(exists(".empty-state .empty-state-body"));
+      assert.strictEqual(
+        query(".empty-state .empty-state-title").textContent.trim(),
+        I18n.t("user.no_notifications_title")
+      );
+    });
+  }
+);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f9459f5d46..3d391db95d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1141,6 +1141,9 @@ en:
         You will be notified in this panel about activity directly relevant to you, including replies to your topics and posts, when someone <b>@mentions</b> you or quotes you, and replies to topics you are watching. Notifications will also be sent to your email when you haven’t logged in for a while.
         <br><br>
         Look for the %{icon} to decide which specific topics, categories and tags you want to be notified about. For more, see your <a href='%{preferencesUrl}'>notification preferences</a>.
+      no_other_notifications_title: "You don’t have any other notifications yet"
+      no_other_notifications_body: >
+        You will be notified in this panel about other kinds of activity that may be relevant to you - for example, when someone links to or edits one of your posts.
       no_notifications_page_title: "You don’t have any notifications yet"
       no_notifications_page_body: >
         You will be notified about activity directly relevant to you, including replies to your topics and posts, when someone <b>@mentions</b> you or quotes you, and replies to topics you are watching. Notifications will also be sent to your email when you haven’t logged in for a while.

From 356cf358f7a119624681c787f52142e8861bd934 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:49:39 -0500
Subject: [PATCH 109/332] FIX: Change text (#18545)

---
 config/locales/server.de.yml | 2 +-
 config/locales/server.en.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 072a80ec71..e07be0c18d 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -4522,7 +4522,7 @@ de:
               subcategories_with_featured_topics:
                 label: "Unterkategorien mit hervorgehobenen Themen"
       branding:
-        title: "Community Branding"
+        title: "Customize Logos"
         fields:
           logo:
             label: "Hauptlogo"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index eab63f0735..ba19e4c7f3 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -662,7 +662,7 @@ en:
   staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators."
 
   discourse_welcome_topic:
-    title: "Welcome to Discourse"
+    title: "Welcome to our community!"
     body: |
 
       The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It's important!
@@ -4975,7 +4975,7 @@ en:
                 label: "Subcategories with Featured Topics"
 
       branding:
-        title: "Community Branding"
+        title: "Customize Logos"
         fields:
           logo:
             label: "Primary Logo"
@@ -4991,7 +4991,7 @@ en:
             description: "Icon used to represent your site on mobile devices that looks good at larger sizes. Ideally greater than 512x512. Square logo used by default."
 
       corporate:
-        title: "Contact & Org"
+        title: "Your Organization"
 
         fields:
           company_name:

From 6d8405bbd07a1569b879798162df9e6e70801dcf Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 11 Oct 2022 17:15:58 -0400
Subject: [PATCH 110/332] UX: updated styles for user nav with sidebar (#18550)

---
 .../discourse/app/components/user-nav.hbs     |  17 ++-
 .../app/components/user-nav/messages-nav.hbs  |  48 +++---
 .../discourse/app/templates/preferences.hbs   |  45 +++---
 .../discourse/app/templates/user/activity.hbs |  34 ++++-
 .../app/templates/user/notifications.hbs      |  17 ++-
 .../stylesheets/common/base/new-user.scss     | 140 ++++++++++++++----
 .../stylesheets/common/components/navs.scss   |   1 -
 app/assets/stylesheets/desktop/new-user.scss  |   7 +-
 app/assets/stylesheets/mobile/new-user.scss   |  29 +++-
 9 files changed, 239 insertions(+), 99 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 39d13e8d43..6a832c2d89 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -4,14 +4,14 @@
       <li class="summary">
         <LinkTo @route="user.summary">
           {{d-icon "user"}}
-          {{i18n "user.summary.title"}}
+          <span>{{i18n "user.summary.title"}}</span>
         </LinkTo>
       </li>
 
       <li class="user-activity">
         <LinkTo @route="userActivity">
           {{d-icon "stream"}}
-          {{i18n "user.activity_stream"}}
+          <span>{{i18n "user.activity_stream"}}</span>
         </LinkTo>
       </li>
     {{/unless}}
@@ -19,7 +19,8 @@
     {{#if @showNotificationsTab}}
       <li class="user-notifications">
         <LinkTo @route="userNotifications">
-          {{d-icon "bell" class="glyph"}}{{i18n "user.notifications"}}
+          {{d-icon "bell" class="glyph"}}
+          <span>{{i18n "user.notifications"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -28,7 +29,7 @@
       <li class="private-messages">
         <LinkTo @route="userPrivateMessages">
           {{d-icon "far-envelope"}}
-          {{i18n "user.private_messages"}}
+          <span>{{i18n "user.private_messages"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -37,7 +38,7 @@
       <li class="invited">
         <LinkTo @route="userInvited">
           {{d-icon "user-plus"}}
-          {{i18n "user.invited.title"}}
+          <span>{{i18n "user.invited.title"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -46,7 +47,7 @@
       <li class="badges">
         <LinkTo @route="user.badges">
           {{d-icon "certificate"}}
-          {{i18n "badges.title"}}
+          <span>{{i18n "badges.title"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -60,7 +61,7 @@
       <li class="preferences">
         <LinkTo @route="preferences">
           {{d-icon "cog"}}
-          {{i18n "user.preferences"}}
+          <span>{{i18n "user.preferences"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -69,7 +70,7 @@
       <li class="admin">
         <a href={{@user.adminPath}} >
           {{d-icon "wrench"}}
-          {{i18n "admin.user.manage_user"}}
+          <span>{{i18n "admin.user.manage_user"}}</span>
         </a>
       </li>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
index b7aa2a8f31..d88d8089b2 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
@@ -9,35 +9,40 @@
 
   <ul class="messages-nav nav-pills action-list">
     {{#if @isPersonal}}
-      <li>
+      <li class="messages-latest">
         <LinkTo @route="userPrivateMessages.index" @model={{@user}}>
-          {{i18n "categories.latest"}}
+          {{d-icon "envelope"}}
+          <span>{{i18n "categories.latest"}}</span>
         </LinkTo>
       </li>
 
-      <li class="archive">
+      <li class="messages-sent">
         <LinkTo @route="userPrivateMessages.sent" @model={{@user}}>
-          {{i18n "user.messages.sent"}}
+          {{d-icon "reply"}}
+          <span>{{i18n "user.messages.sent"}}</span>
         </LinkTo>
       </li>
 
       {{#if @viewingSelf}}
-        <li class="archive">
+        <li class="messages-new">
           <LinkTo @route="userPrivateMessages.new" @model={{@user}} class="new">
-            {{@newLinkText}}
+            {{d-icon "exclamation-circle"}}
+            <span>{{@newLinkText}}</span>
           </LinkTo>
         </li>
 
-        <li class="archive">
+        <li class="messages-unread">
           <LinkTo @route="userPrivateMessages.unread" @model={{@user}} class="unread">
-            {{@unreadLinkText}}
+            {{d-icon "plus-circle"}}
+            <span>{{@unreadLinkText}}</span>
           </LinkTo>
         </li>
       {{/if}}
 
-      <li class="archive">
+      <li class="messages-archive">
         <LinkTo @route="userPrivateMessages.archive" @model={{@user}}>
-          {{i18n "user.messages.archive"}}
+          {{d-icon "archive"}}
+          <span>{{i18n "user.messages.archive"}}</span>
         </LinkTo>
       </li>
     {{/if}}
@@ -45,28 +50,32 @@
     {{#each @user.groups as |group|}}
       {{#if (and @isGroup (eq @groupFilter group.name))}}
         {{#if @viewingSelf}}
-          <li class="archive">
+          <li class="messages-group-latest">
             <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
-              {{i18n "categories.latest"}}
+              {{d-icon "envelope"}}
+              <span>{{i18n "categories.latest"}}</span>
             </LinkTo>
           </li>
 
-          <li class="archive">
+          <li class="messages-group-new">
             <LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
-              {{@newLinkText}}
+              {{d-icon "exclamation-circle"}}
+              <span>{{@newLinkText}}</span>
             </LinkTo>
           </li>
 
-          <li class="archive">
+          <li class="messages-group-unread">
             <LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
-              {{@unreadLinkText}}
+              {{d-icon "plus-circle"}}
+              <span>{{@unreadLinkText}}</span>
             </LinkTo>
           </li>
         {{/if}}
 
-        <li class="archive">
+        <li class="messages-group-archive">
           <LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
-            {{i18n "user.messages.archive"}}
+            {{d-icon "archive"}}
+            <span>{{i18n "user.messages.archive"}}</span>
           </LinkTo>
         </li>
       {{/if}}
@@ -75,7 +84,8 @@
     {{#if this.displayTags}}
       <li class="tags">
         <LinkTo @route="userPrivateMessages.tags" @model={{@user}}>
-          {{i18n "user.messages.all_tags"}}
+          {{d-icon "tag"}}
+          <span>{{i18n "user.messages.all_tags"}}</span>
         </LinkTo>
       </li>
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index a469349e64..32ea2bf1b5 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -5,71 +5,80 @@
     <ul class="nav-pills action-list">
       <li class="nav-account">
         <LinkTo @route="preferences.account">
-          {{i18n "user.preferences_nav.account"}}
+          {{d-icon "user"}}
+          <span>{{i18n "user.preferences_nav.account"}}</span>
         </LinkTo>
       </li>
       <li class="nav-security">
         <LinkTo @route="preferences.security">
-          {{i18n "user.preferences_nav.security"}}
+          {{d-icon "lock"}}
+          <span>{{i18n "user.preferences_nav.security"}}</span>
         </LinkTo>
       </li>
       <li class="nav-profile">
         <LinkTo @route="preferences.profile">
-          {{i18n "user.preferences_nav.profile"}}
+          {{d-icon "user"}}
+          <span>{{i18n "user.preferences_nav.profile"}}</span>
         </LinkTo>
       </li>
       <li class="nav-emails">
         <LinkTo @route="preferences.emails">
-          {{i18n "user.preferences_nav.emails"}}
+          {{d-icon "envelope"}}
+          <span>{{i18n "user.preferences_nav.emails"}}</span>
         </LinkTo>
       </li>
       <li class="nav-notifications">
         <LinkTo @route="preferences.notifications">
-          {{i18n "user.preferences_nav.notifications"}}
+          {{d-icon "bell"}}
+          <span>{{i18n "user.preferences_nav.notifications"}}</span>
         </LinkTo>
       </li>
       {{#if this.model.can_change_tracking_preferences}}
         <li class="indent nav-categories">
           <LinkTo @route="preferences.categories">
-            {{i18n "user.preferences_nav.categories"}}
+            {{d-icon "folder"}}
+            <span>{{i18n "user.preferences_nav.categories"}}</span>
           </LinkTo>
         </li>
       {{/if}}
       <li class="indent nav-users">
         <LinkTo @route="preferences.users">
-          {{i18n "user.preferences_nav.users"}}
+          {{d-icon "users"}}
+          <span>{{i18n "user.preferences_nav.users"}}</span>
         </LinkTo>
       </li>
       {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
         <li class="indent nav-tags">
           <LinkTo @route="preferences.tags">
-            {{i18n "user.preferences_nav.tags"}}
+            {{d-icon "tag"}}
+            <span>{{i18n "user.preferences_nav.tags"}}</span>
           </LinkTo>
         </li>
       {{/if}}
       <li class="nav-interface">
         <LinkTo @route="preferences.interface">
-          {{i18n "user.preferences_nav.interface"}}
+          {{d-icon "desktop"}}
+          <span>{{i18n "user.preferences_nav.interface"}}</span>
         </LinkTo>
       </li>
 
       {{#if this.siteSettings.enable_experimental_sidebar_hamburger}}
         <li class="indent nav-sidebar">
           <LinkTo @route="preferences.sidebar">
-            {{i18n "user.preferences_nav.sidebar"}}
+            {{d-icon "bars"}}
+            <span>{{i18n "user.preferences_nav.sidebar"}}</span>
           </LinkTo>
         </li>
       {{/if}}
 
-      <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
+      <PluginOutlet @name="user-preferences-nav-under-interface" @connectorTagName="div" @args={{hash model=this.model}} />
 
-      {{#if this.model.userApiKeys}}
-        <li class="nav-apps">
-          <LinkTo @route="preferences.apps">
-            {{i18n "user.preferences_nav.apps"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+      <li class="nav-apps">
+        <LinkTo @route="preferences.apps">
+          {{d-icon "mobile-alt"}}
+          <span>{{i18n "user.preferences_nav.apps"}}</span>
+        </LinkTo>
+      </li>
 
       <PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=this.model}} />
     </ul>
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 9d53a20d0f..51975ad67b 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -3,32 +3,50 @@
 
   <div class="user-navigation user-navigation-secondary">
     <ul class="nav-pills action-list">
-      <DNavigationItem @route="userActivity.index">{{i18n "user.filters.all"}}</DNavigationItem>
-      <DNavigationItem @route="userActivity.topics">{{i18n "user_action_groups.4"}}</DNavigationItem>
-      <DNavigationItem @route="userActivity.replies">{{i18n "user_action_groups.5"}}</DNavigationItem>
+      <DNavigationItem @route="userActivity.index">
+        {{d-icon "stream"}}
+        <span>{{i18n "user.filters.all"}}</span>
+      </DNavigationItem>
+      <DNavigationItem @route="userActivity.topics">
+        {{d-icon "list-ul"}}
+        <span>{{i18n "user_action_groups.4"}}</span>
+      </DNavigationItem>
+      <DNavigationItem @route="userActivity.replies">
+        {{d-icon "reply"}}
+        <span>{{i18n "user_action_groups.5"}}</span>
+      </DNavigationItem>
 
       {{#if this.user.showRead}}
         <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
-          {{i18n "user.read"}}
+          {{d-icon "history"}}
+          <span>{{i18n "user.read"}}</span>
         </DNavigationItem>
       {{/if}}
 
       {{#if this.user.showDrafts}}
         <DNavigationItem @route="userActivity.drafts">
-          {{this.draftLabel}}
+          {{d-icon "pencil-alt"}}
+          <span>{{this.draftLabel}}</span>
         </DNavigationItem>
       {{/if}}
 
       {{#if (gt this.model.pending_posts_count 0)}}
         <DNavigationItem @route="userActivity.pending">
-          {{this.pendingLabel}}
+          {{d-icon "clock"}}
+          <span>{{this.pendingLabel}}</span>
         </DNavigationItem>
       {{/if}}
 
-      <DNavigationItem @route="userActivity.likesGiven">{{i18n "user_action_groups.1"}}</DNavigationItem>
+      <DNavigationItem @route="userActivity.likesGiven">
+        {{d-icon "heart"}}
+        <span>{{i18n "user_action_groups.1"}}</span>
+      </DNavigationItem>
 
       {{#if this.user.showBookmarks}}
-        <DNavigationItem @route="userActivity.bookmarks">{{i18n "user_action_groups.3"}}</DNavigationItem>
+        <DNavigationItem @route="userActivity.bookmarks">
+          {{d-icon "bookmark"}}
+          <span>{{i18n "user_action_groups.3"}}</span>
+        </DNavigationItem>
       {{/if}}
 
       <PluginOutlet @name="user-activity-bottom" @connectorTagName="li" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 15a4c78d2c..32654afb22 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -2,36 +2,41 @@
   <DSection @pageClass="user-notifications" />
 
   <div class="user-navigation user-navigation-secondary">
-    <ul id="navigation-bar" class="messages-nav nav-pills action-list">
+    <ul id="navigation-bar" class="notifications-nav nav-pills action-list">
       <li>
         <LinkTo @route="userNotifications.index">
-          {{i18n "user.filters.all"}}
+          {{d-icon "bell"}}
+          <span>{{i18n "user.filters.all"}}</span>
         </LinkTo>
       </li>
 
       <li>
         <LinkTo @route="userNotifications.responses">
-          {{i18n "user_action_groups.6"}}
+          {{d-icon "reply"}}
+          <span>{{i18n "user_action_groups.6"}}</span>
         </LinkTo>
       </li>
 
       <li>
         <LinkTo @route="userNotifications.likesReceived">
-          {{i18n "user_action_groups.2"}}
+          {{d-icon "heart"}}
+          <span>{{i18n "user_action_groups.2"}}</span>
         </LinkTo>
       </li>
 
       {{#if this.siteSettings.enable_mentions}}
         <li>
           <LinkTo @route="userNotifications.mentions">
-            {{i18n "user_action_groups.7"}}
+            {{d-icon "at"}}
+            <span>{{i18n "user_action_groups.7"}}</span>
           </LinkTo>
         </li>
       {{/if}}
 
       <li>
         <LinkTo @route="userNotifications.edits">
-          {{i18n "user_action_groups.11"}}
+          {{d-icon "pencil-alt"}}
+          <span>{{i18n "user_action_groups.11"}}</span>
         </LinkTo>
       </li>
 
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index 65b3a6abc9..f50fe7e36b 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -1,43 +1,120 @@
 .new-user-wrapper {
+  margin-top: -15px; // temp, can remove margin from sibling element after nav finalized
   .user-navigation {
-    &.user-navigation-secondary {
-      margin-top: 0.5em;
+    --user-navigation__border-width: 4px;
+    .nav-pills {
+      width: 100%;
+      margin: 0;
+      border-bottom: 1px solid var(--primary-low);
+      .d-icon {
+        font-size: var(--font-down-1);
+      }
 
-      .nav-pills {
-        border-bottom: 1px solid var(--primary-low);
+      &.main-nav {
+        @include breakpoint(medium) {
+          li {
+            .d-icon {
+              font-size: var(--font-up-1);
+              margin: 0;
+            }
+            span {
+              display: none;
+            }
+          }
+        }
+
+        .has-sidebar-page & {
+          @include breakpoint(large) {
+            span {
+              display: none;
+            }
+          }
+        }
+      }
+
+      li {
+        flex: 1 1 auto;
+        margin: 0;
+        overflow: hidden;
+        display: flex;
+
+        a {
+          box-sizing: border-box;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          border-bottom: var(--user-navigation__border-width) solid transparent;
+          padding: calc(0.75em + var(--user-navigation__border-width)) 0.5em
+            0.75em;
+          transition: color 0.25s;
+
+          @include breakpoint(extra-large) {
+            font-size: var(--font-0);
+          }
+
+          span {
+            line-height: normal;
+            @include ellipsis;
+          }
+
+          &:hover,
+          &:focus {
+            background: transparent;
+            color: var(--quaternary);
+            border-bottom: var(--user-navigation__border-width) solid
+              var(--quaternary-low);
+          }
+
+          &.active {
+            color: var(--quaternary);
+            background: transparent;
+            border-bottom: var(--user-navigation__border-width) solid
+              var(--quaternary);
+          }
+        }
+      }
+    }
+  }
+
+  .user-navigation-secondary {
+    --user-navigation__border-width: 2px;
+    min-width: 0;
+    margin: 0.5em 0;
+    gap: 0 0.5em;
+
+    .select-kit .select-kit-header {
+      height: 100%;
+      padding: 0.5em 1em;
+      @include breakpoint(large) {
+        font-size: var(--font-down-1);
+      }
+    }
+
+    .category-breadcrumb > li {
+      margin: 0;
+    }
+
+    .navigation-controls {
+      flex-wrap: nowrap;
+      @include breakpoint(large) {
+        font-size: var(--font-down-1);
       }
     }
 
     .nav-pills {
-      width: 100%;
-      border-bottom: 2px solid var(--primary-low);
-      margin: 0;
+      flex: 1 1 auto;
+      font-size: var(--font-down-1);
+      flex-wrap: wrap;
+      justify-content: flex-start;
 
       li {
-        margin: 0;
+        flex: 1 1 auto;
 
         a {
-          display: inline-block;
-          text-align: center;
-          position: relative;
-          border-bottom: 2px solid transparent;
-          padding: 0.5em 1em;
-
-          &.active,
-          &:hover {
-            color: var(--quaternary);
-            background-color: var(--secondary);
-          }
-
-          &.active::after {
-            display: block;
-            content: "";
-            position: absolute;
-            width: 100%;
-            border-bottom: 2px solid var(--quaternary);
-            bottom: -4px;
-            left: 0px;
-          }
+          padding: 0.5em 0.5em
+            calc(0.5em + var(--user-navigation__border-width));
         }
       }
     }
@@ -76,4 +153,9 @@
       }
     }
   }
+
+  .empty-state {
+    padding: 0;
+    margin: 1em 0;
+  }
 }
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 4e0f2b2a52..d808bab78d 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -19,7 +19,6 @@
 
 .nav-pills {
   @extend %nav;
-  @extend .clearfix;
 
   display: flex;
   flex-direction: row;
diff --git a/app/assets/stylesheets/desktop/new-user.scss b/app/assets/stylesheets/desktop/new-user.scss
index dbc615eb9f..f65656ec38 100644
--- a/app/assets/stylesheets/desktop/new-user.scss
+++ b/app/assets/stylesheets/desktop/new-user.scss
@@ -3,9 +3,9 @@
     // Grid layout
     width: 100%;
     display: grid;
-    grid-template-columns: 1fr 5fr;
+    grid-template-columns: 1fr;
     grid-template-rows: auto 1fr;
-    grid-gap: 20px;
+    grid-gap: 0;
 
     .user-navigation-secondary {
       grid-column-start: 1;
@@ -25,7 +25,8 @@
     }
 
     .user-content {
-      margin-top: 1em;
+      padding: 0;
+      margin-top: 2em;
       grid-column-start: 1;
       grid-column-end: 3;
       grid-row-start: 1;
diff --git a/app/assets/stylesheets/mobile/new-user.scss b/app/assets/stylesheets/mobile/new-user.scss
index 26de4fbc7a..60c4715270 100644
--- a/app/assets/stylesheets/mobile/new-user.scss
+++ b/app/assets/stylesheets/mobile/new-user.scss
@@ -5,20 +5,21 @@
     .nav-pills {
       margin: 0.5em 0;
       overflow-x: auto;
-
       scrollbar-width: none;
 
       &::-webkit-scrollbar {
         display: none;
       }
+    }
+  }
 
+  .user-navigation-secondary {
+    font-size: var(--font-up-1);
+
+    .nav-pills {
+      flex-wrap: nowrap;
       li {
-        a {
-          display: flex;
-          flex-direction: row;
-          padding: 0.5em 0.5em;
-          white-space: nowrap;
-        }
+        flex: 1 0 auto;
       }
     }
   }
@@ -51,4 +52,18 @@
       @include ellipsis;
     }
   }
+
+  #navigation-bar {
+    flex-wrap: nowrap;
+  }
+
+  .navigation-controls {
+    margin-top: 1em;
+  }
+}
+
+.new-user-content-wrapper {
+  .user-content {
+    margin-top: 2em;
+  }
 }

From 47fa4dbef33fde0b5db358c1049315ca6992eb27 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 11 Oct 2022 16:51:02 -0500
Subject: [PATCH 111/332] FIX: User field styling on login (#18551)

---
 app/assets/stylesheets/common/base/login.scss | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index fc04c5bc53..4d8f14ac68 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -155,7 +155,8 @@ body.invite-page {
       &:last-child {
         margin-bottom: 2em;
       }
-      input {
+      input,
+      .select-kit-header {
         padding: 0.75em 0.77em;
         border-radius: 0.25em;
         min-width: 250px;
@@ -175,7 +176,8 @@ body.invite-page {
         color: var(--primary-medium);
         min-height: 1.4em; // prevents height increase due to tips
       }
-      label.alt-placeholder {
+      label.alt-placeholder,
+      .user-field.dropdown label.control-label {
         color: var(--primary-medium);
         font-size: 16px;
         font-weight: normal;
@@ -187,6 +189,14 @@ body.invite-page {
         border-radius: 0.25em;
         transition: 0.2s ease all;
       }
+      .user-field.dropdown label.control-label {
+        z-index: 999;
+        top: -8px;
+        left: calc(1em - 0.25em);
+        background-color: var(--secondary);
+        padding: 0 0.25em 0 0.25em;
+        font-size: $font-down-1;
+      }
       input:focus + label.alt-placeholder,
       input.value-entered + label.alt-placeholder {
         top: -8px;
@@ -194,7 +204,6 @@ body.invite-page {
         background-color: var(--secondary);
         padding: 0 0.25em 0 0.25em;
         font-size: $font-down-1;
-        color: var(--primary-medium);
       }
       input.alt-placeholder:invalid {
         color: var(--primary);
@@ -261,9 +270,20 @@ body.invite-page {
             background-color: var(--secondary);
             padding: 0 0.25em 0 0.25em;
             font-size: 14px;
-            color: var(--primary-high);
+            color: var(--primary-medium);
           }
         }
+        span.name {
+          color: var(--primary-medium);
+        }
+        .select-kit-row span.name {
+          color: var(--primary);
+        }
+        .select-kit.combo-box.is-expanded summary {
+          outline: none;
+          border: 1px solid var(--tertiary);
+          box-shadow: 0 0 0 2px rgba(var(--tertiary-rgb), 0.25);
+        }
         .controls .checkbox-label {
           input[type="checkbox"].ember-checkbox {
             width: 1em !important;

From 6888eb5c2d1e25217752deb641f0345b4f93d382 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 11 Oct 2022 20:11:44 -0300
Subject: [PATCH 112/332] Revert "Revert "FEATURE: Preload resources via link
 header (#18475)" (#18511)" (#18531)

* Revert "Revert "FEATURE: Preload resources via link header (#18475)" (#18511)"

This reverts commit 95a57f7e0c7e78ecac14760ae4751e0ae2e8ea0d.

* put behind feature flag

* env -> global setting

* declare global setting

* forgot one spot
---
 app/controllers/application_controller.rb    | 13 ++++-
 app/helpers/application_helper.rb            | 25 ++++++---
 app/views/layouts/application.html.erb       | 13 +++--
 config/discourse_defaults.conf               |  3 ++
 lib/stylesheet/manager.rb                    |  6 ++-
 spec/helpers/application_helper_spec.rb      | 55 +++++++++++++++++---
 spec/lib/stylesheet/manager_spec.rb          | 21 ++++++++
 spec/requests/application_controller_spec.rb | 34 ++++++++++++
 8 files changed, 150 insertions(+), 20 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d7bd742922..0ab26fef89 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,7 +49,8 @@ class ApplicationController < ActionController::Base
   after_action  :conditionally_allow_site_embedding
   after_action  :ensure_vary_header
   after_action  :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
-  after_action  :add_noindex_header_to_non_canonical, if: -> { request.get? && !(request.format && request.format.json?) && !request.xhr? }
+  after_action  :add_noindex_header_to_non_canonical, if: :spa_boot_request?
+  around_action :link_preload, if: -> { spa_boot_request? && GlobalSetting.preload_link_header }
 
   HONEYPOT_KEY ||= 'HONEYPOT_KEY'
   CHALLENGE_KEY ||= 'CHALLENGE_KEY'
@@ -1008,4 +1009,14 @@ class ApplicationController < ActionController::Base
 
     result
   end
+
+  def link_preload
+    @links_to_preload = []
+    yield
+    response.headers['Link'] = @links_to_preload.join(', ') if !@links_to_preload.empty?
+  end
+
+  def spa_boot_request?
+    request.get? && !(request.format && request.format.json?) && !request.xhr?
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0ee00f928c..84912f3815 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,10 +142,21 @@ module ApplicationHelper
   end
 
   def preload_script_url(url)
-    <<~HTML.html_safe
-      <link rel="preload" href="#{url}" as="script">
-      <script defer src="#{url}"></script>
-    HTML
+    add_resource_preload_list(url, 'script')
+    if GlobalSetting.preload_link_header
+      <<~HTML.html_safe
+        <script defer src="#{url}"></script>
+      HTML
+    else
+      <<~HTML.html_safe
+        <link rel="preload" href="#{url}" as="script">
+        <script defer src="#{url}"></script>
+      HTML
+    end
+  end
+
+  def add_resource_preload_list(resource_url, type)
+    @links_to_preload << %Q(<#{resource_url}>; rel="preload"; as="#{type}") if !@links_to_preload.nil?
   end
 
   def discourse_csrf_tags
@@ -589,7 +600,7 @@ module ApplicationHelper
         stylesheet_manager
       end
 
-    manager.stylesheet_link_tag(name, 'all')
+    manager.stylesheet_link_tag(name, 'all', self.method(:add_resource_preload_list))
   end
 
   def discourse_preload_color_scheme_stylesheets
@@ -605,10 +616,10 @@ module ApplicationHelper
 
   def discourse_color_scheme_stylesheets
     result = +""
-    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all')
+    result << stylesheet_manager.color_scheme_stylesheet_link_tag(scheme_id, 'all', self.method(:add_resource_preload_list))
 
     if dark_scheme_id != -1
-      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)')
+      result << stylesheet_manager.color_scheme_stylesheet_link_tag(dark_scheme_id, '(prefers-color-scheme: dark)', self.method(:add_resource_preload_list))
     end
 
     result.html_safe
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7db635e80d..a3e80fd2c6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,7 +7,9 @@
     <meta name="discourse_theme_id" content="<%= theme_id %>">
     <meta name="discourse_current_homepage" content="<%= current_homepage %>">
 
-    <%= render partial: "common/discourse_preload_stylesheet" %>
+    <%- if GlobalSetting.preload_link_header %>
+      <%= render partial: "common/discourse_preload_stylesheet" %>
+    <%- end %>
     <%= render partial: "layouts/head" %>
     <%= discourse_csrf_tags %>
 
@@ -21,8 +23,13 @@
 
     <%= build_plugin_html 'server:before-script-load' %>
 
-    <link rel="preload" href="<%= script_asset_path "start-discourse" %>" as="script">
-    <link rel="preload" href="<%= script_asset_path "browser-update" %>" as="script">
+    <%- if GlobalSetting.preload_link_header %>
+      <% add_resource_preload_list(script_asset_path("start-discourse"), "script") %>
+      <% add_resource_preload_list(script_asset_path("browser-update"), "script") %>
+    <%- else %>
+      <link rel="preload" href="<%= script_asset_path "start-discourse" %>" as="script">
+      <link rel="preload" href="<%= script_asset_path "browser-update" %>" as="script">
+    <%- end %>  
     <%= preload_script 'browser-detect' %>
 
     <%= preload_script "locales/#{I18n.locale}" %>
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 1007417f87..f2b84768c7 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -356,3 +356,6 @@ enable_long_polling =
 
 # Length of time to hold open a long polling connection in milliseconds
 long_polling_interval =
+
+# Moves asset preloading from tags in the response document head to response headers
+preload_link_header = false
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 72d4424d0c..1ee4e8e557 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -196,10 +196,11 @@ class Stylesheet::Manager
     end.join("\n").html_safe
   end
 
-  def stylesheet_link_tag(target = :desktop, media = 'all')
+  def stylesheet_link_tag(target = :desktop, media = 'all', preload_callback = nil)
     stylesheets = stylesheet_details(target, media)
     stylesheets.map do |stylesheet|
       href = stylesheet[:new_href]
+      preload_callback.call(href, 'style') if preload_callback
       theme_id = stylesheet[:theme_id]
       data_theme_id = theme_id ? "data-theme-id=\"#{theme_id}\"" : ""
       theme_name = stylesheet[:theme_name]
@@ -311,12 +312,13 @@ class Stylesheet::Manager
     %[<link href="#{href}" rel="preload" as="style"/>].html_safe
   end
 
-  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all')
+  def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all', preload_callback = nil)
     stylesheet = color_scheme_stylesheet_details(color_scheme_id, media)
 
     return '' if !stylesheet
 
     href = stylesheet[:new_href]
+    preload_callback.call(href, 'style') if preload_callback
 
     css_class = media == 'all' ? "light-scheme" : "dark-scheme"
 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ee2f1cdc97..0e57abf94d 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,7 +3,7 @@
 
 RSpec.describe ApplicationHelper do
   describe "preload_script" do
-    def preload_link(url)
+    def script_tag(url)
       <<~HTML
           <link rel="preload" href="#{url}" as="script">
           <script defer src="#{url}"></script>
@@ -32,7 +32,7 @@ RSpec.describe ApplicationHelper do
       helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
       link = helper.preload_script('discourse')
 
-      expect(link).to eq(preload_link("https://awesome.com/brotli_asset/discourse.js"))
+      expect(link).to eq(script_tag("https://awesome.com/brotli_asset/discourse.js"))
     end
 
     context "with s3 CDN" do
@@ -61,36 +61,77 @@ RSpec.describe ApplicationHelper do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.br.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.br.js"))
       end
 
       it "gives s3 cdn if asset host is not set" do
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "can fall back to gzip compression" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip'
         link = helper.preload_script('discourse')
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.gz.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.gz.js"))
       end
 
       it "gives s3 cdn even if asset host is set" do
         set_cdn_url "https://awesome.com"
         link = helper.preload_script('discourse')
 
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse.js"))
       end
 
       it "gives s3 cdn but without brotli/gzip extensions for theme tests assets" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip, br'
         link = helper.preload_script('discourse/tests/theme_qunit_ember_jquery')
-        expect(link).to eq(preload_link("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
+        expect(link).to eq(script_tag("https://s3cdn.com/assets/discourse/tests/theme_qunit_ember_jquery.js"))
       end
     end
   end
 
+  describe "add_resource_preload_list" do
+    it "adds resources to the preload list when it's available" do
+      @links_to_preload = []
+      add_resource_preload_list('/assets/discourse.js', 'script')
+      add_resource_preload_list('/assets/discourse.css', 'style')
+
+      expect(@links_to_preload.size).to eq(2)
+    end
+
+    it "doesn't add resources to the preload list when it's not available" do
+      @links_to_preload = nil
+      add_resource_preload_list('/assets/discourse.js', 'script')
+      add_resource_preload_list('/assets/discourse.css', 'style')
+
+      expect(@links_to_preload).to eq(nil)
+    end
+
+    it "adds resources to the preload list when preload_script is called" do
+      @links_to_preload = []
+      helper.preload_script('discourse')
+
+      expect(@links_to_preload.size).to eq(1)
+    end
+
+    it "adds resources to the preload list when discourse_stylesheet_link_tag is called" do
+      @links_to_preload = []
+      helper.discourse_stylesheet_link_tag(:desktop)
+
+      expect(@links_to_preload.size).to eq(1)
+    end
+
+    it "adds resources as the correct type" do
+      @links_to_preload = []
+      helper.discourse_stylesheet_link_tag(:desktop)
+      helper.preload_script('discourse')
+
+      expect(@links_to_preload[0]).to match(/as="style"/)
+      expect(@links_to_preload[1]).to match(/as="script"/)
+    end
+  end
+
   describe "escape_unicode" do
     it "encodes tags" do
       expect(helper.escape_unicode("<tag>")).to eq("\u003ctag>")
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index 218f2c4938..caae0e9a83 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -148,6 +148,16 @@ RSpec.describe Stylesheet::Manager do
       })
     end
 
+    it "stylesheet_link_tag calls the preload callback when set" do
+      preload_list = []
+      preload_callback = ->(href, type) { preload_list << [href, type] }
+
+      manager = manager(theme.id)
+      expect {
+        manager.stylesheet_link_tag(:desktop_theme, 'all', preload_callback)
+      }.to change(preload_list, :size)
+    end
+
     context "with stylesheet order" do
       let(:z_child_theme) do
         Fabricate(:theme, component: true, name: "ze component").tap do |z|
@@ -638,6 +648,17 @@ RSpec.describe Stylesheet::Manager do
       expect(details1[:new_href]).not_to eq(details2[:new_href])
     end
 
+    it "calls the preload callback when set" do
+      preload_list = []
+      cs = Fabricate(:color_scheme, name: 'Funky')
+      theme = Fabricate(:theme, color_scheme_id: cs.id)
+      preload_callback = ->(href, type) { preload_list << [href, type] }
+
+      expect {
+        manager.color_scheme_stylesheet_link_tag(theme.id, 'all', preload_callback)
+      }.to change(preload_list, :size).by(1)
+    end
+
     context "with theme colors" do
       let(:theme) { Fabricate(:theme).tap { |t|
         t.set_field(target: :common, name: "color_definitions", value: ':root {--special: rebeccapurple;}')
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index d25d1a983d..77d348098c 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -1124,4 +1124,38 @@ RSpec.describe ApplicationController do
       end
     end
   end
+
+  describe 'preload Link header' do
+    context "with GlobalSetting.preload_link_header" do
+      before do
+        global_setting :preload_link_header, true
+      end
+
+      it "should have the Link header with assets on full page requests" do
+        get("/latest")
+        expect(response.headers).to include('Link')
+      end
+
+      it "shouldn't have the Link header on xhr api requests" do
+        get("/latest.json")
+        expect(response.headers).not_to include('Link')
+      end
+    end
+
+    context "without GlobalSetting.preload_link_header" do
+      before do
+        global_setting :preload_link_header, false
+      end
+
+      it "shouldn't have the Link header with assets on full page requests" do
+        get("/latest")
+        expect(response.headers).not_to include('Link')
+      end
+
+      it "shouldn't have the Link header on xhr api requests" do
+        get("/latest.json")
+        expect(response.headers).not_to include('Link')
+      end
+    end
+  end
 end

From 5fdbbe3045f9dc2e0fa205c09f0986ac7984138c Mon Sep 17 00:00:00 2001
From: Michael Fitz-Payne <fitzy@discourse.org>
Date: Thu, 6 Oct 2022 16:11:24 +1000
Subject: [PATCH 113/332] DEV(cache_critical_dns): add caching for MessageBus
 Redis hostname

We are already caching any DB_HOST and REDIS_HOST (and their
accompanying replicas), we should also cache the resolved addresses for
the MessageBus specific Redis. This is a noop if no MB redis is defined
in config. A side effect is that the MB will also support SRV lookup and
priorities, following the same convention as the other cached services.

The port argument was added to redis_healthcheck so that the script
supports a setup where Redis is running on a non-default port.

Did some minor refactoring to improve readability when filtering out the
CRITICAL_HOST_ENV_VARS. The `select` block was a bit confusing, so the
sequence was made easier to follow.

We were coercing an environment variable to an int in a few places, so
the `env_as_int` method was introduced to do that coercion in one place and
for convenience purposes default to a value if provided.

See /t/68301/30.
---
 script/cache_critical_dns | 47 ++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/script/cache_critical_dns b/script/cache_critical_dns
index 9a1f023b48..929770b4a4 100755
--- a/script/cache_critical_dns
+++ b/script/cache_critical_dns
@@ -86,9 +86,12 @@ CRITICAL_HOST_ENV_VARS = %w{
   DISCOURSE_REDIS_HOST
   DISCOURSE_REDIS_SLAVE_HOST
   DISCOURSE_REDIS_REPLICA_HOST
+  DISCOURSE_MESSAGE_BUS_REDIS_HOST
+  DISCOURSE_MESSAGE_BUS_REDIS_REPLICA_HOST
 }
 
 DEFAULT_DB_NAME = "discourse"
+DEFAULT_REDIS_PORT = 6379
 
 HOST_RESOLVER_CACHE = {}
 HOST_HEALTHY_CACHE = {}
@@ -203,10 +206,11 @@ class HealthyCache
   end
 end
 
-def redis_healthcheck(host:, password:)
+def redis_healthcheck(host:, password:, port: DEFAULT_REDIS_PORT)
   client_opts = {
     host: host,
     password: password,
+    port: port,
     timeout: 1,
   }
   if !nilempty(ENV['DISCOURSE_REDIS_USE_SSL']).nil? then
@@ -260,6 +264,16 @@ HEALTH_CHECKS = {
     redis_healthcheck(
       host: addr,
       password: ENV["DISCOURSE_REDIS_PASSWORD"])},
+  "DISCOURSE_MESSAGE_BUS_REDIS_HOST": lambda { |addr|
+    redis_healthcheck(
+      host: addr,
+      port: env_as_int("DISCOURSE_MESSAGE_BUS_REDIS_PORT", DEFAULT_REDIS_PORT),
+      password: ENV["DISCOURSE_MESSAGE_BUS_REDIS_PASSWORD"])},
+  "DISCOURSE_MESSAGE_BUS_REDIS_REPLICA_HOST": lambda { |addr|
+    redis_healthcheck(
+      host: addr,
+      port: env_as_int("DISCOURSE_MESSAGE_BUS_REDIS_REPLICA_PORT", DEFAULT_REDIS_PORT),
+      password: ENV["DISCOURSE_MESSAGE_BUS_REDIS_PASSWORD"])},
 }
 
 def log(msg)
@@ -292,7 +306,7 @@ end
 
 def send_counter(name, description, labels, value)
   host = "localhost"
-  port = ENV.fetch("DISCOURSE_PROMETHEUS_COLLECTOR_PORT", 9405).to_i
+  port = env_as_int("DISCOURSE_PROMETHEUS_COLLECTOR_PORT", 9405)
 
   if labels
     labels = labels.map do |k, v|
@@ -362,6 +376,14 @@ def env_srv_name(env_name)
   nilempty(ENV[env_srv_var(env_name)])
 end
 
+def env_as_int(env_name, default = nil)
+  val = ENV.fetch(env_name, default)
+  if nilempty(val).nil?
+    return val
+  end
+  val.to_i
+end
+
 def run_and_report(hostname_vars)
   errors = run(hostname_vars)
   if errors.empty?
@@ -428,13 +450,18 @@ end
 # If any of the host variables are an explicit IP we will not attempt to cache
 # them.
 all_hostname_vars = CRITICAL_HOST_ENV_VARS.select do |name|
-  begin
-    host = ENV[name]
-    next if nilempty(host).nil?
-    IPAddr.new(host)
+  host = ENV[name]
+  if nilempty(host).nil?
+    # don't attempt to cache host vars that aren't present in the environment
     false
-  rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError
-    true
+  else
+    begin
+      IPAddr.new(host)
+      # host is an IPv4 / IPv6 address
+      false
+    rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError
+      true
+    end
   end
 end
 
@@ -443,8 +470,8 @@ end
 # is that no filtering based on priority will be performed.
 CRITICAL_HOST_ENV_VARS.each do |v|
   if (name = env_srv_name(v))
-    max = ENV.fetch("#{env_srv_var(v)}_PRIORITY_LE", SRV_PRIORITY_THRESHOLD_MAX).to_i
-    min = ENV.fetch("#{env_srv_var(v)}_PRIORITY_GE", SRV_PRIORITY_THRESHOLD_MIN).to_i
+    max = env_as_int("#{env_srv_var(v)}_PRIORITY_LE", SRV_PRIORITY_THRESHOLD_MAX)
+    min = env_as_int("#{env_srv_var(v)}_PRIORITY_GE", SRV_PRIORITY_THRESHOLD_MIN)
     if max > SRV_PRIORITY_THRESHOLD_MAX ||
         min < SRV_PRIORITY_THRESHOLD_MIN ||
         min > max

From e5b306b13ec094b96164c28f88fe494278070d63 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 12 Oct 2022 11:55:47 +1100
Subject: [PATCH 114/332] FIX: warning about sidebar prefix style (#18553)

New double color feature introduced warning about CSS. Related PR https://github.com/discourse/discourse/pull/18525
---
 .../discourse/app/components/sidebar/section-link-prefix.hbs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
index ee41f1194a..3af9d14f7e 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
@@ -15,7 +15,7 @@
     {{/if}}
 
     {{#if (eq @prefixType "span")}}
-      <span style={{@prefixCSS}} class="prefix-span"></span>
+      <span style={{html-safe @prefixCSS}} class="prefix-span"></span>
     {{/if}}
 
     {{#if @prefixBadge}}

From 84f25291382c1640fd563c7009f4d46062f705b4 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 12 Oct 2022 12:42:15 +1000
Subject: [PATCH 115/332] FEATURE: Add contentCSSClass for sidebar section-link
 (#18555)

In some cases, like in the chat plugin for muted channels,
we want to change the style of the sidebar content text.
This adds a new contentCSSClass function to the
BaseCustomSidebarSectionLink class and uses it in both
sections and section-link to add the CSS class if it is
provided.
---
 .../app/components/sidebar/section-link.hbs         |  2 +-
 .../app/components/sidebar/user/sections.hbs        |  1 +
 .../lib/sidebar/base-custom-sidebar-section-link.js | 13 +++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
index dd172a122b..0cc9938e76 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
@@ -33,7 +33,7 @@
           @prefixBadge={{@prefixBadge}}
         />
 
-        <span class="sidebar-section-link-content-text">
+        <span class={{concat-class "sidebar-section-link-content-text" @contentCSSClass}}>
           {{@content}}
         </span>
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
index 518875cb93..0cb880c614 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
@@ -28,6 +28,7 @@
           @model={{link.model}}
           @models={{link.models}}
           @title={{link.title}}
+          @contentCSSClass={{link.contentCSSClass}}
           @prefixColor={{link.prefixColor}}
           @prefixBadge={{link.prefixBadge}}
           @prefixType={{link.prefixType}}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
index a0850fae9b..5de827a551 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
@@ -45,6 +45,11 @@ export default class BaseCustomSidebarSectionLink {
     this._notImplemented();
   }
 
+  /**
+   * @returns {string} CSS class for the content text
+   */
+  get contentCSSClass() {}
+
   /**
    * @returns {string} Prefix type for the link. Accepted value: icon, image, text
    */
@@ -68,22 +73,22 @@ export default class BaseCustomSidebarSectionLink {
   /**
    * @returns {string} CSS class for prefix
    */
-  get PrefixCSSClass() {}
+  get prefixCSSClass() {}
 
   /**
    * @returns {string} Suffix type for the link. Accepted value: icon
    */
-  get SuffixType() {}
+  get suffixType() {}
 
   /**
    * @returns {string} Suffix value for the link. Accepted value: icon name
    */
-  get SuffixValue() {}
+  get suffixValue() {}
 
   /**
    * @returns {string} CSS class for suffix
    */
-  get SuffixCSSClass() {}
+  get suffixCSSClass() {}
 
   /**
    * @returns {string} Type of the hover button. Accepted value: icon

From 1631394826e03073f99caa990811f261590d3257 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Wed, 12 Oct 2022 11:23:34 +0800
Subject: [PATCH 116/332] FEATURE: Show relative time when date is omitted
 (#18547)

---
 .../javascripts/lib/local-date-builder.js     |  8 +++---
 .../unit/discourse-local-dates-test.js        |  4 +--
 .../{lib => unit}/local-date-builder-test.js  | 26 ++++++++++++++++---
 3 files changed, 28 insertions(+), 10 deletions(-)
 rename plugins/discourse-local-dates/test/javascripts/{lib => unit}/local-date-builder-test.js (96%)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
index 352ecd09b9..ee2cd44939 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js
@@ -67,12 +67,12 @@ export default class LocalDateBuilder {
     }
 
     const previews = this._generatePreviews(localDate, displayedTimezone);
-
+    const hasTime = hour !== undefined;
     return {
       pastEvent:
         !this.recurring &&
         moment.tz(this.localTimezone).isAfter(localDate.datetime),
-      formatted: this._applyFormatting(localDate, displayedTimezone),
+      formatted: this._applyFormatting(localDate, displayedTimezone, hasTime),
       previews,
       textPreview: this._generateTextPreviews(previews),
     };
@@ -210,7 +210,7 @@ export default class LocalDateBuilder {
     return duration < 0 ? dates.reverse() : dates;
   }
 
-  _applyFormatting(localDate, displayedTimezone) {
+  _applyFormatting(localDate, displayedTimezone, hasTime) {
     if (this.countdown) {
       const diffTime = moment.tz(this.localTimezone).diff(localDate.datetime);
 
@@ -241,7 +241,7 @@ export default class LocalDateBuilder {
       if (inCalendarRange && sameTimezone) {
         const date = localDate.datetimeWithZone(this.localTimezone);
 
-        if (date.hours() === 0 && date.minutes() === 0) {
+        if (hasTime && date.hours() === 0 && date.minutes() === 0) {
           return date.format("dddd");
         }
 
diff --git a/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js b/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js
index d88a8bb7cf..38db0c92d8 100644
--- a/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/unit/discourse-local-dates-test.js
@@ -1,6 +1,6 @@
 import { module, test } from "qunit";
 import { applyLocalDates } from "../initializers/discourse-local-dates";
-import { freezeTime } from "../lib/local-date-builder-test";
+import { freezeTime } from "./local-date-builder-test";
 
 module("Unit | Discourse Local Dates | discourse-local-dates", function () {
   function createElementFromHTML(htmlString) {
@@ -72,7 +72,7 @@ module("Unit | Discourse Local Dates | discourse-local-dates", function () {
         );
         assert.equal(
           to.querySelector(".relative-time").textContent,
-          "Thursday"
+          "Yesterday"
         );
       }
     );
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js b/plugins/discourse-local-dates/test/javascripts/unit/local-date-builder-test.js
similarity index 96%
rename from plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
rename to plugins/discourse-local-dates/test/javascripts/unit/local-date-builder-test.js
index 3cf8bb0f02..f2a0f702a4 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/unit/local-date-builder-test.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import LocalDateBuilder from "./local-date-builder";
+import LocalDateBuilder from "../lib/local-date-builder";
 import sinon from "sinon";
 import QUnit, { module, test } from "qunit";
 
@@ -10,6 +10,7 @@ const NEW_YORK = "America/New_York";
 const PARIS = "Europe/Paris";
 const LAGOS = "Africa/Lagos";
 const LONDON = "Europe/London";
+const SINGAPORE = "Asia/Singapore";
 
 export function freezeTime({ date, timezone }, cb) {
   date = date || "2020-01-22 10:34";
@@ -61,7 +62,7 @@ QUnit.assert.buildsCorrectDate = function (options, expected, message) {
   }
 };
 
-module("lib:local-date-builder", function () {
+module("Unit | Library | local-date-builder", function () {
   test("date", function (assert) {
     freezeTime({ date: "2020-03-11" }, () => {
       assert.buildsCorrectDate(
@@ -70,6 +71,23 @@ module("lib:local-date-builder", function () {
         "it displays the date without time"
       );
     });
+
+    freezeTime({ date: "2022-10-11", timezone: "Asia/Singapore" }, () => {
+      const localDateBuilder = new LocalDateBuilder(
+        {
+          date: "2022-10-12",
+          timezone: SINGAPORE,
+          localTimezone: SINGAPORE,
+        },
+        SINGAPORE
+      );
+
+      assert.strictEqual(
+        localDateBuilder.build().formatted,
+        "Tomorrow",
+        "Displays relative day"
+      );
+    });
   });
 
   test("date and time", function (assert) {
@@ -91,8 +109,8 @@ module("lib:local-date-builder", function () {
       {
         time: "12:22:00",
         date: "2022-10-07",
-        timezone: "Asia/Singapore",
-        localTimezone: "Asia/Singapore",
+        timezone: SINGAPORE,
+        localTimezone: SINGAPORE,
         sameLocalDayAsFrom: true,
       },
       { formatted: "12:22 PM (Singapore)" },

From ad37c6c017ad3a1fd35bff7ec11052e31caac1e4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 12 Oct 2022 10:06:03 +0100
Subject: [PATCH 117/332] DEV: Update `backburner.js` to include bugfix and dev
 improvements (#18549)

This version of backburner is patched to include
- Fix for scheduleOnce/cancel bug: https://github.com/BackburnerJS/backburner.js/pull/402
- Async stack debugging in Chrome: https://github.com/BackburnerJS/backburner.js/pull/404

The async debugging feature is enabled only in debug builds of Discourse to ensure production performance is unaffected.

Adding to `vendorFiles` causes the JS to be inserted directly after the `ember-source` bundle. That means that the `backburner` module defined by ember-source will be replaced with the patched version.
---
 .../discourse/app/pre-initializers/discourse-bootstrap.js   | 6 ++++++
 app/assets/javascripts/discourse/ember-cli-build.js         | 6 ++++++
 app/assets/javascripts/discourse/package.json               | 1 +
 app/assets/javascripts/yarn.lock                            | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
index e976b9a578..746708b435 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -12,12 +12,18 @@ import Session from "discourse/models/session";
 import { setDefaultOwner } from "discourse-common/lib/get-owner";
 import { setIconList } from "discourse-common/lib/icon-library";
 import { setURLContainer } from "discourse/lib/url";
+import runloop from "@ember/runloop";
+import { DEBUG } from "@glimmer/env";
 
 export default {
   name: "discourse-bootstrap",
 
   // The very first initializer to run
   initialize(container) {
+    if (DEBUG) {
+      runloop._backburner.ASYNC_STACKS = true;
+    }
+
     setURLContainer(container);
     setDefaultOwner(container);
 
diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
index 8fa1004651..1aaa6369ea 100644
--- a/app/assets/javascripts/discourse/ember-cli-build.js
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -79,6 +79,12 @@ module.exports = function (defaults) {
 
     // We need to build tests in prod for theme tests
     tests: true,
+
+    vendorFiles: {
+      // Freedom patch - includes bug fix and async stack support
+      // https://github.com/discourse/backburner.js/commits/discourse-patches
+      backburner: "node_modules/backburner.js/dist/named-amd/backburner.js",
+    },
   });
 
   // Patching a private method is not great, but there's no other way for us to tell
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index e6279dbdf2..9faf821c31 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -37,6 +37,7 @@
     "admin": "^1.0.0",
     "discourse-plugins": "^1.0.0",
     "babel-plugin-ember-template-compilation": "^1.0.2",
+    "backburner.js": "https://github.com/discourse/backburner.js#discourse-patches",
     "bootstrap": "3.4.1",
     "broccoli-asset-rev": "^3.0.0",
     "deepmerge": "^4.2.2",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 0bf77f87ed..cafb17aaa2 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -2581,6 +2581,10 @@ backbone@^1.1.2:
   dependencies:
     underscore ">=1.8.3"
 
+"backburner.js@https://github.com/discourse/backburner.js#discourse-patches":
+  version "2.7.0"
+  resolved "https://github.com/discourse/backburner.js#4b227c302c8a2bfa604dcdcca3802ed018423683"
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"

From c707ee714d91418f5661c24b337acd287bc7cc02 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 12 Oct 2022 11:14:41 +0100
Subject: [PATCH 118/332] DEV: Use npm for forked backburner.js version
 (#18559)

Using a git-sourced package seems to cause intermittent `yarn install` failures.

Followup to ad37c6c017ad3a1fd35bff7ec11052e31caac1e4
---
 app/assets/javascripts/discourse/ember-cli-build.js | 3 ++-
 app/assets/javascripts/discourse/package.json       | 2 +-
 app/assets/javascripts/yarn.lock                    | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
index 1aaa6369ea..8c3d2f4528 100644
--- a/app/assets/javascripts/discourse/ember-cli-build.js
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -83,7 +83,8 @@ module.exports = function (defaults) {
     vendorFiles: {
       // Freedom patch - includes bug fix and async stack support
       // https://github.com/discourse/backburner.js/commits/discourse-patches
-      backburner: "node_modules/backburner.js/dist/named-amd/backburner.js",
+      backburner:
+        "node_modules/@discourse/backburner.js/dist/named-amd/backburner.js",
     },
   });
 
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 9faf821c31..c1e070d853 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -19,6 +19,7 @@
     "@babel/core": "^7.19.3",
     "@babel/standalone": "^7.19.3",
     "@discourse/itsatrap": "^2.0.10",
+    "@discourse/backburner.js": "^2.7.1-0",
     "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^2.0.4",
@@ -37,7 +38,6 @@
     "admin": "^1.0.0",
     "discourse-plugins": "^1.0.0",
     "babel-plugin-ember-template-compilation": "^1.0.2",
-    "backburner.js": "https://github.com/discourse/backburner.js#discourse-patches",
     "bootstrap": "3.4.1",
     "broccoli-asset-rev": "^3.0.0",
     "deepmerge": "^4.2.2",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index cafb17aaa2..676e2eb7eb 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1032,6 +1032,11 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@discourse/backburner.js@^2.7.1-0":
+  version "2.7.1-0"
+  resolved "https://registry.yarnpkg.com/@discourse/backburner.js/-/backburner.js-2.7.1-0.tgz#0fc5f93c8f3ee013af2beed55d30ff10362d8f06"
+  integrity sha512-r0cjllX/niPSxot/lpz0Tj9CXmyYoFE6kvEN9oL0D0sOGpknmK9FielZqcPGxuD/Z8vOb67penUElHRjH+F4cQ==
+
 "@discourse/itsatrap@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@discourse/itsatrap/-/itsatrap-2.0.10.tgz#c7e750eeb32b54e769e952c4ecc472213eb1385a"
@@ -2581,10 +2586,6 @@ backbone@^1.1.2:
   dependencies:
     underscore ">=1.8.3"
 
-"backburner.js@https://github.com/discourse/backburner.js#discourse-patches":
-  version "2.7.0"
-  resolved "https://github.com/discourse/backburner.js#4b227c302c8a2bfa604dcdcca3802ed018423683"
-
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"

From 33087f0bdf17aea7942cbb02672c9cd83f7545ee Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:07:37 +0300
Subject: [PATCH 119/332] A11Y: Set role=presentation if alt attr is missing
 (#18546)

This applies to all images posted that do not have a user description.
---
 .../tests/unit/lib/pretty-text-test.js        | 11 +++++++---
 .../pretty-text/addon/allow-lister.js         |  1 +
 .../addon/engines/discourse-markdown-it.js    |  8 +++++++-
 spec/fixtures/md/spec.txt                     |  2 +-
 spec/lib/pretty_text_spec.rb                  | 20 +++++++++----------
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
index 853573405e..b0c2ead7d9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
@@ -958,7 +958,7 @@ eviltrout</p>
   test("URLs in BBCode tags", function (assert) {
     assert.cooked(
       "[img]http://eviltrout.com/eviltrout.png[/img][img]http://samsaffron.com/samsaffron.png[/img]",
-      '<p><img src="http://eviltrout.com/eviltrout.png" alt/><img src="http://samsaffron.com/samsaffron.png" alt/></p>',
+      '<p><img src="http://eviltrout.com/eviltrout.png" alt role="presentation"/><img src="http://samsaffron.com/samsaffron.png" alt role="presentation"/></p>',
       "images are properly parsed"
     );
 
@@ -987,6 +987,11 @@ eviltrout</p>
       '<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot"></p>',
       "It allows data images"
     );
+
+    assert.cooked(
+      "![](http://folksy.com/images/folksy-colour.png)",
+      '<p><img src="http://folksy.com/images/folksy-colour.png" alt role="presentation"></p>'
+    );
   });
 
   test("attachment", function (assert) {
@@ -1162,7 +1167,7 @@ eviltrout</p>
     );
     assert.cookedPara(
       "[img]http://eviltrout.com/eviltrout.png[/img]",
-      '<img src="http://eviltrout.com/eviltrout.png" alt>',
+      '<img src="http://eviltrout.com/eviltrout.png" alt role="presentation">',
       "links images"
     );
     assert.cookedPara(
@@ -1210,7 +1215,7 @@ eviltrout</p>
     );
     assert.cookedPara(
       "[url=http://www.example.com][img]http://example.com/logo.png[/img][/url]",
-      '<a href="http://www.example.com" data-bbcode="true"><img src="http://example.com/logo.png" alt></a>',
+      '<a href="http://www.example.com" data-bbcode="true"><img src="http://example.com/logo.png" alt role="presentation"></a>',
       "supports [url] with an embedded [img]"
     );
   });
diff --git a/app/assets/javascripts/pretty-text/addon/allow-lister.js b/app/assets/javascripts/pretty-text/addon/allow-lister.js
index 91a33bef3f..8b3eb44633 100644
--- a/app/assets/javascripts/pretty-text/addon/allow-lister.js
+++ b/app/assets/javascripts/pretty-text/addon/allow-lister.js
@@ -173,6 +173,7 @@ export const DEFAULT_LIST = [
   "iframe[allowfullscreen]",
   "iframe[allow]",
   "img[alt]",
+  "img[role]",
   "img[height]",
   "img[title]",
   "img[width]",
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
index 8f6d02d5fd..8ce6442575 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
@@ -253,7 +253,13 @@ function renderImageOrPlayableMedia(tokens, idx, options, env, slf) {
     }
   }
 
-  token.attrs[token.attrIndex("alt")][1] = altSplit.join("|");
+  const altValue = altSplit.join("|").trim();
+  if (altValue === "") {
+    token.attrSet("role", "presentation");
+  } else {
+    token.attrSet("alt", altValue);
+  }
+
   return slf.renderToken(tokens, idx, options);
 }
 
diff --git a/spec/fixtures/md/spec.txt b/spec/fixtures/md/spec.txt
index 50a660fa7e..66cb1caec9 100644
--- a/spec/fixtures/md/spec.txt
+++ b/spec/fixtures/md/spec.txt
@@ -8564,7 +8564,7 @@ My ![foo bar](/path/to/train.jpg  "title"   )
 ```````````````````````````````` example
 ![](/url)
 .
-<p><img src="/url" alt="" /></p>
+<p><img src="/url" alt="" role="presentation" /></p>
 ````````````````````````````````
 
 
diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rb
index b09d9f1036..532f276d89 100644
--- a/spec/lib/pretty_text_spec.rb
+++ b/spec/lib/pretty_text_spec.rb
@@ -1771,13 +1771,13 @@ HTML
 
   it "supports img bbcode" do
     cooked = PrettyText.cook "[img]http://www.image/test.png[/img]"
-    html = "<p><img src=\"http://www.image/test.png\" alt=\"\"></p>"
+    html = "<p><img src=\"http://www.image/test.png\" alt=\"\" role=\"presentation\"></p>"
     expect(cooked).to eq(html)
   end
 
   it "provides safety for img bbcode" do
     cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
-    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt=""></p>'
+    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt="" role="presentation"></p>'
     expect(cooked).to eq(html)
   end
 
@@ -1862,10 +1862,10 @@ HTML
 
       html = <<~HTML
         <p><img src="http://png.com/my.png" alt="title with | title" width="220" height="100"><br>
-        <img src="http://png.com/my.png" alt=""><br>
-        <img src="http://png.com/my.png" alt="" width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt="" role="presentation"><br>
+        <img src="http://png.com/my.png" alt="" width="220" height="100" role="presentation"><br>
         <img src="http://png.com/my.png" alt="stuff"><br>
-        <img src="http://png.com/my.png" alt="" title="some title" width="110" height="50"></p>
+        <img src="http://png.com/my.png" alt="" title="some title" width="110" height="50" role="presentation"></p>
       HTML
 
       expect(cooked).to eq(html.strip)
@@ -1881,11 +1881,11 @@ HTML
       MD
 
       html = <<~HTML
-        <p><img src="http://png.com/my.png" alt="" width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt="" width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt="" width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt="" width="150" height="68"><br>
-        <img src="http://png.com/my.png" alt="" width="110" height="50"></p>
+        <p><img src="http://png.com/my.png" alt="" width="110" height="50" role="presentation"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50" role="presentation"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50" role="presentation"><br>
+        <img src="http://png.com/my.png" alt="" width="150" height="68" role="presentation"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50" role="presentation"></p>
       HTML
 
       expect(cooked).to eq(html.strip)

From b5005e3574cc487ae2115ea08fc30dea264d15a6 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 12 Oct 2022 15:22:22 +0200
Subject: [PATCH 120/332] DEV: Always use non-builtin net-* and digest gems
 (#18560)

This will possibly fix the issue we're having with Dependabot. It seems it now uses a different ruby version (i.e. 3.1+)
---
 Gemfile      | 11 ++++-------
 Gemfile.lock |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index ba96d9a8fd..daf68be0cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -134,13 +134,10 @@ gem 'cose', require: false
 gem 'addressable'
 gem 'json_schemer'
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
-  # net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1
-  gem "net-smtp", "~> 0.2.1", require: false
-  gem "net-imap", "~> 0.2.1", require: false
-  gem "net-pop", "~> 0.1.1", require: false
-  gem "digest", "3.0.0", require: false
-end
+gem "net-smtp", require: false
+gem "net-imap", require: false
+gem "net-pop", require: false
+gem "digest", require: false
 
 # Gems used only for assets and not required in production environments by default.
 # Allow everywhere for now cause we are allowing asset debugging in production
diff --git a/Gemfile.lock b/Gemfile.lock
index e7977f67d0..d464f59783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,6 +118,7 @@ GEM
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     diffy (3.4.2)
+    digest (3.1.0)
     discourse-ember-rails (0.18.6)
       active_model_serializers
       ember-data-source (>= 1.0.0.beta.5)
@@ -542,6 +543,7 @@ DEPENDENCIES
   cppjieba_rb
   css_parser
   diffy
+  digest
   discourse-ember-rails (= 0.18.6)
   discourse-ember-source (~> 3.12.2)
   discourse-fonts
@@ -588,6 +590,9 @@ DEPENDENCIES
   multi_json
   mustache
   net-http
+  net-imap
+  net-pop
+  net-smtp
   nokogiri
   oj (= 3.13.14)
   omniauth

From ea326906e3227cee02a577c3fd381d88aa26a381 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 12 Oct 2022 15:31:59 +0200
Subject: [PATCH 121/332] DEV: Use css var font sizes (#18518)

For consistency and and the ability to change all font sizes at once in the dev tools
---
 .../stylesheets/common/admin/admin_base.scss  | 14 ++++----
 .../common/admin/admin_report.scss            |  8 ++---
 .../common/admin/admin_report_counters.scss   |  2 +-
 app/assets/stylesheets/common/admin/api.scss  |  8 ++---
 .../stylesheets/common/admin/badges.scss      |  4 +--
 .../common/admin/customize-install-theme.scss |  8 ++---
 .../stylesheets/common/admin/customize.scss   | 26 +++++++-------
 .../stylesheets/common/admin/dashboard.scss   | 20 +++++------
 .../stylesheets/common/admin/emails.scss      |  4 +--
 .../stylesheets/common/admin/settings.scss    |  4 +--
 .../stylesheets/common/admin/staff_logs.scss  |  4 +--
 .../stylesheets/common/admin/users.scss       |  2 +-
 .../stylesheets/common/base/_topic-list.scss  | 24 ++++++-------
 .../stylesheets/common/base/activation.scss   |  2 +-
 app/assets/stylesheets/common/base/alert.scss |  2 +-
 .../common/base/category-list.scss            | 10 +++---
 .../stylesheets/common/base/compose.scss      |  4 +--
 .../common/base/composer-user-selector.scss   |  2 +-
 .../stylesheets/common/base/directory.scss    |  8 ++---
 .../stylesheets/common/base/discourse.scss    | 14 ++++----
 app/assets/stylesheets/common/base/emoji.scss |  2 +-
 .../stylesheets/common/base/empty-state.scss  |  2 +-
 .../stylesheets/common/base/exception.scss    |  4 +--
 app/assets/stylesheets/common/base/faqs.scss  |  2 +-
 app/assets/stylesheets/common/base/group.scss |  4 +--
 .../stylesheets/common/base/groups.scss       |  4 +--
 .../stylesheets/common/base/header.scss       |  8 ++---
 .../stylesheets/common/base/lightbox.scss     |  2 +-
 app/assets/stylesheets/common/base/login.scss | 10 +++---
 .../common/base/magnific-popup.scss           |  6 ++--
 .../stylesheets/common/base/menu-panel.scss   | 10 +++---
 app/assets/stylesheets/common/base/modal.scss | 10 +++---
 .../stylesheets/common/base/not-found.scss    |  2 +-
 .../stylesheets/common/base/onebox.scss       | 18 +++++-----
 .../stylesheets/common/base/redirection.scss  |  2 +-
 .../common/base/request_access.scss           |  4 +--
 .../stylesheets/common/base/reviewables.scss  | 12 +++----
 .../stylesheets/common/base/search.scss       | 10 +++---
 .../stylesheets/common/base/tagging.scss      | 18 +++++-----
 .../stylesheets/common/base/tooltip.scss      |  4 +--
 .../stylesheets/common/base/topic-post.scss   | 36 +++++++++----------
 app/assets/stylesheets/common/base/topic.scss | 10 +++---
 .../stylesheets/common/base/user-badges.scss  | 18 +++++-----
 app/assets/stylesheets/common/base/user.scss  | 22 ++++++------
 .../stylesheets/common/components/badges.scss |  8 ++---
 .../common/components/bookmark-list.scss      |  4 +--
 .../common/components/buttons.scss            |  6 ++--
 .../conditional-loading-section.scss          |  2 +-
 .../stylesheets/common/components/navs.scss   |  8 ++---
 .../components/share-and-invite-modal.scss    |  6 ++--
 .../common/components/user-card.scss          |  2 +-
 .../common/components/user-info.scss          |  2 +-
 .../common/components/user-stream-item.scss   | 10 +++---
 .../common/select-kit/category-chooser.scss   |  4 +--
 .../common/select-kit/category-drop.scss      |  4 +--
 .../common/select-kit/category-selector.scss  |  2 +-
 .../select-kit/dropdown-select-box.scss       |  6 ++--
 .../select-kit/email-group-user-chooser.scss  |  2 +-
 .../select-kit/notifications-filter.scss      |  2 +-
 .../common/select-kit/period-chooser.scss     |  8 ++---
 .../common/select-kit/tag-drop.scss           |  2 +-
 .../toolbar-popup-menu-options.scss           |  2 +-
 .../common/select-kit/user-row.scss           |  2 +-
 .../stylesheets/common/topic-timeline.scss    |  2 +-
 .../stylesheets/desktop/category-list.scss    | 12 +++----
 .../desktop/components/user-card.scss         |  6 ++--
 app/assets/stylesheets/desktop/compose.scss   |  2 +-
 app/assets/stylesheets/desktop/discourse.scss |  4 +--
 app/assets/stylesheets/desktop/header.scss    |  4 +--
 app/assets/stylesheets/desktop/history.scss   |  2 +-
 .../desktop/latest-topic-list.scss            |  6 ++--
 app/assets/stylesheets/desktop/login.scss     |  4 +--
 app/assets/stylesheets/desktop/modal.scss     |  4 +--
 .../stylesheets/desktop/topic-list.scss       |  8 ++---
 .../stylesheets/desktop/topic-post.scss       | 12 +++----
 app/assets/stylesheets/desktop/topic.scss     | 10 +++---
 app/assets/stylesheets/embed.scss             | 14 ++++----
 .../mobile/admin_report_table.scss            |  2 +-
 .../mobile/components/user-card.scss          |  8 ++---
 app/assets/stylesheets/mobile/compose.scss    |  4 +--
 app/assets/stylesheets/mobile/dashboard.scss  |  2 +-
 app/assets/stylesheets/mobile/directory.scss  |  2 +-
 .../stylesheets/mobile/edit-category.scss     |  2 +-
 app/assets/stylesheets/mobile/header.scss     |  4 +--
 app/assets/stylesheets/mobile/login.scss      |  4 +--
 app/assets/stylesheets/mobile/modal.scss      |  4 +--
 .../mobile/select-kit/category-drop.scss      |  4 +--
 .../mobile/select-kit/tag-drop.scss           |  4 +--
 app/assets/stylesheets/mobile/topic-list.scss | 18 +++++-----
 app/assets/stylesheets/mobile/topic-post.scss | 10 +++---
 app/assets/stylesheets/mobile/topic.scss      |  8 ++---
 app/assets/stylesheets/mobile/user.scss       |  6 ++--
 app/assets/stylesheets/publish_mobile.scss    |  2 +-
 .../stylesheets/common/poll-ui-builder.scss   |  2 +-
 .../poll/assets/stylesheets/common/poll.scss  |  6 ++--
 .../poll/assets/stylesheets/mobile/poll.scss  |  2 +-
 96 files changed, 328 insertions(+), 328 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 44ef288473..33db25dd7f 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -139,7 +139,7 @@ $mobile-breakpoint: 700px;
     .label {
       display: block;
       color: var(--primary-medium);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin: 0.5em 0 0.15em 0;
     }
     tr {
@@ -205,7 +205,7 @@ $mobile-breakpoint: 700px;
     }
     .site-text-search {
       padding: 0.5em;
-      font-size: $font-0;
+      font-size: var(--font-0);
       width: 50%;
     }
     .reseed {
@@ -230,7 +230,7 @@ $mobile-breakpoint: 700px;
     }
     h3 {
       font-weight: normal;
-      font-size: $font-0;
+      font-size: var(--font-0);
       @include breakpoint(mobile-extra-large) {
         word-wrap: break-word;
       }
@@ -296,7 +296,7 @@ $mobile-breakpoint: 700px;
   width: 27%;
   float: left;
   li a span.count {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     float: right;
     margin-right: 10px;
     background-color: var(--primary-low);
@@ -387,7 +387,7 @@ $mobile-breakpoint: 700px;
     background-color: var(--secondary);
     padding: 12px 12px 5px;
     .powered-by {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       position: absolute;
       bottom: -10px;
       left: 10px;
@@ -546,7 +546,7 @@ $mobile-breakpoint: 700px;
     }
   }
   h1 {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     line-height: $line-height-medium;
     color: var(--primary);
   }
@@ -695,7 +695,7 @@ $mobile-breakpoint: 700px;
 
 section.details {
   h1 {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     color: var(--primary);
     padding: 5px 10px;
     margin: 30px 0 5px 0;
diff --git a/app/assets/stylesheets/common/admin/admin_report.scss b/app/assets/stylesheets/common/admin/admin_report.scss
index 5a9e7bf4fc..4df36357ff 100644
--- a/app/assets/stylesheets/common/admin/admin_report.scss
+++ b/app/assets/stylesheets/common/admin/admin_report.scss
@@ -19,7 +19,7 @@
 
     .item {
       display: inline;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
 
     .all-reports .report-url {
@@ -67,11 +67,11 @@
     }
 
     .value {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
 
     .icon {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: 700;
     }
   }
@@ -96,7 +96,7 @@
 
     .d-icon {
       color: currentColor;
-      font-size: $font-up-5;
+      font-size: var(--font-up-5);
       display: block;
       margin: 0.25em auto;
     }
diff --git a/app/assets/stylesheets/common/admin/admin_report_counters.scss b/app/assets/stylesheets/common/admin/admin_report_counters.scss
index a055d716aa..e26f7daa63 100644
--- a/app/assets/stylesheets/common/admin/admin_report_counters.scss
+++ b/app/assets/stylesheets/common/admin/admin_report_counters.scss
@@ -34,7 +34,7 @@
 
       .d-icon-minus {
         color: var(--primary-medium);
-        font-size: $font-down-3;
+        font-size: var(--font-down-3);
       }
 
       &.high-trending-up,
diff --git a/app/assets/stylesheets/common/admin/api.scss b/app/assets/stylesheets/common/admin/api.scss
index ae41c0abf2..19ca2c84ec 100644
--- a/app/assets/stylesheets/common/admin/api.scss
+++ b/app/assets/stylesheets/common/admin/api.scss
@@ -202,16 +202,16 @@ table.api-keys {
     }
 
     .scope-resource-name {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
 
     .scope-tooltip {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
 
     .scope-name {
       font-weight: bold;
-      font-size: $font-0;
+      font-size: var(--font-0);
       display: inline;
     }
   }
@@ -310,7 +310,7 @@ table.api-keys {
     margin-top: 10px;
   }
   label {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   &.content-list {
     width: 100%;
diff --git a/app/assets/stylesheets/common/admin/badges.scss b/app/assets/stylesheets/common/admin/badges.scss
index a22bbdd373..2af146bb6a 100644
--- a/app/assets/stylesheets/common/admin/badges.scss
+++ b/app/assets/stylesheets/common/admin/badges.scss
@@ -47,7 +47,7 @@
       }
       .list-badge {
         float: right;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         font-weight: normal;
         padding: 0 6px;
         color: var(--secondary);
@@ -66,7 +66,7 @@
       margin: 0;
       margin-top: 5px;
       color: var(--primary-medium);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
     .badge-grouping-control {
       display: flex;
diff --git a/app/assets/stylesheets/common/admin/customize-install-theme.scss b/app/assets/stylesheets/common/admin/customize-install-theme.scss
index 939d4be29b..2b90528a87 100644
--- a/app/assets/stylesheets/common/admin/customize-install-theme.scss
+++ b/app/assets/stylesheets/common/admin/customize-install-theme.scss
@@ -95,7 +95,7 @@
     flex: 1;
     .popular-theme-type {
       font-weight: normal;
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       color: var(--primary-medium);
     }
 
@@ -110,21 +110,21 @@
     }
 
     .popular-theme-description {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       padding-right: 20px;
     }
   }
   .popular-theme-buttons {
     > span {
       font-style: italic;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       color: var(--primary-medium);
       margin-right: 8px;
     }
 
     > a {
       display: block;
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       margin-top: 5px;
       text-align: center;
     }
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index bf18cfc2b4..871ff9c9b3 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -48,7 +48,7 @@
     margin-bottom: 10px;
     input {
       margin-bottom: 0;
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       .ios-device & {
         font-size: var(--font-down-2);
       }
@@ -86,7 +86,7 @@
     vertical-align: top;
 
     .title {
-      font-size: $font-up-4;
+      font-size: var(--font-up-4);
       font-weight: bold;
       margin-bottom: 0.25em;
       display: flex;
@@ -99,7 +99,7 @@
         margin-left: 0.5em;
       }
       a {
-        font-size: $font-down-2;
+        font-size: var(--font-down-2);
       }
     }
 
@@ -120,7 +120,7 @@
     }
 
     div.remote-url {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin-bottom: 7px;
     }
 
@@ -135,7 +135,7 @@
     }
 
     .mini-title {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: bold;
       margin-bottom: 7px;
     }
@@ -264,7 +264,7 @@
         overflow: hidden;
         display: flex;
         font-weight: bold;
-        font-size: $font-up-1;
+        font-size: var(--font-up-1);
 
         .icons {
           margin-left: auto;
@@ -274,7 +274,7 @@
       .components-list {
         margin-top: 5px;
         display: inline-block;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         align-items: baseline;
         color: var(--primary-high);
 
@@ -368,7 +368,7 @@
   .editor-information {
     display: flex;
     align-items: center;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     margin-bottom: 0.5em;
 
     .editor-back-button {
@@ -501,7 +501,7 @@
 
     .ace_placeholder {
       font-family: inherit;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       color: $primary-high;
     }
 
@@ -572,7 +572,7 @@
     .description {
       margin: 0.15em 0 0;
       color: var(--primary-high);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       line-height: $line-height-medium;
     }
 
@@ -585,7 +585,7 @@
 
   .status-message {
     display: block;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin-top: 8px;
   }
 
@@ -759,7 +759,7 @@ table.permalinks {
       }
       div.label {
         display: block;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         color: var(--primary-medium);
       }
       td.controls,
@@ -875,7 +875,7 @@ table.permalinks {
 
 .reseed-modal {
   .options-group-title {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     font-weight: bold;
     margin: 8px 0;
   }
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index 5f8faf8036..e8773fa4fd 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -314,7 +314,7 @@
     border: 1px solid var(--primary-low);
 
     .title {
-      font-size: $font-0;
+      font-size: var(--font-0);
     }
 
     .spinner {
@@ -338,7 +338,7 @@
     }
 
     .d-icon {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       margin: 0 0.25em 0 0;
       color: var(--primary-low-mid);
     }
@@ -377,7 +377,7 @@
 
       .d-icon {
         margin-right: 5px;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
     }
 
@@ -567,7 +567,7 @@
   }
 
   .version-number {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     line-height: $line-height-small;
     box-sizing: border-box;
     font-weight: bold;
@@ -582,13 +582,13 @@
     }
 
     h4 {
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       margin-bottom: 0.5em;
     }
 
     .sha-link {
       display: inline-flex;
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       font-weight: normal;
     }
   }
@@ -606,7 +606,7 @@
     }
     .face {
       margin: 0 0.75em 0 0;
-      font-size: $font-up-3;
+      font-size: var(--font-up-3);
     }
   }
   &.critical .version-notes .normal-note {
@@ -616,7 +616,7 @@
     display: none;
   }
   .fa {
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
   }
   .up-to-date {
     color: var(--success);
@@ -631,7 +631,7 @@
 
 .update-nag {
   .d-icon {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
 }
 
@@ -691,7 +691,7 @@
     padding-right: 0.5em;
     width: 75%;
     .header {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: bold;
       margin-bottom: 0.5em;
     }
diff --git a/app/assets/stylesheets/common/admin/emails.scss b/app/assets/stylesheets/common/admin/emails.scss
index 0b6b9e76a2..a1da84fd0a 100644
--- a/app/assets/stylesheets/common/admin/emails.scss
+++ b/app/assets/stylesheets/common/admin/emails.scss
@@ -10,7 +10,7 @@
   }
   .reply-key {
     display: block;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary-medium);
   }
   .username div {
@@ -53,7 +53,7 @@
   }
   .error-description {
     color: var(--primary-medium);
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   hr {
     margin: 0;
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index c27a0606a3..807a475876 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -94,7 +94,7 @@
     .desc,
     .validation-error {
       padding-top: 3px;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       line-height: $line-height-large;
     }
     .validation-error {
@@ -104,7 +104,7 @@
       color: var(--primary-medium);
     }
     h3 {
-      font-size: $font-0;
+      font-size: var(--font-0);
       font-weight: normal;
     }
   }
diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss
index 3f2b48aa06..9aa7443a2f 100644
--- a/app/assets/stylesheets/common/admin/staff_logs.scss
+++ b/app/assets/stylesheets/common/admin/staff_logs.scss
@@ -124,7 +124,7 @@
       margin-right: 0.25em;
     }
     .deleted-user {
-      font-size: $font-up-2;
+      font-size: var(--font-up-2);
     }
   }
   .created_at {
@@ -297,7 +297,7 @@ table.screened-ip-addresses {
 
   .tag {
     background: var(--primary-low);
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin-right: 0.1em;
     padding: 0.5em;
   }
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
index 42ab09fe09..59410f5987 100644
--- a/app/assets/stylesheets/common/admin/users.scss
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -63,7 +63,7 @@
   }
   .long-value {
     margin-left: 12px;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     button {
       margin-left: 10px;
     }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index b04e40e97c..584bc8f016 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -3,14 +3,14 @@
 .list-controls {
   a.badge-category {
     padding: 3px 12px;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 
   .combo-box .combo-box-header {
     background: var(--secondary);
     color: var(--primary);
     border: 1px solid var(--primary-medium);
-    font-size: $font-0;
+    font-size: var(--font-0);
     transition: none;
     height: 100%;
     &:focus {
@@ -95,7 +95,7 @@
   p {
     margin-top: 0;
     line-height: $line-height-large;
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
 }
 
@@ -145,13 +145,13 @@
   .post-excerpt {
     margin-top: 0.5em;
     margin-bottom: 0.5em;
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     word-break: break-word;
   }
 }
 
 .topic-list-main-link {
-  font-size: $font-up-1;
+  font-size: var(--font-up-1);
   a.title {
     padding: 15px 0;
     word-break: break-word;
@@ -210,7 +210,7 @@
       background-color: var(--secondary);
       color: var(--danger-medium);
       padding: 0 8px;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
 
@@ -225,7 +225,7 @@
 
   td {
     color: var(--primary-medium);
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 
   .main-link {
@@ -253,12 +253,12 @@
     }
     .d-icon {
       vertical-align: middle;
-      font-size: $font-down-5;
+      font-size: var(--font-down-5);
     }
   }
 
   .link-bottom-line {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     display: flex;
     flex-wrap: wrap;
     align-items: center;
@@ -282,7 +282,7 @@
 
   .topic-excerpt {
     display: block;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin-top: 0.33em;
     color: var(--primary-high);
     word-wrap: break-word;
@@ -360,7 +360,7 @@
     padding: 0;
     border: 0;
     color: var(--danger-medium);
-    font-size: $font-0;
+    font-size: var(--font-0);
     cursor: default;
   }
 }
@@ -368,7 +368,7 @@
 .topic-list {
   .alert {
     margin-bottom: 0;
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   .spinner {
     margin-top: 40px;
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index 00ec1e4fa7..559fa2a09f 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -10,7 +10,7 @@
 
   .account-created {
     .ac-message {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       line-height: $line-height-large;
     }
     .activation-controls {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 5534e6ac2c..912a1a6605 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -6,7 +6,7 @@
   margin-bottom: 1em;
 
   .close {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     position: absolute;
     top: 0.265em;
     right: 0.66em;
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index f3b52df42f..75fd1d9b03 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -143,7 +143,7 @@
   .description {
     margin-bottom: 1em;
     text-align: center;
-    font-size: $font-0;
+    font-size: var(--font-0);
     color: var(--primary-med-or-secondary-high);
     position: relative;
     @include line-clamp(4);
@@ -160,7 +160,7 @@
   }
 
   h3 {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     margin-bottom: 0.5em;
     margin-top: 0.25em;
     line-height: $line-height-medium;
@@ -260,7 +260,7 @@
   }
 
   h3 {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     text-align: center;
     overflow: hidden;
   }
@@ -331,7 +331,7 @@
   margin-bottom: 0;
   border-top: 1px solid var(--primary-low);
   .category-description {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .category-logo.aspect-image {
     --max-height: 75px;
@@ -342,7 +342,7 @@
   > h3 a.category-title-link,
   > h4 a.category-title-link {
     color: var(--primary-medium);
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   > .category-description,
   tr.category-description {
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 35b6f6667d..0bbc9cfbc4 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -415,7 +415,7 @@ html.composer-open {
           color: var(--primary);
         }
         span.name {
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
           vertical-align: middle;
         }
         &.selected {
@@ -447,7 +447,7 @@ div.ac-wrap.disabled {
 div.ac-wrap div.item a.remove,
 .remove-link {
   margin-left: 4px;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   line-height: $line-height-small;
   padding: 1px 3.5px;
   border-radius: 12px;
diff --git a/app/assets/stylesheets/common/base/composer-user-selector.scss b/app/assets/stylesheets/common/base/composer-user-selector.scss
index a1614ffdfd..e689d53c37 100644
--- a/app/assets/stylesheets/common/base/composer-user-selector.scss
+++ b/app/assets/stylesheets/common/base/composer-user-selector.scss
@@ -5,7 +5,7 @@ div.ac-wrap.composer-user-selector-limited {
   .btn-primary {
     margin-left: 0.5em;
     padding: 3px 6px 2px;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     min-height: unset;
   }
 }
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 450f561500..eb37317f9f 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -37,7 +37,7 @@
   .directory-last-updated {
     margin-bottom: 0.5em;
     color: var(--primary-medium);
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   table {
@@ -55,10 +55,10 @@
 
       .number,
       .time-read {
-        font-size: $font-up-3;
+        font-size: var(--font-up-3);
         color: var(--primary-medium);
         @media screen and (max-width: $small-width) {
-          font-size: $font-up-1;
+          font-size: var(--font-up-1);
         }
       }
       .time-read {
@@ -68,7 +68,7 @@
         font-size: var(--font-up-1);
         color: var(--primary-medium);
         @media screen and (max-width: $small-width) {
-          font-size: $font-0;
+          font-size: var(--font-0);
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index fe536833e5..d6a87afbf3 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -73,10 +73,10 @@ body {
 
 // setting a static limit on big and small prevents nesting abuse
 big {
-  font-size: $font-up-5;
+  font-size: var(--font-up-5);
 }
 small {
-  font-size: $font-down-2;
+  font-size: var(--font-down-2);
 }
 
 blockquote {
@@ -469,7 +469,7 @@ table {
 
     .relative-date {
       text-align: left;
-      font-size: $font-down-3;
+      font-size: var(--font-down-3);
       padding-top: 3px;
       margin-left: 0.75em;
       color: var(--primary-medium);
@@ -544,7 +544,7 @@ table {
 
   .skip-new-user-tips,
   .read-later-link {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     text-decoration: underline;
   }
 
@@ -606,7 +606,7 @@ table {
 .content-list {
   h3 {
     color: var(--primary-medium);
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     padding-left: 5px;
     margin-bottom: 10px;
   }
@@ -658,7 +658,7 @@ table {
     font-family: $heading-font-family;
 
     font-weight: bold;
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     line-height: $line-height-large;
   }
 
@@ -718,7 +718,7 @@ table {
 
 #loading-message {
   position: absolute;
-  font-size: $font-up-5;
+  font-size: var(--font-up-5);
   text-align: center;
   top: 120px;
   left: 500px;
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 4dd77506fd..0f04d5e09d 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -69,7 +69,7 @@ sup img.emoji {
 
       .trash-recent {
         background: none;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
 
         &:hover .d-icon {
           color: var(--danger-hover);
diff --git a/app/assets/stylesheets/common/base/empty-state.scss b/app/assets/stylesheets/common/base/empty-state.scss
index 7c1245a7c2..b7cc375e7b 100644
--- a/app/assets/stylesheets/common/base/empty-state.scss
+++ b/app/assets/stylesheets/common/base/empty-state.scss
@@ -9,7 +9,7 @@
     font-weight: 700;
     padding: 0;
     margin: 0;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 
   .empty-state-body {
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 398db97b27..47a2992824 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -6,11 +6,11 @@
     font-size: 4.286em;
   }
   .reason {
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
   }
   .url {
     font-style: italic;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .desc {
     margin-top: 16px;
diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index 26fc429851..95a6327a05 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -14,7 +14,7 @@
     }
   }
   .mobile-view & {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   li {
     margin-bottom: 8px;
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 4d9fc177bb..6591bd0e3c 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -48,13 +48,13 @@ span.mention-group {
   }
 
   .group-info-name {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     font-weight: bold;
     color: var(--primary);
   }
 
   .group-info-full-name {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     color: var(--primary-high-or-secondary-low);
   }
 
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index f577589fb1..0c6c9ea436 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -108,7 +108,7 @@
     }
 
     .groups-info-name {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: bold;
       color: var(--primary);
     }
@@ -150,7 +150,7 @@
     .control-instructions {
       color: $primary-medium;
       margin-bottom: 10px;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       line-height: $line-height-large;
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 4bf326015f..901e2f3d41 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -62,7 +62,7 @@
   }
 
   .d-icon-home {
-    font-size: $font-up-6;
+    font-size: var(--font-up-6);
   }
 
   .panel {
@@ -180,7 +180,7 @@
 
   .d-icon {
     width: 100%;
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
     line-height: $line-height-large;
     display: inline-block;
     color: var(--header_primary-low-mid);
@@ -292,7 +292,7 @@
   .header-title {
     padding: 0;
     margin: 0;
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     width: 100%;
   }
   .categories-wrapper {
@@ -340,7 +340,7 @@ $mobile-avatar-height: 1.532em;
 .topic-header-participants {
   display: flex;
   align-items: center;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   @include ellipsis;
   &:not(:first-child) {
     margin-left: 5px;
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 2d063563aa..db86e581ca 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -63,7 +63,7 @@ $meta-element-margin: 6px;
     margin: $meta-element-margin;
     padding-right: 20px;
     color: var(--secondary-high);
-    font-size: $font-0;
+    font-size: var(--font-0);
     flex-shrink: 0;
     flex-grow: 3;
   }
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 4d8f14ac68..3ce8be5502 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -3,7 +3,7 @@ $invite-mobile-bg: absolute-image-url("/branded-background-mobile.svg");
 
 .caps-lock-warning {
   color: var(--danger);
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   font-weight: bold;
 }
 
@@ -203,7 +203,7 @@ body.invite-page {
         left: calc(1em - 0.25em);
         background-color: var(--secondary);
         padding: 0 0.25em 0 0.25em;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
       input.alt-placeholder:invalid {
         color: var(--primary);
@@ -220,7 +220,7 @@ body.invite-page {
 
       #forgot-password-link,
       #email-login-link {
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
 
       .tip:not(:empty) + label.more-info {
@@ -400,7 +400,7 @@ body.invite-page {
     .instructions {
       color: var(--primary-medium);
       margin: 0;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       font-weight: normal;
       line-height: $line-height-medium;
     }
@@ -432,7 +432,7 @@ button#new-account-link {
   align-items: center;
   p {
     margin: 0;
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   a {
     display: inline-block;
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index b96367f538..f6ec6bb212 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -271,7 +271,7 @@ button {
   padding: 0 0 18px 10px;
   color: $controls-color;
   font-style: normal;
-  font-size: $font-up-5;
+  font-size: var(--font-up-5);
   font-family: Arial, Baskerville, monospace;
 
   &:hover,
@@ -306,7 +306,7 @@ button {
   top: 0;
   right: 0;
   color: $controls-text-color;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   line-height: $line-height-medium;
 }
 
@@ -458,7 +458,7 @@ button {
     small {
       color: $caption-subtitle-color;
       display: block;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       line-height: $line-height-medium;
     }
     figure {
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 4d100cb2aa..7cfc0310ab 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -218,7 +218,7 @@
 
     .profile-tab-btn {
       .relative-date {
-        font-size: $font-down-3;
+        font-size: var(--font-down-3);
         color: var(--primary-medium);
       }
 
@@ -289,7 +289,7 @@
     }
 
     .new {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin-left: 0.5em;
       color: var(--primary-med-or-secondary-med);
     }
@@ -324,7 +324,7 @@
       background-color: transparent;
       display: inline;
       padding: 0;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       line-height: $line-height-large;
     }
     .badge-wrapper {
@@ -349,11 +349,11 @@
   b.topics-count {
     color: var(--primary-med-or-secondary-med);
     font-weight: normal;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   div.discourse-tags {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 10aa9ce7e7..337db4e99f 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -171,7 +171,7 @@
     padding: 10px 30px 10px 15px;
     background-color: var(--secondary);
     li > a {
-      font-size: $font-0;
+      font-size: var(--font-0);
     }
     border-bottom: 1px solid var(--primary-low);
   }
@@ -228,7 +228,7 @@
               align-items: center;
             }
             .discourse-tags {
-              font-size: $font-down-1;
+              font-size: var(--font-down-1);
             }
           }
         }
@@ -240,7 +240,7 @@
       box-sizing: border-box;
     }
     p {
-      font-size: $font-0;
+      font-size: var(--font-0);
     }
     .archetype-option {
       margin-bottom: 20px;
@@ -269,7 +269,7 @@
 
   // password reset modal
   .modal-body.forgot-password-modal p {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 
   pre code {
@@ -462,7 +462,7 @@
 
 .custom-message-length {
   color: var(--primary-medium);
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 
 .jump-to-post-modal {
diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
index da46e2151f..798249480c 100644
--- a/app/assets/stylesheets/common/base/not-found.scss
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -4,7 +4,7 @@
   margin: 0 0 40px 0;
 
   h1.title {
-    font-size: $font-up-5;
+    font-size: var(--font-up-5);
     line-height: $line-height-medium;
   }
 
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index a15badbef9..9e88aad716 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -19,7 +19,7 @@ a.loading-onebox {
 
   margin-top: 15px;
   padding: 12px;
-  font-size: $font-0;
+  font-size: var(--font-0);
   > .source {
     margin-bottom: 12px;
     margin-right: 10px;
@@ -34,7 +34,7 @@ a.loading-onebox {
         padding-right: 10px;
       }
       position: absolute;
-      font-size: $font-0;
+      font-size: var(--font-0);
       img.favicon {
         margin-right: 3px;
       }
@@ -96,7 +96,7 @@ aside.onebox {
   border: 5px solid var(--primary-low);
   margin: 1em 0;
   padding: 1em;
-  font-size: $font-0;
+  font-size: var(--font-0);
   background: var(--secondary);
 
   header {
@@ -129,7 +129,7 @@ aside.onebox {
 
     h3,
     h4 {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       margin: 0 0 10px 0;
     }
 
@@ -371,7 +371,7 @@ pre.onebox code ol.lines li:before {
   color: #afafaf;
   text-align: right;
   padding-right: 5px;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   line-height: $line-height-large;
   content: counter(li-counter);
   counter-increment: li-counter;
@@ -453,7 +453,7 @@ pre.onebox code {
   }
 
   .branches {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     code {
       word-break: break-all;
     }
@@ -577,7 +577,7 @@ pre.onebox code {
 
 .onebox-body .build_status {
   padding: 2px;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 
 .onebox-body .status_tag.open {
@@ -674,7 +674,7 @@ aside.onebox.twitterstatus .onebox-body {
   .outer-box {
     position: absolute;
     z-index: z("base");
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: #fff;
     background-color: rgba(0, 0, 0, 0.6);
     @include ellipsis;
@@ -689,7 +689,7 @@ aside.onebox.twitterstatus .onebox-body {
 
       .album-title {
         width: 100%;
-        font-size: $font-up-1;
+        font-size: var(--font-up-1);
         line-height: $line-height-large;
         color: #ccc;
         text-decoration: none;
diff --git a/app/assets/stylesheets/common/base/redirection.scss b/app/assets/stylesheets/common/base/redirection.scss
index bf7536243d..ffb57505df 100644
--- a/app/assets/stylesheets/common/base/redirection.scss
+++ b/app/assets/stylesheets/common/base/redirection.scss
@@ -1,6 +1,6 @@
 .redirection-warning {
   margin: 0 auto;
   text-align: center;
-  font-size: $font-up-4;
+  font-size: var(--font-up-4);
   line-height: $line-height-medium;
 }
diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss
index 5bc4c21124..609e80eb36 100644
--- a/app/assets/stylesheets/common/base/request_access.scss
+++ b/app/assets/stylesheets/common/base/request_access.scss
@@ -4,10 +4,10 @@
   input[type="text"] {
     width: 320px;
     height: 30px;
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
   input[type="submit"] {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     padding: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index d0b67ca985..4edae726dc 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -213,7 +213,7 @@
   border-top: 1px solid var(--primary-low);
 
   .topic-statuses {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 
   .reviewable-meta-data {
@@ -221,7 +221,7 @@
     display: flex;
     width: 100%;
     margin-bottom: 0.5em;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     align-items: baseline;
     .reviewable-type {
       margin-right: 0.25em;
@@ -237,7 +237,7 @@
       }
     }
     .score {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
 
@@ -304,7 +304,7 @@
   }
 
   .d-icon {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary-medium);
   }
 
@@ -375,7 +375,7 @@
 .reviewable-item {
   .show-raw-email {
     color: var(--primary-medium);
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
   }
   .post-title {
     background-color: yellow;
@@ -450,7 +450,7 @@
       font-weight: bold;
       color: var(--primary);
       display: block;
-      font-size: $font-up-2;
+      font-size: var(--font-up-2);
       margin-right: 0.75em;
     }
   }
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 933ecfb5a6..2beab9abce 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -308,13 +308,13 @@
     font-weight: normal;
 
     .discourse-tag.simple {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin-right: 0.25em;
     }
   }
 
   .blurb {
-    font-size: $font-0;
+    font-size: var(--font-0);
     line-height: $line-height-large;
     color: var(--primary-medium);
     .date {
@@ -332,7 +332,7 @@
     margin-top: 0.25em;
     .d-icon {
       color: var(--love);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
 
@@ -341,7 +341,7 @@
   }
   .search-link {
     .topic-title {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       line-height: $line-height-medium;
       color: var(--primary);
     }
@@ -358,7 +358,7 @@
   }
 
   .discourse-tag.simple {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin-right: 0.25em;
   }
 }
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index d7fa954bf5..35e70f3562 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -21,11 +21,11 @@
   vertical-align: middle;
 
   .discourse-tag {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 
   .tag-count {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     vertical-align: middle;
     line-height: $line-height-small;
   }
@@ -47,7 +47,7 @@
 }
 
 .discourse-tag-count {
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   color: var(--primary-medium);
 }
 
@@ -72,7 +72,7 @@
   }
 
   &.large {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
 
   &.box {
@@ -122,7 +122,7 @@
 
 .d-header .topic-header-extra {
   .discourse-tags {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .discourse-tags + .topic-featured-link {
     margin-left: 8px;
@@ -144,14 +144,14 @@
 .topic-list-item {
   .discourse-tags {
     font-weight: normal;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 }
 
 .mobile-view .topic-list-item .discourse-tags {
   display: inline-flex;
   flex-wrap: wrap;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   margin-top: 0;
   .discourse-tag {
     margin-right: 0.2em;
@@ -169,7 +169,7 @@ header .discourse-tag {
 .list-tags {
   display: inline-block;
   margin-right: 3px;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 
 .tag-chooser {
@@ -372,7 +372,7 @@ section.tag-info {
     }
     .edit-tag {
       color: var(--primary-high);
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       margin-left: 0.5em;
     }
   }
diff --git a/app/assets/stylesheets/common/base/tooltip.scss b/app/assets/stylesheets/common/base/tooltip.scss
index d378903a4c..af5a4dc4e8 100644
--- a/app/assets/stylesheets/common/base/tooltip.scss
+++ b/app/assets/stylesheets/common/base/tooltip.scss
@@ -10,7 +10,7 @@ $discourse-tooltip-border: var(--primary-medium);
   margin-top: 25px;
   overflow-wrap: break-word;
   display: none;
-  font-size: $font-0;
+  font-size: var(--font-0);
   font-weight: 500;
 
   &.retina {
@@ -52,7 +52,7 @@ $discourse-tooltip-border: var(--primary-medium);
   .tooltip-content {
     padding: 1em;
     max-width: 250px;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary);
     box-shadow: shadow("dropdown");
     line-height: 1.4em;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 6ccb5eae0a..f400a14846 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -56,7 +56,7 @@ $quote-share-maxwidth: 150px;
   }
 
   span {
-    font-size: $font-0;
+    font-size: var(--font-0);
     margin-right: 8px;
     display: inline-block;
     @include ellipsis;
@@ -66,7 +66,7 @@ $quote-share-maxwidth: 150px;
     }
   }
   .fa {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary-med-or-secondary-med);
   }
   .svg-icon-title {
@@ -676,7 +676,7 @@ aside.quote {
       padding: 3px 5px;
       text-align: center;
       font-weight: normal;
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
       line-height: $line-height-small;
     }
   }
@@ -700,19 +700,19 @@ aside.quote {
     color: var(--primary);
     line-height: $line-height-large;
     font-weight: normal;
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 
   h4 {
     margin: 1px 0 2px 0;
     color: var(--primary-med-or-secondary-med);
     font-weight: normal;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     line-height: $line-height-small;
   }
 
   span.domain {
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     color: var(--primary-med-or-secondary-med);
   }
 
@@ -863,7 +863,7 @@ aside.quote {
     right: -4px;
   }
   .fa {
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
   }
 }
 .topic-map .poster .avatar-flair {
@@ -882,7 +882,7 @@ aside.quote {
     right: 0;
   }
   .d-icon {
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
   }
 }
 
@@ -936,7 +936,7 @@ aside.quote {
   &.whisper,
   &.post-locked {
     .d-icon {
-      font-size: $font-0;
+      font-size: var(--font-0);
     }
   }
 
@@ -1028,9 +1028,9 @@ pre {
     @include unselectable;
     top: 0;
     min-height: 0;
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     min-height: 0;
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     opacity: 0.7;
 
     &.action-complete {
@@ -1055,7 +1055,7 @@ kbd {
   box-sizing: border-box;
   color: var(--primary);
   display: inline-flex;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   justify-content: center;
   line-height: $line-height-large;
   margin: 0 0.15em;
@@ -1086,7 +1086,7 @@ blockquote > *:last-child {
   cursor: pointer;
   text-transform: uppercase;
   font-weight: bold;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 
 .who-liked,
@@ -1149,7 +1149,7 @@ blockquote > *:last-child {
     padding: 1em 0;
     text-transform: uppercase;
     font-weight: bold;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary-medium);
     min-width: 0; // Allows flex container to shrink
 
@@ -1165,7 +1165,7 @@ blockquote > *:last-child {
       flex: 1 1 100%;
       text-transform: none;
       font-weight: normal;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       order: 12;
       word-break: break-word;
       min-width: 0; // Allows content like oneboxes to shrink
@@ -1216,7 +1216,7 @@ blockquote > *:last-child {
       .topic-post-visited-message {
         background-color: var(--secondary);
         color: var(--danger-medium);
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         padding: 0 8px;
       }
     }
@@ -1291,7 +1291,7 @@ a.mention-group {
     > .d-icon {
       color: var(--primary-med-or-secondary-med);
       margin-right: 6px;
-      font-size: $font-0;
+      font-size: var(--font-0);
       line-height: $line-height-large;
     }
 
@@ -1306,7 +1306,7 @@ a.mention-group {
     > span.help {
       display: inline-block;
       color: var(--primary-med-or-secondary-med);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       font-style: italic;
       line-height: $line-height-large;
       margin-bottom: 1px;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index aaf7470e09..e85e2c78e6 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -195,7 +195,7 @@ $topic-progress-height: 42px;
   }
   h4 {
     display: inline;
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     line-height: $line-height-small;
   }
   .d-icon {
@@ -222,7 +222,7 @@ $topic-progress-height: 42px;
     padding: 0;
   }
   span .d-icon {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .topic-timer-heading,
   .slow-mode-heading {
@@ -238,7 +238,7 @@ $topic-progress-height: 42px;
     align-self: flex-start;
   }
   button {
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     background: transparent;
   }
 }
@@ -431,7 +431,7 @@ a.badge-category {
         flex: 0 0 auto;
       }
       .d-icon {
-        font-size: $font-down-2;
+        font-size: var(--font-down-2);
         margin: 0 0.5em 0 0;
       }
     }
@@ -487,7 +487,7 @@ a.topic-featured-link {
 
   .is-public {
     padding: 0.25em 0.5em;
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     background: var(--tertiary);
     color: var(--secondary);
     border-radius: 3px;
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 69ed47021b..bfa87f6e6d 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -70,7 +70,7 @@
 
 .show-badge .badge-user-info {
   .earned {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     margin-bottom: 1em;
   }
 }
@@ -81,7 +81,7 @@
   .load-more {
     padding-top: 30px;
     display: block;
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 }
 
@@ -96,11 +96,11 @@
   }
   .date {
     display: inline-block;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     margin-left: 10px;
   }
   .post-link {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     width: 500px;
     margin: 0;
     padding: 0;
@@ -137,7 +137,7 @@
     top: 5px;
     font-weight: bold;
     color: var(--primary-medium);
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 
   .favorite-btn {
@@ -195,9 +195,9 @@
 
       h3 {
         margin-bottom: 0.25em;
-        font-size: $font-up-1;
+        font-size: var(--font-up-1);
         @media screen and (min-width: 900px) {
-          font-size: $font-up-2;
+          font-size: var(--font-up-2);
         }
       }
     }
@@ -215,7 +215,7 @@
     .badge-contents {
       padding: 0 5%;
       h3 {
-        font-size: $font-up-3;
+        font-size: var(--font-up-3);
       }
     }
   }
@@ -259,7 +259,7 @@
   }
 
   .title {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index e000a57ed2..63ffaf2288 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -149,7 +149,7 @@
       border-bottom: 1px solid var(--primary-low);
 
       h1 {
-        font-size: $font-up-5;
+        font-size: var(--font-up-5);
         font-weight: normal;
         .d-icon {
           font-size: 0.8em;
@@ -240,11 +240,11 @@
           }
 
           h1 {
-            font-size: $font-up-3;
+            font-size: var(--font-up-3);
           }
 
           h2 {
-            font-size: $font-up-1;
+            font-size: var(--font-up-1);
           }
           h3,
           h3.location-and-website {
@@ -258,7 +258,7 @@
           bottom: 8px;
           right: 2px;
           .d-icon {
-            font-size: $font-0;
+            font-size: var(--font-0);
           }
         }
       }
@@ -325,7 +325,7 @@
         color: var(--primary-medium);
         margin-top: 5px;
         margin-bottom: 10px;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
     }
   }
@@ -465,7 +465,7 @@
 
   .value {
     font-weight: bold;
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 
   .label {
@@ -506,7 +506,7 @@
 
 .links-section {
   .domain {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     color: var(--primary-medium);
   }
 }
@@ -571,7 +571,7 @@
   .instructions {
     color: var(--primary-medium);
     margin-bottom: 10px;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     line-height: $line-height-large;
 
     a[href] {
@@ -670,7 +670,7 @@
     font-weight: bold;
   }
   .save-theme-alert {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   .control-subgroup {
@@ -758,7 +758,7 @@
     color: var(--primary-medium);
     margin-top: 5px;
     margin-bottom: 10px;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .second-factor-item {
     margin-top: 0.75em;
@@ -808,7 +808,7 @@
     }
 
     .invite-extra {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin: 0.25em 0;
 
       a {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 8e3df6a8b1..21c6678ce0 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -16,7 +16,7 @@
 // --------------------------------------------------
 
 .badge-wrapper {
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   white-space: nowrap;
   position: relative;
   display: inline-flex;
@@ -166,7 +166,7 @@
   padding: 0.21em 0.42em;
   min-width: 0.5em;
   color: var(--secondary);
-  font-size: $font-down-2;
+  font-size: var(--font-down-2);
   line-height: $line-height-small;
   text-align: center;
   background-color: var(--primary-low-mid-or-secondary-low);
@@ -216,7 +216,7 @@
 
 .badge-posts {
   font-weight: normal;
-  font-size: $font-0;
+  font-size: var(--font-0);
   line-height: $line-height-small;
   &[href] {
     color: var(--primary-med-or-secondary-med);
@@ -232,5 +232,5 @@
   color: var(--primary);
   background-color: var(--primary-low);
   border-color: var(--primary-low);
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
diff --git a/app/assets/stylesheets/common/components/bookmark-list.scss b/app/assets/stylesheets/common/components/bookmark-list.scss
index 7af6eeb64f..e1d27b1e51 100644
--- a/app/assets/stylesheets/common/components/bookmark-list.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list.scss
@@ -23,11 +23,11 @@ $mobile-breakpoint: 700px;
     }
   }
   .d-icon.bookmark-pinned {
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     margin-right: 0.2em;
   }
   .bookmark-metadata {
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     margin-bottom: 0.25em;
 
     &-item {
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 5246af6918..78653be5c5 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -83,12 +83,12 @@
   &.is-loading {
     &.btn-text {
       .d-button-label {
-        font-size: $font-down-2;
+        font-size: var(--font-down-2);
       }
 
       &.btn-small {
         .loading-icon {
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
           margin-right: 0.2em;
         }
       }
@@ -177,7 +177,7 @@
   }
   &:before {
     margin-right: 9px;
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   .d-icon,
   &.btn:hover .d-icon {
diff --git a/app/assets/stylesheets/common/components/conditional-loading-section.scss b/app/assets/stylesheets/common/components/conditional-loading-section.scss
index fac4abe5d4..c5c1b4e8f0 100644
--- a/app/assets/stylesheets/common/components/conditional-loading-section.scss
+++ b/app/assets/stylesheets/common/components/conditional-loading-section.scss
@@ -9,7 +9,7 @@
     flex-direction: column;
 
     .title {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: 700;
     }
   }
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index d808bab78d..c7208e7551 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -33,7 +33,7 @@
       border: none;
       padding: 6px 12px;
       color: var(--primary);
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       line-height: $line-height-small;
       box-sizing: border-box;
       min-height: 30px;
@@ -87,7 +87,7 @@
   a {
     margin: 0;
     padding: 0.75em;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     line-height: $line-height-small;
     cursor: pointer;
     color: var(--primary);
@@ -112,11 +112,11 @@
   }
 
   .count {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   .glyph {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     width: 1.25em;
     text-align: center;
     margin-right: 0.25em;
diff --git a/app/assets/stylesheets/common/components/share-and-invite-modal.scss b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
index cc374a6ab8..1ed7645fcf 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -18,13 +18,13 @@
     align-items: center;
 
     .title {
-      font-size: $font-0;
+      font-size: var(--font-0);
       font-weight: normal;
       margin-bottom: 8px;
 
       .post-date {
         color: var(--primary-medium);
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
     }
   }
@@ -50,7 +50,7 @@
       flex-direction: row;
 
       .social-link {
-        font-size: $font-up-6;
+        font-size: var(--font-up-6);
         margin-right: 8px;
       }
     }
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index a209bc5596..3b80ad8685 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -179,7 +179,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
       }
     }
     .profile-hidden {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       margin-top: 0.5em;
     }
   }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index bd7f95d423..3dd2200530 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -20,7 +20,7 @@
     width: 70%;
     padding-left: 5px;
     @media screen and (max-width: 600px) {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
 
     .name-line {
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index c191834a30..95452a77d5 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -45,7 +45,7 @@
   .draft-type {
     line-height: var(--line-height-small);
     color: var(--primary-medium);
-    font-size: $font-down-2;
+    font-size: var(--font-down-2);
     padding-top: 5px;
   }
 
@@ -55,7 +55,7 @@
   }
 
   .delete-info .d-icon {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 
   .expand-item,
@@ -72,7 +72,7 @@
   }
 
   .name {
-    font-size: $font-0;
+    font-size: var(--font-0);
     max-width: 400px;
     @include ellipsis;
   }
@@ -103,13 +103,13 @@
     .fa,
     .icon {
       color: var(--primary-med-or-secondary-med);
-      font-size: $font-up-4;
+      font-size: var(--font-up-4);
     }
   }
 
   .excerpt {
     margin: 1em 0 0 0;
-    font-size: $font-0;
+    font-size: var(--font-0);
     word-wrap: break-word;
     color: var(--primary);
     &:empty {
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index b02aaa3404..a0def956f7 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -15,7 +15,7 @@
         }
 
         .topic-count {
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
           color: var(--primary-medium);
           white-space: nowrap;
           margin-left: 0.5em;
@@ -30,7 +30,7 @@
 
         .category-desc {
           flex: 1 1 auto;
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
           line-height: $line-height-large;
         }
       }
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 4cd7b872e5..b7cbcbe549 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -4,7 +4,7 @@
       min-width: auto;
 
       .badge-wrapper {
-        font-size: $font-0;
+        font-size: var(--font-0);
         font-weight: normal;
         max-width: 260px;
 
@@ -60,7 +60,7 @@
           margin-left: 0.5em;
           font-weight: normal;
           color: var(--primary-medium);
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
         }
 
         .badge-wrapper {
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
index 75269ade54..45835a558b 100644
--- a/app/assets/stylesheets/common/select-kit/category-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -18,7 +18,7 @@
       }
 
       .plus-subcategories {
-        font-size: $font-down-2;
+        font-size: var(--font-down-2);
       }
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index d8f7228221..a28ce84da6 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -29,7 +29,7 @@
           .d-icon {
             flex: 0 0 100%;
             overflow: hidden;
-            font-size: $font-up-2;
+            font-size: var(--font-up-2);
             margin-right: 0;
           }
         }
@@ -45,7 +45,7 @@
           .name {
             flex: 1 1 auto;
             font-weight: bold;
-            font-size: $font-0;
+            font-size: var(--font-0);
             color: var(--primary);
             padding: 0;
             @include ellipsis;
@@ -54,7 +54,7 @@
 
           .desc {
             flex: 1 1 auto;
-            font-size: $font-down-1;
+            font-size: var(--font-down-1);
             font-weight: normal;
             color: var(--primary-medium);
             white-space: normal;
diff --git a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
index 599f95ecf0..f965c82a50 100644
--- a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
@@ -10,7 +10,7 @@
     }
     .name {
       color: var(--primary-high);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin-left: 0.5em;
       overflow: hidden;
       white-space: nowrap;
diff --git a/app/assets/stylesheets/common/select-kit/notifications-filter.scss b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
index 9ff4450ade..5bc55c9396 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-filter.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
@@ -30,7 +30,7 @@
         .d-icon {
           color: var(--primary-medium);
           margin: 0 0 0 0.25em;
-          font-size: $font-up-2;
+          font-size: var(--font-up-2);
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/period-chooser.scss b/app/assets/stylesheets/common/select-kit/period-chooser.scss
index c8a8dbced9..b0294ed514 100644
--- a/app/assets/stylesheets/common/select-kit/period-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/period-chooser.scss
@@ -24,7 +24,7 @@
           }
 
           .top-date-string {
-            font-size: $font-down-1;
+            font-size: var(--font-down-1);
             color: var(--primary-med-or-secondary-high);
             font-weight: normal;
             text-transform: uppercase;
@@ -34,7 +34,7 @@
         .d-icon {
           color: var(--primary);
           opacity: 1;
-          font-size: $font-up-3;
+          font-size: var(--font-up-3);
         }
 
         &.is-focused,
@@ -49,7 +49,7 @@
       .period-chooser-row {
         font-weight: bold;
         padding: 5px;
-        font-size: $font-up-1;
+        font-size: var(--font-up-1);
         align-items: center;
         display: flex;
 
@@ -63,7 +63,7 @@
 
         .top-date-string {
           font-weight: normal;
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
           color: var(--primary-med-or-secondary-high);
           text-transform: uppercase;
           margin-left: 5px;
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
index 09d456c59b..0dda52acb3 100644
--- a/app/assets/stylesheets/common/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -16,7 +16,7 @@
         box-sizing: border-box;
         width: 100%;
         padding: 0.5em 1em;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         color: var(--primary-low-mid);
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index dda8903999..21fd35e599 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -21,7 +21,7 @@
 
         .texts .name,
         .icons .d-icon {
-          font-size: $font-0;
+          font-size: var(--font-0);
           font-weight: normal;
         }
 
diff --git a/app/assets/stylesheets/common/select-kit/user-row.scss b/app/assets/stylesheets/common/select-kit/user-row.scss
index f6d5d98d69..8a52afbcf2 100644
--- a/app/assets/stylesheets/common/select-kit/user-row.scss
+++ b/app/assets/stylesheets/common/select-kit/user-row.scss
@@ -12,7 +12,7 @@
 
     .name {
       color: var(--primary-high);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin-left: 0.5em;
       overflow: hidden;
       white-space: nowrap;
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 8328170997..38d35f9dd0 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -99,7 +99,7 @@
           margin-top: 0;
           display: block;
           line-height: $line-height-medium;
-          font-size: $font-up-2;
+          font-size: var(--font-up-2);
           @include line-clamp(4);
         }
         a {
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 28f4ebb1dd..2182780969 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -37,11 +37,11 @@
     text-align: right;
 
     .value {
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
       font-weight: bold;
     }
     .unit {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
     .badge-notification {
       display: block;
@@ -77,7 +77,7 @@
     }
     a.last-posted-at,
     a.last-posted-at:visited {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       color: var(--primary-med-or-secondary-high);
     }
     .title {
@@ -102,11 +102,11 @@
       }
 
       h3 {
-        font-size: $font-up-2;
+        font-size: var(--font-up-2);
       }
 
       h4 {
-        font-size: $font-up-1;
+        font-size: var(--font-up-1);
       }
     }
 
@@ -141,7 +141,7 @@
 
   .discourse-tags {
     .discourse-tag {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
 
diff --git a/app/assets/stylesheets/desktop/components/user-card.scss b/app/assets/stylesheets/desktop/components/user-card.scss
index 5bdf16d42e..b298a5f8ca 100644
--- a/app/assets/stylesheets/desktop/components/user-card.scss
+++ b/app/assets/stylesheets/desktop/components/user-card.scss
@@ -24,14 +24,14 @@
   }
   h1 {
     .d-icon {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
   h2 {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
   h3 {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 27a989a070..9c7e1da061 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -207,7 +207,7 @@
         align-items: center;
 
         .discourse-tags {
-          font-size: $font-down-1;
+          font-size: var(--font-down-1);
         }
       }
     }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 40d0ead26f..0558259c36 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -56,7 +56,7 @@ input,
 button,
 select,
 textarea {
-  font-size: $font-0;
+  font-size: var(--font-0);
   font-weight: normal;
   line-height: $line-height-medium;
 }
@@ -65,7 +65,7 @@ select,
 textarea {
   display: inline-block;
   margin-bottom: 9px;
-  font-size: $font-0;
+  font-size: var(--font-0);
   line-height: $line-height-large;
   color: var(--primary);
 }
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index d69cb6cfd7..314bdb32bd 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -9,7 +9,7 @@
     height: 2.667em; // 40px with default 15px font size
   }
   #site-text-logo {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
   .extra-info {
     &:not(.two-rows) {
@@ -34,7 +34,7 @@
   color: var(--secondary-medium);
   display: block;
   word-wrap: break-word;
-  font-size: $font-down-2;
+  font-size: var(--font-down-2);
   line-height: $line-height-large;
   .search-highlight {
     color: var(--primary-high-or-secondary-low);
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 9dc4ec3c84..58f4951441 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -46,7 +46,7 @@
   }
   .markdown {
     font-family: monospace;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     width: 100%;
     border-collapse: collapse;
     border-spacing: 0;
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index f6f125c438..03178789a3 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -13,7 +13,7 @@
   }
 
   .posts-map {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     font-weight: bold;
     color: var(--primary-medium);
   }
@@ -39,7 +39,7 @@
     @extend .topic-list-main-link;
     flex: 0 1 auto;
     max-width: 65%;
-    font-size: $font-0;
+    font-size: var(--font-0);
     .badge-wrapper {
       max-width: 100%;
       .badge-category-bg {
@@ -49,7 +49,7 @@
 
     .top-row {
       margin-bottom: 0.1em;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
   }
   .topic-stats {
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 1ee881f000..464e3ab676 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -141,7 +141,7 @@
     .login-welcome-header {
       .login-title {
         line-height: $line-height-small;
-        font-size: $font-up-6;
+        font-size: var(--font-up-6);
       }
       p.login-subheader {
         font-size: var(--font-up-1);
@@ -276,7 +276,7 @@
     padding: 3em 2em 1em;
 
     .login-title {
-      font-size: $font-up-6;
+      font-size: var(--font-up-6);
       line-height: $line-height-medium;
     }
     p.login-subheader {
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index d739b9878a..5c5a63753a 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -19,12 +19,12 @@
 
 .modal-header {
   h3 {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
 }
 
 .close {
-  font-size: $font-up-3;
+  font-size: var(--font-up-3);
   text-decoration: none;
   &:visited {
     color: var(--primary-high);
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index e516d09ec0..3a9079534e 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -80,7 +80,7 @@
         cursor: default;
         color: var(--primary-med-or-secondary-med);
         line-height: $td-posters-more-lh;
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
       }
     }
   }
@@ -110,7 +110,7 @@
     width: auto;
     color: var(--primary-med-or-secondary-med);
     text-align: left;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin-top: 5px;
     .fa {
       margin-right: 2px;
@@ -238,7 +238,7 @@
   // slightly smaller font, tighten spacing on nav pills
   .nav-pills {
     > li > a {
-      font-size: $font-0;
+      font-size: var(--font-0);
       padding: 7px 10px;
     }
   }
@@ -251,7 +251,7 @@
     // smaller table cell spacing
     .topic-list-data {
       padding: 10px;
-      font-size: $font-0;
+      font-size: var(--font-0);
     }
   }
 }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 6869ed0072..34aa6cf38e 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -228,7 +228,7 @@ pre.codeblock-buttons:hover {
   .topic-meta-data h5 {
     position: absolute;
     z-index: z("base");
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     a {
       font-weight: bold;
       color: var(--primary-low-mid-or-secondary-high);
@@ -269,7 +269,7 @@ pre.codeblock-buttons:hover {
     }
     .number,
     .d-icon {
-      font-size: $font-up-2;
+      font-size: var(--font-up-2);
       line-height: $line-height-medium;
     }
     button .d-icon,
@@ -307,7 +307,7 @@ pre.codeblock-buttons:hover {
       }
       .fa {
         margin: 0;
-        font-size: $font-up-2;
+        font-size: var(--font-up-2);
         line-height: 52px;
       }
     }
@@ -407,7 +407,7 @@ video {
 }
 
 .deleted-user-avatar {
-  font-size: $font-up-6;
+  font-size: var(--font-up-6);
 }
 
 .info-line {
@@ -563,14 +563,14 @@ blockquote {
     margin-top: 10px;
   }
   p {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin: 0 0 10px 0;
   }
   p.cancel {
     margin: 10px 0 0 0;
   }
   h3 {
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
     color: var(--primary);
     margin-bottom: 5px;
     .d-icon {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 5e767a6233..71334e237e 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -24,7 +24,7 @@
     width: 500px;
   }
   h1 {
-    font-size: $font-up-4;
+    font-size: var(--font-up-4);
     line-height: $line-height-medium;
     overflow-wrap: break-word;
     width: 100%;
@@ -46,7 +46,7 @@
   width: 60%;
   margin-left: auto;
   margin-right: auto;
-  font-size: $font-up-4;
+  font-size: var(--font-up-4);
   text-align: center;
   line-height: $line-height-medium;
 
@@ -74,7 +74,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: $font-up-2;
+      font-size: var(--font-up-2);
     }
   }
   .jump-form {
@@ -84,7 +84,7 @@
       height: 20px;
       text-align: center;
       margin-bottom: 0;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
     button.btn {
       float: right;
@@ -106,7 +106,7 @@
   bottom: 0;
   position: fixed;
   width: 100%;
-  font-size: $font-0;
+  font-size: var(--font-0);
   z-index: z("dropdown");
 }
 
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 169856775d..6ccaf66fbc 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -43,7 +43,7 @@ article.post {
   .post-date {
     float: right;
     color: var(--primary-low-mid);
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin: 10px 4px 0 0;
   }
 
@@ -77,7 +77,7 @@ article.post {
 }
 
 .username {
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   margin: 0 0 10px 0;
 
   a {
@@ -103,7 +103,7 @@ img.emoji {
 }
 
 .in-reply-to {
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   text-align: center;
   margin: 10px 20px 6px 0;
   display: inline-block;
@@ -112,7 +112,7 @@ img.emoji {
 }
 
 .replies {
-  font-size: $font-0;
+  font-size: var(--font-0);
   color: var(--primary-medium);
 }
 
@@ -124,7 +124,7 @@ header.discourse {
   padding-left: 10px;
   padding-right: 10px;
   padding-bottom: 8px;
-  font-size: $font-up-2;
+  font-size: var(--font-up-2);
   border-bottom: 3px solid var(--primary-low);
 
   display: flex;
@@ -134,7 +134,7 @@ header.discourse {
 
   h3 {
     margin: 0 auto 0 0;
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
 }
 
@@ -143,7 +143,7 @@ header.discourse {
 }
 
 footer {
-  font-size: $font-up-2;
+  font-size: var(--font-up-2);
   margin-top: 0.5em;
   .button {
     color: white;
diff --git a/app/assets/stylesheets/mobile/admin_report_table.scss b/app/assets/stylesheets/mobile/admin_report_table.scss
index d414b0a8a9..98880d04a1 100644
--- a/app/assets/stylesheets/mobile/admin_report_table.scss
+++ b/app/assets/stylesheets/mobile/admin_report_table.scss
@@ -1,6 +1,6 @@
 .admin-report-table {
   .table {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   .table .admin-report-table-header {
diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index ec6c8d05f6..dc4b715a95 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -37,16 +37,16 @@ $avatar_width: 120px;
     }
   }
   h1 {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     .d-icon {
-      font-size: $font-down-2;
+      font-size: var(--font-down-2);
     }
   }
   h2 {
-    font-size: $font-0;
+    font-size: var(--font-0);
   }
   h3 {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index ef83fdbb95..136eb8880a 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -202,9 +202,9 @@
 
     .selected-name {
       .name {
-        font-size: $font-down-1;
+        font-size: var(--font-down-1);
         .badge-wrapper {
-          font-size: $font-0;
+          font-size: var(--font-0);
         }
       }
     }
diff --git a/app/assets/stylesheets/mobile/dashboard.scss b/app/assets/stylesheets/mobile/dashboard.scss
index 8161e79ff2..1a0aaf3692 100644
--- a/app/assets/stylesheets/mobile/dashboard.scss
+++ b/app/assets/stylesheets/mobile/dashboard.scss
@@ -1,7 +1,7 @@
 .dashboard,
 .dashboard-next {
   .activity-metrics .counters-list {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
   .navigation a.navigation-link {
     padding: 0.5em;
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 987580ccfc..8965198565 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,6 +1,6 @@
 .directory {
   .period-chooser .period-chooser-header h2.selected-name {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 
   &.users-directory {
diff --git a/app/assets/stylesheets/mobile/edit-category.scss b/app/assets/stylesheets/mobile/edit-category.scss
index 07809a1ac6..58e9f1b140 100644
--- a/app/assets/stylesheets/mobile/edit-category.scss
+++ b/app/assets/stylesheets/mobile/edit-category.scss
@@ -31,7 +31,7 @@ div.edit-category {
     width: 100%;
     margin-bottom: 0;
     li {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       border-bottom: none;
     }
     a.active::after {
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 09c79e57ca..032644dcf0 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -26,7 +26,7 @@
     max-width: 100%;
   }
   #site-text-logo {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
   .extra-info-wrapper {
     .extra-info {
@@ -35,7 +35,7 @@
         min-height: 2.25em;
       }
       .header-title {
-        font-size: $font-0;
+        font-size: var(--font-0);
         // the margin-bottom here is fragile, changing it can cause tag alignment issues
         margin: 0 0 0.35em 0;
         .archetype-private_message & {
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 24f701cf32..eccfa2c562 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -129,7 +129,7 @@
   .modal-footer {
     box-sizing: border-box;
     margin: 0 auto;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     padding: 1.25em;
   }
 
@@ -266,6 +266,6 @@
     display: none;
   }
   h1.login-title {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
   }
 }
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 9ee3e2dd06..fb69050d3d 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -43,12 +43,12 @@
 .modal-header {
   padding: 10px;
   h3 {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 }
 
 .close {
-  font-size: $font-up-4;
+  font-size: var(--font-up-4);
 }
 
 #choosing-topic {
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
index 6697ca91e7..ecbc186a09 100644
--- a/app/assets/stylesheets/mobile/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
@@ -2,10 +2,10 @@
   &.combo-box {
     &.category-drop {
       .category-drop-header {
-        font-size: $font-0;
+        font-size: var(--font-0);
 
         .d-icon {
-          font-size: $font-0;
+          font-size: var(--font-0);
         }
       }
 
diff --git a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
index 9f2dfbd55f..36c23e8537 100644
--- a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
@@ -2,10 +2,10 @@
   &.combo-box {
     &.tag-drop {
       .tag-drop-header {
-        font-size: $font-0;
+        font-size: var(--font-0);
 
         .d-icon {
-          font-size: $font-0;
+          font-size: var(--font-0);
         }
       }
 
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 4d35394686..05e60c1839 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -48,7 +48,7 @@
     }
     > li {
       margin-right: 0;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       border: 1px solid var(--primary-medium);
     }
     > li > a {
@@ -139,7 +139,7 @@
     position: relative;
     display: inline-block;
     top: -1px;
-    font-size: $font-0;
+    font-size: var(--font-0);
     line-height: $line-height-small;
     padding: 0.15em 0.4em 0.2em 0.4em;
     .d-icon {
@@ -303,11 +303,11 @@ tr.category-topic-link {
   }
 
   h3 {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
   }
 
   h4 {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 
   .category-name {
@@ -321,7 +321,7 @@ tr.category-topic-link {
   }
 
   .category-topic-link .main-link .age {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
   }
 
   .category-description td {
@@ -359,7 +359,7 @@ tr.category-topic-link {
       float: left;
       margin: 3px 1em 0 0;
       font-weight: normal;
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       .value {
         font-weight: bold;
       }
@@ -409,7 +409,7 @@ tr.category-topic-link {
 
 .category-heading {
   p {
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
     margin-bottom: 0.75em;
   }
 }
@@ -438,7 +438,7 @@ td .main-link {
 }
 .topic-list {
   .num.posts-map {
-    font-size: $font-up-2;
+    font-size: var(--font-up-2);
     padding: 0;
     button {
       padding: 0;
@@ -466,7 +466,7 @@ td .main-link {
 
 .category-list .category.muted a.category-title-link {
   color: var(--primary-medium);
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 
 .muted-categories-link {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index ffa4a91436..d45d61d566 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -159,7 +159,7 @@ a.reply-to-tab {
     .number,
     .d-icon {
       color: var(--primary-high-or-secondary-low);
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
     .avatar + a {
       float: left;
@@ -189,7 +189,7 @@ a.reply-to-tab {
       border-left: 1px solid var(--primary-low);
       .fa {
         margin: 0;
-        font-size: $font-up-2;
+        font-size: var(--font-up-2);
         line-height: 52px;
       }
     }
@@ -255,7 +255,7 @@ a.reply-to-tab {
   }
   a.badge-category,
   a.badge-category-parent {
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     vertical-align: top;
   }
 }
@@ -305,7 +305,7 @@ button.select-post {
 }
 
 .deleted-user-avatar {
-  font-size: $font-up-5;
+  font-size: var(--font-up-5);
 }
 
 span.btn-text {
@@ -344,7 +344,7 @@ span.highlighted {
 
 .topic-meta-data {
   margin-left: 50px;
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
   .names {
     line-height: $line-height-medium;
     display: flex;
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 10527054bd..d4357d0a08 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -14,7 +14,7 @@
 
 #topic-title {
   h1 {
-    font-size: $font-up-3;
+    font-size: var(--font-up-3);
     line-height: $line-height-medium;
     a {
       color: var(--primary);
@@ -47,7 +47,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: $font-up-2;
+      font-size: var(--font-up-2);
     }
   }
   .jump-form {
@@ -56,7 +56,7 @@
       width: 45px;
       height: 20px;
       text-align: center;
-      font-size: $font-up-1;
+      font-size: var(--font-up-1);
     }
     button.btn {
       float: right !important;
@@ -77,7 +77,7 @@
   width: 90%;
   margin-left: auto;
   margin-right: auto;
-  font-size: $font-up-4;
+  font-size: var(--font-up-4);
   line-height: $line-height-medium;
 
   .topic-retry {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index d8fb951f9c..54a67f3f46 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -128,14 +128,14 @@
 
       .featured-topic {
         text-align: center;
-        font-size: $font-0;
+        font-size: var(--font-0);
       }
 
       .location-and-website {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
-        font-size: $font-0;
+        font-size: var(--font-0);
         .d-icon {
           width: 0.8em;
           height: 0.8em;
@@ -391,7 +391,7 @@
     .label {
       display: block;
       color: var(--primary-medium);
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
       margin: 0.5em 0 0.15em 0;
     }
 
diff --git a/app/assets/stylesheets/publish_mobile.scss b/app/assets/stylesheets/publish_mobile.scss
index 663ab399e3..cdd7d9259c 100644
--- a/app/assets/stylesheets/publish_mobile.scss
+++ b/app/assets/stylesheets/publish_mobile.scss
@@ -5,7 +5,7 @@
     width: auto;
 
     .published-page-title {
-      font-size: $font-up-3;
+      font-size: var(--font-up-3);
       width: 100%;
       overflow: hidden;
       white-space: nowrap;
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index 0e67e9f39f..5f71f1dea5 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -89,7 +89,7 @@
 
   .tip {
     display: block;
-    font-size: $font-down-1;
+    font-size: var(--font-down-1);
     margin: -0.5em 0 0.5em;
   }
 
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index ffb4a04100..82cd605228 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -13,7 +13,7 @@ div.poll {
 
   li {
     cursor: pointer;
-    font-size: $font-up-1;
+    font-size: var(--font-up-1);
   }
 
   li[data-poll-option-id] {
@@ -39,7 +39,7 @@ div.poll {
     padding: 1em 0;
 
     .info-label {
-      font-size: $font-up-4;
+      font-size: var(--font-up-4);
       line-height: $line-height-medium;
     }
 
@@ -54,7 +54,7 @@ div.poll {
     padding: 0.5em 1em;
 
     .poll-results-number-rating {
-      font-size: $font-up-5;
+      font-size: var(--font-up-5);
     }
   }
 
diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
index 037dfb7584..55399b9845 100644
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ b/plugins/poll/assets/stylesheets/mobile/poll.scss
@@ -18,7 +18,7 @@ div.poll {
       display: inline;
     }
     .info-number {
-      font-size: $font-up-6;
+      font-size: var(--font-up-6);
     }
     p {
       margin: 0;

From 1618193f219a56d0e2d90d1ea216248ba771b849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 15:38:05 +0200
Subject: [PATCH 122/332] Build(deps): Bump faraday-net_http from 3.0.0 to
 3.0.1 (#18521)

Bumps [faraday-net_http](https://github.com/lostisland/faraday-net_http) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/lostisland/faraday-net_http/releases)
- [Commits](https://github.com/lostisland/faraday-net_http/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: faraday-net_http
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d464f59783..708f18d0ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,7 +155,7 @@ GEM
     faraday (2.6.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.1)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
     fast_blank (1.0.1)

From 55909e30bcd371f65e1a6b43438fa37013e4676a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 15:38:17 +0200
Subject: [PATCH 123/332] Build(deps): Bump pg from 1.4.3 to 1.4.4 (#18552)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 708f18d0ea..5fcd7ceef1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       parallel
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.4.3)
+    pg (1.4.4)
     progress (3.6.0)
     pry (0.14.1)
       coderay (~> 1.1)

From 4170b9bb58448a2c5343817fb1001c8329048394 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 12 Oct 2022 16:05:42 +0200
Subject: [PATCH 124/332] DEV: Use more css vars (#18561)

Followup to #18518

This time it's mostly line-height vars and a couple of other uncommon vars.
---
 .../stylesheets/common/admin/admin_base.scss  |  6 +++---
 .../stylesheets/common/admin/admin_intro.scss |  2 +-
 .../stylesheets/common/admin/customize.scss   |  4 ++--
 .../stylesheets/common/admin/dashboard.scss   |  2 +-
 .../stylesheets/common/admin/settings.scss    |  4 ++--
 .../stylesheets/common/admin/users.scss       |  2 +-
 .../stylesheets/common/base/_topic-list.scss  |  8 ++++----
 .../stylesheets/common/base/activation.scss   |  2 +-
 .../common/base/category-list.scss            |  6 +++---
 .../stylesheets/common/base/compose.scss      |  6 +++---
 .../stylesheets/common/base/discourse.scss    | 12 +++++------
 .../stylesheets/common/base/groups.scss       |  6 +++---
 .../stylesheets/common/base/header.scss       |  4 ++--
 app/assets/stylesheets/common/base/login.scss |  4 ++--
 .../common/base/magnific-popup.scss           | 10 +++++-----
 .../stylesheets/common/base/menu-panel.scss   |  4 ++--
 app/assets/stylesheets/common/base/modal.scss |  4 ++--
 .../stylesheets/common/base/not-found.scss    |  2 +-
 .../stylesheets/common/base/onebox.scss       |  8 ++++----
 .../stylesheets/common/base/redirection.scss  |  2 +-
 .../stylesheets/common/base/reviewables.scss  |  2 +-
 .../stylesheets/common/base/search-menu.scss  |  4 ++--
 .../stylesheets/common/base/search.scss       |  6 +++---
 .../stylesheets/common/base/tagging.scss      |  2 +-
 .../stylesheets/common/base/topic-post.scss   | 20 +++++++++----------
 app/assets/stylesheets/common/base/topic.scss |  4 ++--
 .../stylesheets/common/base/user-badges.scss  |  2 +-
 app/assets/stylesheets/common/base/user.scss  |  2 +-
 .../stylesheets/common/components/badges.scss |  6 +++---
 .../common/components/bookmark-list.scss      |  2 +-
 .../common/components/buttons.scss            |  2 +-
 .../common/components/keyboard_shortcuts.scss |  2 +-
 .../stylesheets/common/components/navs.scss   |  6 +++---
 .../common/components/user-card.scss          |  2 +-
 .../stylesheets/common/foundation/base.scss   | 14 ++++++-------
 .../common/select-kit/category-chooser.scss   |  4 ++--
 .../common/select-kit/combo-box.scss          |  2 +-
 .../select-kit/dropdown-select-box.scss       |  2 +-
 .../future-date-input-selector.scss           |  2 +-
 .../common/select-kit/select-kit.scss         |  2 +-
 .../stylesheets/common/topic-timeline.scss    |  4 ++--
 .../stylesheets/desktop/category-list.scss    |  2 +-
 app/assets/stylesheets/desktop/discourse.scss |  6 +++---
 app/assets/stylesheets/desktop/header.scss    |  2 +-
 app/assets/stylesheets/desktop/login.scss     |  4 ++--
 .../stylesheets/desktop/topic-list.scss       |  4 ++--
 .../stylesheets/desktop/topic-post.scss       |  2 +-
 app/assets/stylesheets/desktop/topic.scss     |  4 ++--
 .../topic-footer-mobile-dropdown.scss         |  2 +-
 app/assets/stylesheets/mobile/header.scss     |  2 +-
 app/assets/stylesheets/mobile/history.scss    |  2 +-
 app/assets/stylesheets/mobile/topic-list.scss |  6 +++---
 app/assets/stylesheets/mobile/topic-post.scss |  6 +++---
 app/assets/stylesheets/mobile/topic.scss      |  4 ++--
 app/assets/stylesheets/mobile/user.scss       |  4 ++--
 app/assets/stylesheets/wizard.scss            |  2 +-
 .../poll/assets/stylesheets/common/poll.scss  |  2 +-
 57 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 33db25dd7f..52018ed8b4 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -145,7 +145,7 @@ $mobile-breakpoint: 700px;
     tr {
       grid-template-columns: repeat(3, 1fr);
       display: grid;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
       padding: 8px 0;
       min-width: 0;
       td {
@@ -547,7 +547,7 @@ $mobile-breakpoint: 700px;
   }
   h1 {
     font-size: var(--font-up-3);
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     color: var(--primary);
   }
   .controls {
@@ -708,7 +708,7 @@ section.details {
   clear: both;
   text-align: right;
   .btn {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
   }
   @media (max-width: $mobile-breakpoint) {
     .btn {
diff --git a/app/assets/stylesheets/common/admin/admin_intro.scss b/app/assets/stylesheets/common/admin/admin_intro.scss
index bdf3baa14d..1ac8d0f724 100644
--- a/app/assets/stylesheets/common/admin/admin_intro.scss
+++ b/app/assets/stylesheets/common/admin/admin_intro.scss
@@ -23,7 +23,7 @@
     width: 65%;
     h1 {
       display: inline-block;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
   }
   .external-link {
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 871ff9c9b3..443de0bd4e 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -502,7 +502,7 @@
     .ace_placeholder {
       font-family: inherit;
       font-size: var(--font-up-1);
-      color: $primary-high;
+      color: var(--primary-high);
     }
 
     .status-actions {
@@ -573,7 +573,7 @@
       margin: 0.15em 0 0;
       color: var(--primary-high);
       font-size: var(--font-down-1);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
 
     .invalid .hex input {
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index e8773fa4fd..fd8c9f5601 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -568,7 +568,7 @@
 
   .version-number {
     font-size: var(--font-up-2);
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
     box-sizing: border-box;
     font-weight: bold;
     margin-bottom: 2em;
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 807a475876..7e023b55b3 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -81,7 +81,7 @@
         padding: 3px 5px 3px 18px;
         margin: 3px 0 3px 5px;
         position: relative;
-        line-height: $line-height-small;
+        line-height: var(--line-height-small);
         cursor: default;
         border: 1px dashed var(--primary-low-mid);
         border-radius: 3px;
@@ -95,7 +95,7 @@
     .validation-error {
       padding-top: 3px;
       font-size: var(--font-down-1);
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
     .validation-error {
       color: var(--danger);
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
index 59410f5987..9dff0bd83b 100644
--- a/app/assets/stylesheets/common/admin/users.scss
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -40,7 +40,7 @@
     margin-left: 12px;
     @media (max-width: $mobile-breakpoint) {
       margin-left: 0;
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
       margin-top: 5px;
     }
   }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 584bc8f016..06a0e78bdc 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -94,7 +94,7 @@
   max-width: 100%;
   p {
     margin-top: 0;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     font-size: var(--font-up-3);
   }
 }
@@ -215,7 +215,7 @@
   }
 
   .topic-list-data {
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     text-align: left;
     vertical-align: middle;
   }
@@ -286,7 +286,7 @@
     margin-top: 0.33em;
     color: var(--primary-high);
     word-wrap: break-word;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     padding-right: 20px;
   }
 
@@ -424,5 +424,5 @@ div.education {
 .topic-post-badges {
   white-space: nowrap;
   align-self: center;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 }
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index 559fa2a09f..6f28a622b8 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -11,7 +11,7 @@
   .account-created {
     .ac-message {
       font-size: var(--font-up-1);
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
     .activation-controls {
       button {
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 75fd1d9b03..3c267fdf1a 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -9,7 +9,7 @@
     max-width: 100%;
     @include ellipsis;
     vertical-align: text-top;
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
   }
   &.with-topics {
     .subcategories-with-subcategories {
@@ -163,7 +163,7 @@
     font-size: var(--font-up-2);
     margin-bottom: 0.5em;
     margin-top: 0.25em;
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     text-align: center;
     color: var(--primary);
     overflow: hidden;
@@ -189,7 +189,7 @@
       }
       .category-text-title {
         order: 2;
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
         overflow: hidden;
         margin-bottom: 0.25em;
         word-wrap: break-word;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 0bbc9cfbc4..ab8adc21af 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -448,7 +448,7 @@ div.ac-wrap div.item a.remove,
 .remove-link {
   margin-left: 4px;
   font-size: var(--font-down-1);
-  line-height: $line-height-small;
+  line-height: var(--line-height-small);
   padding: 1px 3.5px;
   border-radius: 12px;
   box-sizing: border-box;
@@ -471,10 +471,10 @@ div.ac-wrap {
   div.item {
     float: left;
     padding: 4px 10px;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     span {
       display: inline-block;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
   }
 
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index d6a87afbf3..fe579fe9f0 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -90,7 +90,7 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: $heading-font-family;
+  font-family: var(--heading-font-family);
   margin-top: 0;
   margin-bottom: 0.5rem;
 }
@@ -145,7 +145,7 @@ input {
     margin-top: 0.17em;
     margin-right: 0.43em;
     margin-left: 0.1em;
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
     cursor: pointer;
     flex-shrink: 0; // Adding for safety, Safari will shrink checkboxes
   }
@@ -534,7 +534,7 @@ table {
   right: 70px;
   top: 60px;
   width: 230px;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 
   .first-notification,
   .read-later {
@@ -655,11 +655,11 @@ table {
   }
 
   .control-label {
-    font-family: $heading-font-family;
+    font-family: var(--heading-font-family);
 
     font-weight: bold;
     font-size: var(--font-up-2);
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
   }
 
   .controls {
@@ -860,7 +860,7 @@ table {
 }
 
 .broken-theme-alert {
-  font-size: $base-font-size;
+  font-size: var(--base-font-size);
   font-weight: bold;
   padding: 5px 0;
   background: var(--danger);
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 0c6c9ea436..0fc72d0b99 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -86,7 +86,7 @@
           span {
             width: 100%;
             word-break: break-word;
-            line-height: $line-height-medium;
+            line-height: var(--line-height-medium);
           }
         }
       }
@@ -148,10 +148,10 @@
   }
   &.groups-notifications-form {
     .control-instructions {
-      color: $primary-medium;
+      color: var(--primary-medium);
       margin-bottom: 10px;
       font-size: var(--font-down-1);
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
 
     .category-selector,
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 901e2f3d41..c52ed610a1 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -181,7 +181,7 @@
   .d-icon {
     width: 100%;
     font-size: var(--font-up-4);
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     display: inline-block;
     color: var(--header_primary-low-mid);
   }
@@ -250,7 +250,7 @@
   display: flex;
   align-items: center;
   height: 100%;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
   padding: 0 1.5em 0 0.5em;
   // we need to hide overflow in both to truncate the title in a flexbox
   overflow: hidden;
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 3ce8be5502..506897cd40 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -325,7 +325,7 @@ body.invite-page {
       .instructions {
         margin-top: 0.15em;
         color: var(--primary-medium);
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
       }
     }
   }
@@ -402,7 +402,7 @@ body.invite-page {
       margin: 0;
       font-size: var(--font-down-1);
       font-weight: normal;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
     .tip {
       font-size: var(--font-down-1);
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index f6ec6bb212..bd23ba1e89 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -261,7 +261,7 @@ button {
 .mfp-close {
   width: 44px;
   height: 44px;
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   position: absolute;
   right: 0;
   top: 0;
@@ -307,7 +307,7 @@ button {
   right: 0;
   color: $controls-text-color;
   font-size: var(--font-down-1);
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 }
 
 // Navigation arrows
@@ -459,7 +459,7 @@ button {
       color: $caption-subtitle-color;
       display: block;
       font-size: var(--font-down-1);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
     figure {
       margin: 0;
@@ -475,7 +475,7 @@ button {
   }
   .mfp-title {
     text-align: left;
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     color: $caption-title-color;
     word-wrap: break-word;
     padding-right: 36px; // leave some space for counter at right side
@@ -561,7 +561,7 @@ button {
           right: 0;
           width: 35px;
           height: 35px;
-          line-height: $line-height-large;
+          line-height: var(--line-height-large);
           background: rgba(0, 0, 0, 0.6);
           position: fixed;
           text-align: center;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 7cfc0310ab..201614eb63 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -223,7 +223,7 @@
       }
 
       justify-content: unset;
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
       width: 100%;
 
       .d-icon {
@@ -325,7 +325,7 @@
       display: inline;
       padding: 0;
       font-size: var(--font-down-1);
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
     .badge-wrapper {
       &.bar,
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 337db4e99f..c5249f07bc 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -311,7 +311,7 @@
 .delete-user-modal {
   .modal-footer {
     .btn {
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
   }
 }
@@ -452,7 +452,7 @@
   .flag-action-type-details {
     width: 100%;
     max-width: 500px;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
index 798249480c..51b0e34d8f 100644
--- a/app/assets/stylesheets/common/base/not-found.scss
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -5,7 +5,7 @@
 
   h1.title {
     font-size: var(--font-up-5);
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
   }
 
   &-search {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 9e88aad716..f01d46f2b0 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -372,14 +372,14 @@ pre.onebox code ol.lines li:before {
   text-align: right;
   padding-right: 5px;
   font-size: var(--font-down-1);
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   content: counter(li-counter);
   counter-increment: li-counter;
 }
 
 pre.onebox code ol {
   margin-left: 0;
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
 }
 pre.onebox code {
   background-color: var(--primary-very-low);
@@ -647,7 +647,7 @@ aside.onebox.twitterstatus .onebox-body {
 
   .date {
     display: flex;
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
 
     .timestamp {
       color: var(--primary-medium);
@@ -690,7 +690,7 @@ aside.onebox.twitterstatus .onebox-body {
       .album-title {
         width: 100%;
         font-size: var(--font-up-1);
-        line-height: $line-height-large;
+        line-height: var(--line-height-large);
         color: #ccc;
         text-decoration: none;
       }
diff --git a/app/assets/stylesheets/common/base/redirection.scss b/app/assets/stylesheets/common/base/redirection.scss
index ffb57505df..d1c2fc8ec9 100644
--- a/app/assets/stylesheets/common/base/redirection.scss
+++ b/app/assets/stylesheets/common/base/redirection.scss
@@ -2,5 +2,5 @@
   margin: 0 auto;
   text-align: center;
   font-size: var(--font-up-4);
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 }
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 4edae726dc..4df2d64395 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -309,7 +309,7 @@
   }
 
   .badge-notification {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     vertical-align: text-top;
   }
 
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 0e83373c82..189cee2a63 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -1,7 +1,7 @@
 @mixin user-item-flex {
   display: flex;
   flex-direction: column;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
   color: var(--primary-high-or-secondary-low);
 }
 
@@ -82,7 +82,7 @@ $search-pad-horizontal: 0.5em;
     .search-result-topic {
       .first-line {
         display: block;
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
       }
 
       .second-line {
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 2beab9abce..ac8b7a9688 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -315,7 +315,7 @@
 
   .blurb {
     font-size: var(--font-0);
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     color: var(--primary-medium);
     .date {
       color: var(--primary-high);
@@ -342,14 +342,14 @@
   .search-link {
     .topic-title {
       font-size: var(--font-up-1);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
       color: var(--primary);
     }
     .topic-statuses {
       display: inline-block;
       flex-shrink: 0;
       font-size: 1.3em;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
       color: var(--primary-medium);
       span {
         line-height: 1;
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 35e70f3562..eeb3cdd1a4 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -27,7 +27,7 @@
   .tag-count {
     font-size: var(--font-down-1);
     vertical-align: middle;
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index f400a14846..a943ed9cc1 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -84,7 +84,7 @@ $quote-share-maxwidth: 150px;
 .cooked,
 .d-editor-preview {
   word-wrap: break-word;
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
 
   > *:first-child {
     margin-top: 0;
@@ -97,7 +97,7 @@ $quote-share-maxwidth: 150px;
   h5,
   h6 {
     margin: 30px 0 10px;
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     a.anchor {
       opacity: 0;
       transition: opacity 0.25s;
@@ -677,7 +677,7 @@ aside.quote {
       text-align: center;
       font-weight: normal;
       font-size: var(--font-down-2);
-      line-height: $line-height-small;
+      line-height: var(--line-height-small);
     }
   }
 
@@ -698,7 +698,7 @@ aside.quote {
   h3 {
     margin-bottom: 4px;
     color: var(--primary);
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
     font-weight: normal;
     font-size: var(--font-0);
   }
@@ -708,7 +708,7 @@ aside.quote {
     color: var(--primary-med-or-secondary-med);
     font-weight: normal;
     font-size: var(--font-down-1);
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
   }
 
   span.domain {
@@ -1057,7 +1057,7 @@ kbd {
   display: inline-flex;
   font-size: var(--font-down-1);
   justify-content: center;
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   margin: 0 0.15em;
   min-width: 24px;
   padding: 0.15em 0.6em;
@@ -1184,7 +1184,7 @@ blockquote > *:last-child {
     > p {
       margin: 0;
       padding-right: 0.5em;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
       flex: 1 1;
     }
   }
@@ -1292,7 +1292,7 @@ a.mention-group {
       color: var(--primary-med-or-secondary-med);
       margin-right: 6px;
       font-size: var(--font-0);
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
 
     > span.url {
@@ -1308,7 +1308,7 @@ a.mention-group {
       color: var(--primary-med-or-secondary-med);
       font-size: var(--font-down-1);
       font-style: italic;
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
       margin-bottom: 1px;
     }
 
@@ -1522,7 +1522,7 @@ a.mention-group {
 
       .text {
         margin-left: 0.5em;
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index e85e2c78e6..99df950ce8 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -196,7 +196,7 @@ $topic-progress-height: 42px;
   h4 {
     display: inline;
     font-size: var(--font-up-2);
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
   }
   .d-icon {
     position: absolute;
@@ -377,7 +377,7 @@ a.badge-category {
 .suggested-topics h3 .badge-wrapper.bullet span.badge-category {
   // Override vertical-align: text-top from `badges.css.scss`
   vertical-align: baseline;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 }
 
 .suggested-topics h3 .badge-wrapper.bullet,
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index bfa87f6e6d..32886dc0ca 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -3,7 +3,7 @@
   padding: 3px 8px;
   color: var(--primary);
   border: 1px solid var(--primary-low);
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   display: inline-flex;
   align-items: center;
   background-color: var(--secondary);
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 63ffaf2288..dbfd8ece4d 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -572,7 +572,7 @@
     color: var(--primary-medium);
     margin-bottom: 10px;
     font-size: var(--font-down-1);
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
 
     a[href] {
       color: var(--tertiary);
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 21c6678ce0..c737216497 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -153,7 +153,7 @@
     a.badge-category {
       display: inline-block;
       padding: 6px 8px;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
   }
 }
@@ -167,7 +167,7 @@
   min-width: 0.5em;
   color: var(--secondary);
   font-size: var(--font-down-2);
-  line-height: $line-height-small;
+  line-height: var(--line-height-small);
   text-align: center;
   background-color: var(--primary-low-mid-or-secondary-low);
   &[href] {
@@ -217,7 +217,7 @@
 .badge-posts {
   font-weight: normal;
   font-size: var(--font-0);
-  line-height: $line-height-small;
+  line-height: var(--line-height-small);
   &[href] {
     color: var(--primary-med-or-secondary-med);
   }
diff --git a/app/assets/stylesheets/common/components/bookmark-list.scss b/app/assets/stylesheets/common/components/bookmark-list.scss
index e1d27b1e51..c64cdd4757 100644
--- a/app/assets/stylesheets/common/components/bookmark-list.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list.scss
@@ -34,7 +34,7 @@ $mobile-breakpoint: 700px;
       display: inline-block;
       margin-right: 1em;
       margin-bottom: 0.25em;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
       span {
         word-break: break-word;
       }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 78653be5c5..3dfb2f2d7f 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -260,7 +260,7 @@
 .btn-flat {
   background: transparent;
   border: 0;
-  line-height: $line-height-small;
+  line-height: var(--line-height-small);
   transition: color 0.25s, background 0.25s;
   .d-icon {
     color: var(--primary-low-mid);
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index dab4263d81..56925f449c 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -74,7 +74,7 @@
     }
 
     kbd {
-      font-family: $base-font-family;
+      font-family: var(--font-family);
       font-weight: bold;
     }
   }
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index c7208e7551..8318d105c4 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -34,7 +34,7 @@
       padding: 6px 12px;
       color: var(--primary);
       font-size: var(--font-up-1);
-      line-height: $line-height-small;
+      line-height: var(--line-height-small);
       box-sizing: border-box;
       min-height: 30px;
       display: flex;
@@ -88,7 +88,7 @@
     margin: 0;
     padding: 0.75em;
     font-size: var(--font-up-1);
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
     cursor: pointer;
     color: var(--primary);
     @include ellipsis;
@@ -120,6 +120,6 @@
     width: 1.25em;
     text-align: center;
     margin-right: 0.25em;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 3b80ad8685..5a7815ee73 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -101,7 +101,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
     margin-bottom: 5px;
   }
   h1 {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     .d-icon {
       color: var(--primary);
     }
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index ca066afc8b..f233601f80 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -4,27 +4,27 @@
 
 html {
   color: var(--primary);
-  font-family: $base-font-family;
-  font-size: $base-font-size;
-  line-height: $line-height-large;
+  font-family: var(--font-family);
+  font-size: var(--base-font-size);
+  line-height: var(--line-height-large);
   background-color: var(--secondary);
   overflow-y: scroll;
   direction: ltr;
 
   &.text-size-smallest {
-    font-size: $base-font-size-smallest;
+    font-size: var(--base-font-size-smallest);
   }
 
   &.text-size-smaller {
-    font-size: $base-font-size-smaller;
+    font-size: var(--base-font-size-smaller);
   }
 
   &.text-size-larger {
-    font-size: $base-font-size-larger;
+    font-size: var(--base-font-size-larger);
   }
 
   &.text-size-largest {
-    font-size: $base-font-size-largest;
+    font-size: var(--base-font-size-largest);
   }
 }
 
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index a0def956f7..8fe76f143d 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -24,14 +24,14 @@
 
         .category-status {
           color: var(--primary);
-          line-height: $line-height-large;
+          line-height: var(--line-height-large);
           flex: 1 1 auto;
         }
 
         .category-desc {
           flex: 1 1 auto;
           font-size: var(--font-down-1);
-          line-height: $line-height-large;
+          line-height: var(--line-height-large);
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index 53b4a8ef65..b566b4b612 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -44,7 +44,7 @@
         a {
           white-space: nowrap;
           color: var(--primary);
-          line-height: $line-height-medium;
+          line-height: var(--line-height-medium);
           font-weight: bold;
           display: block;
           padding: 0.75em;
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index a28ce84da6..43d12e6f46 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -35,7 +35,7 @@
         }
 
         .texts {
-          line-height: $line-height-medium;
+          line-height: var(--line-height-medium);
           flex: 1 1 0%;
           align-items: flex-start;
           display: flex;
diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
index 1b1fa7082f..489f6a75a0 100644
--- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -5,7 +5,7 @@
 
       .future-date-input-selector-header {
         .btn-clear {
-          line-height: $line-height-large;
+          line-height: var(--line-height-large);
         }
       }
 
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 44d6d7a502..ca5be8d47e 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -158,7 +158,7 @@
       align-items: center;
       white-space: nowrap;
       overflow: hidden;
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
 
       .d-icon {
         margin-left: 5px;
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 38d35f9dd0..b2c510e1b4 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -77,7 +77,7 @@
       }
       .post-excerpt {
         max-width: 650px;
-        line-height: $line-height-large;
+        line-height: var(--line-height-large);
         display: block;
         @include line-clamp(8);
         @media screen and (max-height: 425px) {
@@ -98,7 +98,7 @@
         h2 {
           margin-top: 0;
           display: block;
-          line-height: $line-height-medium;
+          line-height: var(--line-height-medium);
           font-size: var(--font-up-2);
           @include line-clamp(4);
         }
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 2182780969..90d95baac6 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -95,7 +95,7 @@
       border-left: 6px solid;
       h3,
       h4 {
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
         a[href] {
           color: var(--primary);
         }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 0558259c36..7984aca95f 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -58,7 +58,7 @@ select,
 textarea {
   font-size: var(--font-0);
   font-weight: normal;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 }
 
 select,
@@ -66,7 +66,7 @@ textarea {
   display: inline-block;
   margin-bottom: 9px;
   font-size: var(--font-0);
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   color: var(--primary);
 }
 
@@ -77,7 +77,7 @@ textarea {
 
 select,
 input[type="file"] {
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
 }
 
 select {
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index 314bdb32bd..473f688ada 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -35,7 +35,7 @@
   display: block;
   word-wrap: break-word;
   font-size: var(--font-down-2);
-  line-height: $line-height-large;
+  line-height: var(--line-height-large);
   .search-highlight {
     color: var(--primary-high-or-secondary-low);
   }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 464e3ab676..a8238ac7ad 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -140,7 +140,7 @@
     padding: 3em 3em 2.5em;
     .login-welcome-header {
       .login-title {
-        line-height: $line-height-small;
+        line-height: var(--line-height-small);
         font-size: var(--font-up-6);
       }
       p.login-subheader {
@@ -277,7 +277,7 @@
 
     .login-title {
       font-size: var(--font-up-6);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
     p.login-subheader {
       font-size: var(--font-up-1);
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 3a9079534e..efdea3f56b 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -36,7 +36,7 @@
 
   button.bulk-select {
     padding: 0;
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
   }
 
   .topic-list-data.bulk-select {
@@ -118,7 +118,7 @@
     a {
       color: var(--primary-med-or-secondary-med);
       margin-right: 3px;
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
     }
   }
   .activity {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 34aa6cf38e..c3eaebca03 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -270,7 +270,7 @@ pre.codeblock-buttons:hover {
     .number,
     .d-icon {
       font-size: var(--font-up-2);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
     button .d-icon,
     button:hover .d-icon {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 71334e237e..270e3cf821 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -25,7 +25,7 @@
   }
   h1 {
     font-size: var(--font-up-4);
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     overflow-wrap: break-word;
     width: 100%;
     a {
@@ -48,7 +48,7 @@
   margin-right: auto;
   font-size: var(--font-up-4);
   text-align: center;
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 
   .topic-retry {
     display: block;
diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
index b81f960a46..aae47b4cfd 100644
--- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
+++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
@@ -6,7 +6,7 @@
         border-bottom: 1px solid rgba(var(--primary-low-rgb), 0.5);
 
         .name {
-          line-height: $line-height-medium;
+          line-height: var(--line-height-medium);
         }
 
         &:last-child {
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 032644dcf0..2d8b256c23 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -72,7 +72,7 @@
 
 .d-header-icons {
   .d-icon {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
   }
   .active .icon {
     &:after {
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index d70090e309..6890c832b8 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -12,7 +12,7 @@
     max-width: 90vw;
   }
   #revision-numbers {
-    line-height: $line-height-large;
+    line-height: var(--line-height-large);
   }
   img {
     max-width: 95%;
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 05e60c1839..bab5fe8150 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -52,7 +52,7 @@
       border: 1px solid var(--primary-medium);
     }
     > li > a {
-      line-height: $line-height-large;
+      line-height: var(--line-height-large);
       display: flex;
       align-items: center;
       .d-icon {
@@ -118,7 +118,7 @@
   }
 
   .main-link {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     position: relative;
     z-index: z("base") + 1; // Intentionally overlapping category to create bigger tap target
     font-size: var(--font-up-1);
@@ -140,7 +140,7 @@
     display: inline-block;
     top: -1px;
     font-size: var(--font-0);
-    line-height: $line-height-small;
+    line-height: var(--line-height-small);
     padding: 0.15em 0.4em 0.2em 0.4em;
     .d-icon {
       color: var(--secondary);
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index d45d61d566..a1e0c6d0e1 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -134,7 +134,7 @@ a.reply-to-tab {
 .topic-map {
   margin: 10px 0;
   h4 {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
   }
   .user {
     float: left;
@@ -154,7 +154,7 @@ a.reply-to-tab {
       }
     }
     .number {
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
     .number,
     .d-icon {
@@ -346,7 +346,7 @@ span.highlighted {
   margin-left: 50px;
   font-size: var(--font-down-1);
   .names {
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     display: flex;
     flex-wrap: wrap;
 
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index d4357d0a08..557c778bbc 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -15,7 +15,7 @@
 #topic-title {
   h1 {
     font-size: var(--font-up-3);
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     a {
       color: var(--primary);
       vertical-align: middle;
@@ -78,7 +78,7 @@
   margin-left: auto;
   margin-right: auto;
   font-size: var(--font-up-4);
-  line-height: $line-height-medium;
+  line-height: var(--line-height-medium);
 
   .topic-retry {
     display: block;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 54a67f3f46..2665b2eac0 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -103,11 +103,11 @@
       margin-bottom: 12px;
 
       h1 {
-        line-height: $line-height-small;
+        line-height: var(--line-height-small);
       }
 
       h2 {
-        line-height: $line-height-medium;
+        line-height: var(--line-height-medium);
       }
 
       .user-profile-avatar {
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 847d5c7979..df870f3842 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -253,7 +253,7 @@ body.wizard {
   &__step-title {
     font-size: 2.75em;
     color: var(--primary);
-    line-height: $line-height-medium;
+    line-height: var(--line-height-medium);
     margin: 0 0 1.5em 0;
     @include breakpoint("medium") {
       font-size: var(--font-up-5);
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 82cd605228..c0db0f7a96 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -40,7 +40,7 @@ div.poll {
 
     .info-label {
       font-size: var(--font-up-4);
-      line-height: $line-height-medium;
+      line-height: var(--line-height-medium);
     }
 
     .info-text {

From a4437ab30be496cb0e63816989afbc20215ed4b1 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 12 Oct 2022 16:06:00 +0200
Subject: [PATCH 125/332] DEV: Fix FakeLogger compat (#18562)

TaggedLogger requires these methods (see plugin backend failures in #18534)
---
 spec/support/fake_logger.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/spec/support/fake_logger.rb b/spec/support/fake_logger.rb
index a00e8f5976..507e6d9062 100644
--- a/spec/support/fake_logger.rb
+++ b/spec/support/fake_logger.rb
@@ -16,22 +16,42 @@ class FakeLogger
     @debug << message
   end
 
+  def debug?
+    @level <= Logger::DEBUG
+  end
+
   def info(message = nil)
     @infos << message
   end
 
+  def info?
+    @level <= Logger::INFO
+  end
+
   def warn(message)
     @warnings << message
   end
 
+  def warn?
+    @level <= Logger::WARN
+  end
+
   def error(message)
     @errors << message
   end
 
+  def error?
+    @level <= Logger::ERROR
+  end
+
   def fatal(message)
     @fatals << message
   end
 
+  def fatal?
+    @level <= Logger::FATAL
+  end
+
   def formatter
   end
 end

From 67e422c2d46d035a3ce96415b00aed295d837ee2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 12 Oct 2022 16:35:51 +0200
Subject: [PATCH 126/332] DEV: Remove noop CSS (#18564)

The lint warnings were:

```
inline-block is ignored due to the float. If 'float' has a value other than 'none', the box is floated and 'display' is treated as 'block'

scss(propertyIgnoredDueToDisplay)
```
---
 app/assets/stylesheets/common/admin/admin_base.scss | 2 +-
 app/assets/stylesheets/common/admin/customize.scss  | 1 -
 app/assets/stylesheets/common/base/onebox.scss      | 2 --
 app/assets/stylesheets/common/base/tagging.scss     | 1 -
 app/assets/stylesheets/embed.scss                   | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 52018ed8b4..07177c845e 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -351,7 +351,7 @@ $mobile-breakpoint: 700px;
       width: 300px;
       margin-right: 15px;
       margin-bottom: 5px;
-      display: inline-block;
+
       .bar {
         margin-top: 5px;
         background-color: var(--tertiary);
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 443de0bd4e..cd7405e9a1 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -832,7 +832,6 @@ table.permalinks {
     border-bottom: 1px solid var(--primary-low);
     .form-display {
       width: 25%;
-      display: inline-block;
       float: left;
     }
     .form-element,
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index f01d46f2b0..b8d75d913e 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -61,7 +61,6 @@ a.loading-onebox {
       clear: both;
       padding-bottom: 25px;
       .metric {
-        display: inline-block;
         padding-left: 33px;
         float: left;
       }
@@ -727,7 +726,6 @@ aside.onebox.xkcd .onebox-body img {
     float: left;
     background: absolute-image-url("/favicons/pdf_64px.png") no-repeat;
     background-size: 48px 48px;
-    display: inline-block;
   }
   .filesize {
     color: gray;
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index eeb3cdd1a4..6ded31f48d 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -14,7 +14,6 @@
 }
 
 .tags-list .tag-box {
-  display: inline-block;
   width: 300px;
   margin-bottom: 1em;
   float: left;
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 6ccaf66fbc..ec80280405 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -106,7 +106,6 @@ img.emoji {
   font-size: var(--font-down-1);
   text-align: center;
   margin: 10px 20px 6px 0;
-  display: inline-block;
   float: right;
   color: var(--tertiary);
 }

From 899ed039b70bffe4ad493781568a4f3021fe6089 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:50:02 +0200
Subject: [PATCH 127/332] FIX: typo (#18566)

---
 app/assets/stylesheets/mobile/menu-panel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index 5ce9d5f913..785e5778c3 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -70,7 +70,7 @@
 }
 
 .tabs-list .btn {
-  .user-menu-revamped & {
+  .user-menu.revamped & {
     padding: 1.2em 1.4em;
   }
 }

From 76c86a426910d84602018ee2063c0b68b0056bb6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 12 Oct 2022 15:50:44 +0100
Subject: [PATCH 128/332] FIX: Correctly handle HTTP errors during dominant
 color calculation (#18565)

The previous fix in e83d35d6 was incorrect, and the stub in the test was never actually hit. This commit moves the error handling to the right place and updates the specs to ensure the stub is always used.
---
 app/models/upload.rb       | 12 +++++++-----
 spec/models/upload_spec.rb | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/models/upload.rb b/app/models/upload.rb
index 8ffbbe99c7..813c5e57e9 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -340,7 +340,13 @@ class Upload < ActiveRecord::Base
         if local?
           Discourse.store.path_for(self)
         else
-          Discourse.store.download(self)&.path
+          begin
+            Discourse.store.download(self)&.path
+          rescue OpenURI::HTTPError => e
+            # Some issue with downloading the image from a remote store.
+            # Assume the upload is broken and save an empty string to prevent re-evaluation
+            nil
+          end
         end
 
       if local_path.nil?
@@ -373,10 +379,6 @@ class Upload < ActiveRecord::Base
         raise "Calculated dominant color but unable to parse output:\n#{data}" if color.nil?
 
         color
-      rescue OpenURI::HTTPError => e
-        # Some issue with downloading the image from a remote store.
-        # Assume the upload is broken and save an empty string to prevent re-evaluation
-        ""
       rescue Discourse::Utils::CommandError => e
         # Timeout or unable to parse image
         # This can happen due to bad user input - ignore and save
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index fb4e6487a0..642061904e 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -704,21 +704,21 @@ RSpec.describe Upload do
     end
 
     it "correctly handles error when file is too large to download" do
-      white_image.stubs(:local?).returns(true)
-      Discourse.store.stubs(:download).returns(nil)
+      white_image.stubs(:local?).returns(false)
+      FileStore::LocalStore.any_instance.stubs(:download).returns(nil).once
 
-      expect(invalid_image.dominant_color).to eq(nil)
-      expect(invalid_image.dominant_color(calculate_if_missing: true)).to eq("")
-      expect(invalid_image.dominant_color).to eq("")
+      expect(white_image.dominant_color).to eq(nil)
+      expect(white_image.dominant_color(calculate_if_missing: true)).to eq("")
+      expect(white_image.dominant_color).to eq("")
     end
 
     it "correctly handles error when file has HTTP error" do
-      white_image.stubs(:local?).returns(true)
-      Discourse.store.stubs(:download).raises(OpenURI::HTTPError)
+      white_image.stubs(:local?).returns(false)
+      FileStore::LocalStore.any_instance.stubs(:download).raises(OpenURI::HTTPError.new("Error", nil)).once
 
-      expect(invalid_image.dominant_color).to eq(nil)
-      expect(invalid_image.dominant_color(calculate_if_missing: true)).to eq("")
-      expect(invalid_image.dominant_color).to eq("")
+      expect(white_image.dominant_color).to eq(nil)
+      expect(white_image.dominant_color(calculate_if_missing: true)).to eq("")
+      expect(white_image.dominant_color).to eq("")
     end
 
     it "is validated for length" do

From 1eaa1fee2dc829119590e7fe4a66b4e05a2145a6 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Wed, 12 Oct 2022 17:58:17 +0300
Subject: [PATCH 129/332] DEV: Merge mentions and watching tabs into the
 replies tab in the user menu (#18544)

This commit merges the mentions and "watching" tabs into the replies tab of the user menu. This change is kind of experimental, so we may change it back either fully or partially. Internal topic: t/76474.
---
 .../user-menu/mentions-notifications-list.js  |  11 --
 .../app/components/user-menu/menu.js          |  68 ++--------
 .../user-menu/watching-notifications-list.js  |  11 --
 .../tests/acceptance/user-menu-test.js        |  29 ++---
 .../components/site-header-test.js            |   2 -
 .../components/user-menu/menu-test.js         | 122 +++++++-----------
 6 files changed, 72 insertions(+), 171 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/mentions-notifications-list.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/watching-notifications-list.js

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/mentions-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/mentions-notifications-list.js
deleted file mode 100644
index 8cbfabb93a..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/mentions-notifications-list.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
-
-export default class UserMenuMentionsNotificationsList extends UserMenuNotificationsList {
-  get dismissTypes() {
-    return this.filterByTypes;
-  }
-
-  dismissWarningModal() {
-    return null;
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
index ff21b008a0..b29188b291 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
@@ -46,13 +46,22 @@ const CORE_TOP_TABS = [
 
     get count() {
       return (
+        this.getUnreadCountForType("mentioned") +
+        this.getUnreadCountForType("posted") +
+        this.getUnreadCountForType("quoted") +
         this.getUnreadCountForType("replied") +
-        this.getUnreadCountForType("quoted")
+        this.getUnreadCountForType("watching_first_post")
       );
     }
 
     get notificationTypes() {
-      return ["replied", "quoted"];
+      return [
+        "mentioned",
+        "posted",
+        "quoted",
+        "replied",
+        "watching_first_post",
+      ];
     }
 
     get linkWhenActive() {
@@ -60,32 +69,6 @@ const CORE_TOP_TABS = [
     }
   },
 
-  class extends UserMenuTab {
-    get id() {
-      return "mentions";
-    }
-
-    get icon() {
-      return "at";
-    }
-
-    get panelComponent() {
-      return "user-menu/mentions-notifications-list";
-    }
-
-    get count() {
-      return this.getUnreadCountForType("mentioned");
-    }
-
-    get notificationTypes() {
-      return ["mentioned"];
-    }
-
-    get linkWhenActive() {
-      return `${this.currentUser.path}/notifications/mentions`;
-    }
-  },
-
   class extends UserMenuTab {
     get id() {
       return "likes";
@@ -119,35 +102,6 @@ const CORE_TOP_TABS = [
     }
   },
 
-  class extends UserMenuTab {
-    get id() {
-      return "watching";
-    }
-
-    get icon() {
-      return "discourse-bell-exclamation";
-    }
-
-    get panelComponent() {
-      return "user-menu/watching-notifications-list";
-    }
-
-    get count() {
-      return (
-        this.getUnreadCountForType("posted") +
-        this.getUnreadCountForType("watching_first_post")
-      );
-    }
-
-    get notificationTypes() {
-      return ["posted", "watching_first_post"];
-    }
-
-    get linkWhenActive() {
-      return `${this.currentUser.path}/notifications`;
-    }
-  },
-
   class extends UserMenuTab {
     get id() {
       return "messages";
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/watching-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/watching-notifications-list.js
deleted file mode 100644
index ed2244d8d3..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/watching-notifications-list.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
-
-export default class UserMenuWatchingNotificationsList extends UserMenuNotificationsList {
-  get dismissTypes() {
-    return this.filterByTypes;
-  }
-
-  dismissWarningModal() {
-    return null;
-  }
-}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index b9bf541d09..741fe6b08e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -62,15 +62,15 @@ acceptance("User menu", function (needs) {
     );
   });
 
-  test("mentions notifications panel has a11y attributes", async function (assert) {
+  test("replies notifications panel has a11y attributes", async function (assert) {
     await visit("/");
     await click(".d-header-icons .current-user");
-    await click("#user-menu-button-mentions");
-    const panel = query("#quick-access-mentions");
+    await click("#user-menu-button-replies");
+    const panel = query("#quick-access-replies");
     assert.strictEqual(panel.getAttribute("tabindex"), "-1");
     assert.strictEqual(
       panel.querySelector("ul").getAttribute("aria-labelledby"),
-      "user-menu-button-mentions"
+      "user-menu-button-replies"
     );
   });
 
@@ -185,9 +185,7 @@ acceptance("User menu", function (needs) {
       "user-menu-button-replies": I18n.t("user_menu.tabs.replies_with_unread", {
         count: 2,
       }),
-      "user-menu-button-mentions": I18n.t("user_menu.tabs.mentions"),
       "user-menu-button-likes": I18n.t("user_menu.tabs.likes"),
-      "user-menu-button-watching": I18n.t("user_menu.tabs.watching"),
       "user-menu-button-messages": I18n.t("user_menu.tabs.messages"),
       "user-menu-button-bookmarks": I18n.t("user_menu.tabs.bookmarks"),
       "user-menu-button-tiny-tab-1": "Custom title: 73",
@@ -266,15 +264,13 @@ acceptance("User menu", function (needs) {
     const expectedTabOrder = {
       "user-menu-button-all-notifications": "0",
       "user-menu-button-replies": "1",
-      "user-menu-button-mentions": "2",
-      "user-menu-button-likes": "3",
-      "user-menu-button-watching": "4",
-      "user-menu-button-messages": "5",
-      "user-menu-button-bookmarks": "6",
-      "user-menu-button-custom-tab-1": "7",
-      "user-menu-button-custom-tab-2": "8",
-      "user-menu-button-review-queue": "9",
-      "user-menu-button-other-notifications": "10",
+      "user-menu-button-likes": "2",
+      "user-menu-button-messages": "3",
+      "user-menu-button-bookmarks": "4",
+      "user-menu-button-custom-tab-1": "5",
+      "user-menu-button-custom-tab-2": "6",
+      "user-menu-button-review-queue": "7",
+      "user-menu-button-other-notifications": "8",
     };
 
     await visit("/");
@@ -301,7 +297,7 @@ acceptance("User menu", function (needs) {
     );
     assert.strictEqual(
       query(".tabs-list.bottom-tabs .btn").dataset.tabNumber,
-      "11",
+      "9",
       "bottom tab has the correct data-tab-number"
     );
 
@@ -713,7 +709,6 @@ acceptance("User menu", function (needs) {
       ["#user-menu-button-custom-tab-1", "/u/eviltrout/preferences/account"],
       ["#user-menu-button-replies", "/u/eviltrout/notifications/responses"],
       ["#user-menu-button-messages", "/u/eviltrout/messages"],
-      ["#user-menu-button-mentions", "/u/eviltrout/notifications/mentions"],
       ["#user-menu-button-bookmarks", "/u/eviltrout/activity/bookmarks"],
       ["#user-menu-button-likes", "/u/eviltrout/notifications/likes-received"],
       ["#user-menu-button-custom-tab-2", null],
diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
index 07f7d52da4..620227d061 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
@@ -162,8 +162,6 @@ module("Integration | Component | site-header", function (hooks) {
     await triggerKeyEvent(document, "keydown", "ArrowDown");
     await triggerKeyEvent(document, "keydown", "ArrowDown");
     await triggerKeyEvent(document, "keydown", "ArrowDown");
-    await triggerKeyEvent(document, "keydown", "ArrowDown");
-    await triggerKeyEvent(document, "keydown", "ArrowDown");
 
     focusedTab = document.activeElement;
     assert.strictEqual(
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
index 58b348297b..6b32f8099a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
@@ -38,23 +38,17 @@ module("Integration | Component | user-menu", function (hooks) {
   test("the menu has a group of tabs at the top", async function (assert) {
     await render(template);
     const tabs = queryAll(".top-tabs.tabs-list .btn");
-    assert.strictEqual(tabs.length, 8);
-    [
-      "all-notifications",
-      "replies",
-      "mentions",
-      "likes",
-      "watching",
-      "messages",
-      "bookmarks",
-    ].forEach((tab, index) => {
-      assert.strictEqual(tabs[index].id, `user-menu-button-${tab}`);
-      assert.strictEqual(tabs[index].dataset.tabNumber, index.toString());
-      assert.strictEqual(
-        tabs[index].getAttribute("aria-controls"),
-        `quick-access-${tab}`
-      );
-    });
+    assert.strictEqual(tabs.length, 6);
+    ["all-notifications", "replies", "likes", "messages", "bookmarks"].forEach(
+      (tab, index) => {
+        assert.strictEqual(tabs[index].id, `user-menu-button-${tab}`);
+        assert.strictEqual(tabs[index].dataset.tabNumber, index.toString());
+        assert.strictEqual(
+          tabs[index].getAttribute("aria-controls"),
+          `quick-access-${tab}`
+        );
+      }
+    );
   });
 
   test("the menu has a group of tabs at the bottom", async function (assert) {
@@ -63,7 +57,7 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.strictEqual(tabs.length, 1);
     const profileTab = tabs[0];
     assert.strictEqual(profileTab.id, "user-menu-button-profile");
-    assert.strictEqual(profileTab.dataset.tabNumber, "8");
+    assert.strictEqual(profileTab.dataset.tabNumber, "6");
     assert.strictEqual(profileTab.getAttribute("tabindex"), "-1");
   });
 
@@ -73,11 +67,11 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.ok(!exists("#user-menu-button-likes"));
 
     const tabs = Array.from(queryAll(".tabs-list .btn")); // top and bottom tabs
-    assert.strictEqual(tabs.length, 8);
+    assert.strictEqual(tabs.length, 6);
 
     assert.deepEqual(
       tabs.map((t) => t.dataset.tabNumber),
-      ["0", "1", "2", "3", "4", "5", "6", "7"],
+      ["0", "1", "2", "3", "4", "5"],
       "data-tab-number of the tabs has no gaps when the likes tab is hidden"
     );
   });
@@ -87,14 +81,14 @@ module("Integration | Component | user-menu", function (hooks) {
     this.currentUser.set("reviewable_count", 1);
     await render(template);
     const tab = query("#user-menu-button-review-queue");
-    assert.strictEqual(tab.dataset.tabNumber, "7");
+    assert.strictEqual(tab.dataset.tabNumber, "5");
 
     const tabs = Array.from(queryAll(".tabs-list .btn")); // top and bottom tabs
-    assert.strictEqual(tabs.length, 10);
+    assert.strictEqual(tabs.length, 8);
 
     assert.deepEqual(
       tabs.map((t) => t.dataset.tabNumber),
-      ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+      ["0", "1", "2", "3", "4", "5", "6", "7"],
       "data-tab-number of the tabs has no gaps when the reviewables tab is show"
     );
   });
@@ -117,11 +111,11 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.ok(!exists("#user-menu-button-messages"));
 
     const tabs = Array.from(queryAll(".tabs-list .btn")); // top and bottom tabs
-    assert.strictEqual(tabs.length, 8);
+    assert.strictEqual(tabs.length, 6);
 
     assert.deepEqual(
       tabs.map((t) => t.dataset.tabNumber),
-      ["0", "1", "2", "3", "4", "5", "6", "7"],
+      ["0", "1", "2", "3", "4", "5"],
       "data-tab-number of the tabs has no gaps when the messages tab is hidden"
     );
   });
@@ -160,32 +154,7 @@ module("Integration | Component | user-menu", function (hooks) {
     pretender.get("/notifications", (request) => {
       queryParams = request.queryParams;
       let data;
-      if (queryParams.filter_by_types === "mentioned") {
-        data = [
-          {
-            id: 6,
-            user_id: 1,
-            notification_type: NOTIFICATION_TYPES.mentioned,
-            read: true,
-            high_priority: false,
-            created_at: "2021-11-25T19:31:13.241Z",
-            post_number: 6,
-            topic_id: 10,
-            fancy_title: "Greetings!",
-            slug: "greetings",
-            data: {
-              topic_title: "Greetings!",
-              original_post_id: 20,
-              original_post_type: 1,
-              original_username: "discobot",
-              revision_number: null,
-              display_username: "discobot",
-            },
-          },
-        ];
-      } else if (
-        queryParams.filter_by_types === "liked,liked_consolidated,reaction"
-      ) {
+      if (queryParams.filter_by_types === "liked,liked_consolidated,reaction") {
         data = [
           {
             id: 60,
@@ -248,8 +217,32 @@ module("Integration | Component | user-menu", function (hooks) {
             },
           },
         ];
-      } else if (queryParams.filter_by_types === "replied,quoted") {
-        data = [];
+      } else if (
+        queryParams.filter_by_types ===
+        "mentioned,posted,quoted,replied,watching_first_post"
+      ) {
+        data = [
+          {
+            id: 6,
+            user_id: 1,
+            notification_type: NOTIFICATION_TYPES.mentioned,
+            read: true,
+            high_priority: false,
+            created_at: "2021-11-25T19:31:13.241Z",
+            post_number: 6,
+            topic_id: 10,
+            fancy_title: "Greetings!",
+            slug: "greetings",
+            data: {
+              topic_title: "Greetings!",
+              original_post_id: 20,
+              original_post_type: 1,
+              original_username: "discobot",
+              revision_number: null,
+              display_username: "discobot",
+            },
+          },
+        ];
       } else {
         throw new Error(
           `unexpected notification type ${queryParams.filter_by_types}`
@@ -263,23 +256,6 @@ module("Integration | Component | user-menu", function (hooks) {
       ];
     });
 
-    await click("#user-menu-button-mentions");
-    assert.ok(exists("#quick-access-mentions.quick-access-panel"));
-    assert.strictEqual(
-      queryParams.filter_by_types,
-      "mentioned",
-      "request params has filter_by_types set to `mentioned`"
-    );
-    assert.strictEqual(queryParams.silent, "true");
-    let activeTabs = queryAll(".top-tabs .btn.active");
-    assert.strictEqual(activeTabs.length, 1);
-    assert.strictEqual(
-      activeTabs[0].id,
-      "user-menu-button-mentions",
-      "active tab is now the mentions tab"
-    );
-    assert.strictEqual(queryAll("#quick-access-mentions ul li").length, 1);
-
     await click("#user-menu-button-likes");
     assert.ok(exists("#quick-access-likes.quick-access-panel"));
     assert.strictEqual(
@@ -288,7 +264,7 @@ module("Integration | Component | user-menu", function (hooks) {
       "request params has filter_by_types set to `liked`, `liked_consolidated` and `reaction`"
     );
     assert.strictEqual(queryParams.silent, "true");
-    activeTabs = queryAll(".top-tabs .btn.active");
+    let activeTabs = queryAll(".top-tabs .btn.active");
     assert.strictEqual(activeTabs.length, 1);
     assert.strictEqual(
       activeTabs[0].id,
@@ -301,8 +277,8 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.ok(exists("#quick-access-replies.quick-access-panel"));
     assert.strictEqual(
       queryParams.filter_by_types,
-      "replied,quoted",
-      "request params has filter_by_types set to `replied` and `quoted`"
+      "mentioned,posted,quoted,replied,watching_first_post",
+      "request params has filter_by_types set to `mentioned`, `posted`, `quoted`, `replied` and `watching_first_post`"
     );
     assert.strictEqual(queryParams.silent, "true");
     activeTabs = queryAll(".top-tabs .btn.active");

From 7611fec0daa6f4f736f1e6e61c8d1dbbf4944179 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 12 Oct 2022 18:38:45 +0300
Subject: [PATCH 130/332] FEATURE: Implement new onboarding popups (#18362)

This commit introduces a new framework for building user tutorials as
popups using the Tippy JS library. Currently, the new framework is used
to replace the old notification spotlight and tips and show a new one
related to the topic timeline.

All popups follow the same structure and have a title, a description and
two buttons for either dismissing just the current tip or all of them
at once.

The state of all seen popups is stored in a user option. Updating
skip_new_user_tips will automatically update the list of seen popups
accordingly.
---
 .../discourse/app/components/mount-widget.js  |  1 +
 .../discourse/app/components/site-header.js   | 66 +++++++------
 .../javascripts/discourse/app/lib/popup.js    | 99 +++++++++++++++++++
 .../javascripts/discourse/app/models/user.js  | 63 +++++++++++-
 .../discourse/app/widgets/header.js           | 45 ++++++++-
 .../discourse/app/widgets/topic-timeline.js   | 26 +++++
 .../tests/acceptance/composer-actions-test.js |  1 +
 .../tests/acceptance/composer-test.js         |  1 +
 .../stylesheets/common/base/discourse.scss    | 19 ++++
 app/controllers/users_controller.rb           |  2 +-
 app/models/onboarding_popup.rb                | 10 ++
 app/models/user_option.rb                     |  1 +
 app/serializers/current_user_serializer.rb    |  9 ++
 app/serializers/site_serializer.rb            |  9 ++
 app/services/user_updater.rb                  |  9 ++
 config/locales/client.en.yml                  | 12 +++
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  3 +
 ...3212549_add_seen_popups_to_user_options.rb |  7 ++
 spec/serializers/site_serializer_spec.rb      | 14 +++
 spec/services/user_updater_spec.rb            | 14 +++
 21 files changed, 376 insertions(+), 36 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/lib/popup.js
 create mode 100644 app/models/onboarding_popup.rb
 create mode 100644 db/migrate/20220923212549_add_seen_popups_to_user_options.rb

diff --git a/app/assets/javascripts/discourse/app/components/mount-widget.js b/app/assets/javascripts/discourse/app/components/mount-widget.js
index e520e83a97..6a1538ad5b 100644
--- a/app/assets/javascripts/discourse/app/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/app/components/mount-widget.js
@@ -71,6 +71,7 @@ export default Component.extend({
     this._connected.forEach((v) => v.destroy());
     this._connected.length = 0;
 
+    traverseCustomWidgets(this._tree, (w) => w.destroy());
     this._rootNode = patch(this._rootNode, diff(this._tree, null));
     this._tree = null;
   },
diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index e44bb9643d..0b902d2563 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -251,39 +251,41 @@ const SiteHeaderComponent = MountWidget.extend(
         this.currentUser.on("status-changed", this, "queueRerender");
       }
 
-      if (
-        this.currentUser &&
-        !this.get("currentUser.read_first_notification")
-      ) {
-        document.body.classList.add("unread-first-notification");
-      }
+      if (!this.siteSettings.enable_onboarding_popups) {
+        if (
+          this.currentUser &&
+          !this.get("currentUser.read_first_notification")
+        ) {
+          document.body.classList.add("unread-first-notification");
+        }
 
-      // Allow first notification to be dismissed on a click anywhere
-      if (
-        this.currentUser &&
-        !this.get("currentUser.read_first_notification") &&
-        !this.get("currentUser.enforcedSecondFactor")
-      ) {
-        this._dismissFirstNotification = (e) => {
-          if (document.body.classList.contains("unread-first-notification")) {
-            document.body.classList.remove("unread-first-notification");
-          }
-          if (
-            !e.target.closest("#current-user") &&
-            !e.target.closest(".ring-backdrop") &&
-            this.currentUser &&
-            !this.get("currentUser.read_first_notification") &&
-            !this.get("currentUser.enforcedSecondFactor")
-          ) {
-            this.eventDispatched(
-              "header:dismiss-first-notification-mask",
-              "header"
-            );
-          }
-        };
-        document.addEventListener("click", this._dismissFirstNotification, {
-          once: true,
-        });
+        // Allow first notification to be dismissed on a click anywhere
+        if (
+          this.currentUser &&
+          !this.get("currentUser.read_first_notification") &&
+          !this.get("currentUser.enforcedSecondFactor")
+        ) {
+          this._dismissFirstNotification = (e) => {
+            if (document.body.classList.contains("unread-first-notification")) {
+              document.body.classList.remove("unread-first-notification");
+            }
+            if (
+              !e.target.closest("#current-user") &&
+              !e.target.closest(".ring-backdrop") &&
+              this.currentUser &&
+              !this.get("currentUser.read_first_notification") &&
+              !this.get("currentUser.enforcedSecondFactor")
+            ) {
+              this.eventDispatched(
+                "header:dismiss-first-notification-mask",
+                "header"
+              );
+            }
+          };
+          document.addEventListener("click", this._dismissFirstNotification, {
+            once: true,
+          });
+        }
       }
 
       const header = document.querySelector("header.d-header");
diff --git a/app/assets/javascripts/discourse/app/lib/popup.js b/app/assets/javascripts/discourse/app/lib/popup.js
new file mode 100644
index 0000000000..f098f75e81
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/popup.js
@@ -0,0 +1,99 @@
+import { iconHTML } from "discourse-common/lib/icon-library";
+import I18n from "I18n";
+import { escape } from "pretty-text/sanitizer";
+import tippy from "tippy.js";
+
+const instances = {};
+const queue = [];
+
+export function showPopup(options) {
+  hidePopup(options.id);
+
+  if (!options.reference) {
+    return;
+  }
+
+  if (Object.keys(instances).length > 0) {
+    return addToQueue(options);
+  }
+
+  instances[options.id] = tippy(options.reference, {
+    // Tippy must be displayed as soon as possible and not be hidden unless
+    // the user clicks on one of the two buttons.
+    showOnCreate: true,
+    hideOnClick: false,
+    trigger: "manual",
+
+    // It must be interactive to make buttons work.
+    interactive: true,
+
+    arrow: iconHTML("tippy-rounded-arrow"),
+    placement: options.placement,
+
+    // It often happens for the reference element to be rerendered. In this
+    // case, tippy must be rerendered too. Having an animation means that the
+    // animation will replay over and over again.
+    animation: false,
+
+    // The `content` property below is HTML.
+    allowHTML: true,
+
+    content: `
+      <div class='onboarding-popup-container'>
+        <div class='onboarding-popup-title'>${escape(options.titleText)}</div>
+        <div class='onboarding-popup-content'>${escape(
+          options.contentText
+        )}</div>
+        <div class='onboarding-popup-buttons'>
+          <button class="btn btn-primary btn-dismiss">${escape(
+            options.primaryBtnText || I18n.t("popup.primary")
+          )}</button>
+          <button class="btn btn-flat btn-text btn-dismiss-all">${escape(
+            options.secondaryBtnText || I18n.t("popup.secondary")
+          )}</button>
+        </div>
+      </div>`,
+
+    onCreate(instance) {
+      instance.popper
+        .querySelector(".btn-dismiss")
+        .addEventListener("click", (event) => {
+          options.onDismiss();
+          event.preventDefault();
+        });
+
+      instance.popper
+        .querySelector(".btn-dismiss-all")
+        .addEventListener("click", (event) => {
+          options.onDismissAll();
+          event.preventDefault();
+        });
+    },
+  });
+}
+
+export function hidePopup(popupId) {
+  const instance = instances[popupId];
+  if (instance && !instance.state.isDestroyed) {
+    instance.destroy();
+  }
+  delete instances[popupId];
+}
+
+function addToQueue(options) {
+  for (let i = 0; i < queue.size; ++i) {
+    if (queue[i].id === options.id) {
+      queue[i] = options;
+      return;
+    }
+  }
+
+  queue.push(options);
+}
+
+export function showNextPopup() {
+  const options = queue.shift();
+  if (options) {
+    showPopup(options);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 9476296dfc..d829fb8e18 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -35,6 +35,7 @@ import Evented from "@ember/object/evented";
 import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import { isTesting } from "discourse-common/config/environment";
+import { hidePopup, showNextPopup, showPopup } from "discourse/lib/popup";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -104,6 +105,7 @@ let userOptionFields = [
   "title_count_mode",
   "timezone",
   "skip_new_user_tips",
+  "seen_popups",
   "default_calendar",
   "bookmark_auto_delete_preference",
 ];
@@ -441,7 +443,7 @@ const User = RestModel.extend({
           "external_links_in_new_tab",
           "dynamic_favicon"
         );
-        User.current().setProperties(userProps);
+        User.current()?.setProperties(userProps);
         this.setProperties(updatedState);
         return result;
       })
@@ -1091,6 +1093,65 @@ const User = RestModel.extend({
       )
     );
   },
+
+  showPopup(options) {
+    const popupTypes = Site.currentProp("onboarding_popup_types");
+    if (!popupTypes[options.id]) {
+      // eslint-disable-next-line no-console
+      console.warn("Cannot display popup with type =", options.id);
+      return;
+    }
+
+    const seenPopups = this.seen_popups || [];
+    if (seenPopups.includes(popupTypes[options.id])) {
+      return;
+    }
+
+    showPopup({
+      ...options,
+      onDismiss: () => this.hidePopupForever(options.id),
+      onDismissAll: () => this.hidePopupForever(),
+    });
+  },
+
+  hidePopupForever(popupId) {
+    // Empty popupId means all popups.
+    const popupTypes = Site.currentProp("onboarding_popup_types");
+    if (popupId && !popupTypes[popupId]) {
+      // eslint-disable-next-line no-console
+      console.warn("Cannot hide popup with type =", popupId);
+      return;
+    }
+
+    // Hide any shown popups.
+    let seenPopups = this.seen_popups || [];
+    if (popupId) {
+      hidePopup(popupId);
+      if (!seenPopups.includes(popupTypes[popupId])) {
+        seenPopups.push(popupTypes[popupId]);
+      }
+    } else {
+      Object.keys(popupTypes).forEach(hidePopup);
+      seenPopups = Object.values(popupTypes);
+    }
+
+    // Show next popup in queue.
+    showNextPopup();
+
+    // Save seen popups on the server.
+    if (!this.user_option) {
+      this.set("user_option", {});
+    }
+    this.set("seen_popups", seenPopups);
+    this.set("user_option.seen_popups", seenPopups);
+    if (popupId) {
+      return this.save(["seen_popups"]);
+    } else {
+      this.set("skip_new_user_tips", true);
+      this.set("user_option.skip_new_user_tips", true);
+      return this.save(["seen_popups", "skip_new_user_tips"]);
+    }
+  },
 });
 
 User.reopenClass(Singleton, {
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 0a8398f141..79c8195dd6 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -13,6 +13,7 @@ import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { logSearchLinkClick } from "discourse/lib/search";
 import RenderGlimmer from "discourse/widgets/render-glimmer";
 import { hbs } from "ember-cli-htmlbars";
+import { hidePopup } from "discourse/lib/popup";
 
 let _extraHeaderIcons = [];
 
@@ -87,8 +88,13 @@ createWidget("header-notifications", {
         const count = unread + reviewables;
         if (count > 0) {
           if (this._shouldHighlightAvatar()) {
-            this._addAvatarHighlight(contents);
+            if (this.siteSettings.enable_onboarding_popups) {
+              contents.push(h("span.ring"));
+            } else {
+              this._addAvatarHighlight(contents);
+            }
           }
+
           contents.push(
             this.attach("link", {
               action: attrs.action,
@@ -118,7 +124,11 @@ createWidget("header-notifications", {
         const unreadHighPriority = user.unread_high_priority_notifications;
         if (!!unreadHighPriority) {
           if (this._shouldHighlightAvatar()) {
-            this._addAvatarHighlight(contents);
+            if (this.siteSettings.enable_onboarding_popups) {
+              contents.push(h("span.ring"));
+            } else {
+              this._addAvatarHighlight(contents);
+            }
           }
 
           // add the counter for the unread high priority
@@ -184,6 +194,37 @@ createWidget("header-notifications", {
       )
     );
   },
+
+  didRenderWidget() {
+    if (
+      !this.currentUser ||
+      !this.siteSettings.enable_onboarding_popups ||
+      !this._shouldHighlightAvatar()
+    ) {
+      return;
+    }
+
+    this.currentUser.showPopup({
+      id: "first_notification",
+
+      titleText: I18n.t("popup.first_notification.title"),
+      contentText: I18n.t("popup.first_notification.content"),
+
+      reference: document
+        .querySelector(".badge-notification")
+        ?.parentElement?.querySelector(".avatar"),
+
+      placement: "bottom-end",
+    });
+  },
+
+  destroy() {
+    hidePopup("first_notification");
+  },
+
+  willRerenderWidget() {
+    hidePopup("first_notification");
+  },
 });
 
 createWidget(
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index 34b7358777..3326b683c5 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -9,6 +9,7 @@ import discourseLater from "discourse-common/lib/later";
 import { relativeAge } from "discourse/lib/formatter";
 import renderTags from "discourse/lib/render-tags";
 import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
+import { hidePopup } from "discourse/lib/popup";
 
 const SCROLLER_HEIGHT = 50;
 const LAST_READ_HEIGHT = 20;
@@ -598,4 +599,29 @@ export default createWidget("topic-timeline", {
 
     return result;
   },
+
+  didRenderWidget() {
+    if (!this.currentUser || !this.siteSettings.enable_onboarding_popups) {
+      return;
+    }
+
+    this.currentUser.showPopup({
+      id: "topic_timeline",
+
+      titleText: I18n.t("popup.topic_timeline.title"),
+      contentText: I18n.t("popup.topic_timeline.content"),
+
+      reference: document.querySelector("div.timeline-scrollarea-wrapper"),
+
+      placement: "left",
+    });
+  },
+
+  destroy() {
+    hidePopup("topic_timeline");
+  },
+
+  willRerenderWidget() {
+    hidePopup("topic_timeline");
+  },
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index 8be69c4bd6..2f1359d4d3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -29,6 +29,7 @@ acceptance("Composer Actions", function (needs) {
   });
   needs.site({ can_tag_topics: true });
   needs.pretender((server, helper) => {
+    server.put("/u/kris.json", () => helper.response({ user: {} }));
     const cardResponse = cloneJSON(userFixtures["/u/shade/card.json"]);
     server.get("/u/shade/card.json", () => helper.response(cardResponse));
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index ab11f39043..061c086c74 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -61,6 +61,7 @@ acceptance("Composer", function (needs) {
     ],
   });
   needs.pretender((server, helper) => {
+    server.put("/u/kris.json", () => helper.response({ user: {} }));
     server.post("/uploads/lookup-urls", () => {
       return helper.response([]);
     });
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index fe579fe9f0..9a52a296a8 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -570,6 +570,25 @@ table {
   animation-name: ping;
 }
 
+.onboarding-popup-container {
+  min-width: 300px;
+  padding: 0.5em;
+  text-align: left;
+
+  .onboarding-popup-title {
+    font-size: $font-up-2;
+    font-weight: bold;
+  }
+
+  .onboarding-popup-content {
+    margin-top: 0.25em;
+  }
+
+  .onboarding-popup-buttons {
+    margin-top: 1em;
+  }
+}
+
 .fade {
   opacity: 0;
   transition: opacity 0.15s linear;
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a28716270e..1e24e3d5d5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1966,7 +1966,7 @@ class UsersController < ApplicationController
     end
 
     result = params
-      .permit(permitted, theme_ids: [])
+      .permit(permitted, theme_ids: [], seen_popups: [])
       .reverse_merge(
         ip_address: request.remote_ip,
         registration_ip_address: request.remote_ip
diff --git a/app/models/onboarding_popup.rb b/app/models/onboarding_popup.rb
new file mode 100644
index 0000000000..f672f6eea4
--- /dev/null
+++ b/app/models/onboarding_popup.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class OnboardingPopup
+  def self.types
+    @types ||= Enum.new(
+      first_notification: 1,
+      topic_timeline: 2,
+    )
+  end
+end
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 1752ae4fbc..ac724dbfe6 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -268,6 +268,7 @@ end
 #  oldest_search_log_date           :datetime
 #  bookmark_auto_delete_preference  :integer          default(3), not null
 #  enable_experimental_sidebar      :boolean          default(FALSE)
+#  seen_popups                      :integer          is an Array
 #
 # Indexes
 #
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 0d37b055b4..a144b560e3 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -68,6 +68,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :timezone,
              :featured_topic,
              :skip_new_user_tips,
+             :seen_popups,
              :do_not_disturb_until,
              :has_topic_draft,
              :can_review,
@@ -282,6 +283,14 @@ class CurrentUserSerializer < BasicUserSerializer
     object.user_option.skip_new_user_tips
   end
 
+  def seen_popups
+    object.user_option.seen_popups
+  end
+
+  def include_seen_popups?
+    SiteSetting.enable_onboarding_popups
+  end
+
   def include_primary_group_id?
     object.primary_group_id.present?
   end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index c403767ffe..0ac35515c1 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -6,6 +6,7 @@ class SiteSerializer < ApplicationSerializer
     :default_archetype,
     :notification_types,
     :post_types,
+    :onboarding_popup_types,
     :trust_levels,
     :groups,
     :filters,
@@ -103,6 +104,14 @@ class SiteSerializer < ApplicationSerializer
     Post.types
   end
 
+  def onboarding_popup_types
+    OnboardingPopup.types
+  end
+
+  def include_onboarding_popup_types?
+    SiteSetting.enable_onboarding_popups
+  end
+
   def filters
     Discourse.filters.map(&:to_s)
   end
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 66e24f23fb..4de4057b4b 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -47,6 +47,7 @@ class UserUpdater
     :title_count_mode,
     :timezone,
     :skip_new_user_tips,
+    :seen_popups,
     :default_calendar
   ]
 
@@ -178,6 +179,14 @@ class UserUpdater
       end
     end
 
+    if attributes.key?(:skip_new_user_tips)
+      user.user_option.seen_popups = if user.user_option.skip_new_user_tips
+        OnboardingPopup.types.values
+      else
+        nil
+      end
+    end
+
     # automatically disable digests when mailing_list_mode is enabled
     user.user_option.email_digests = false if user.user_option.mailing_list_mode
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3d391db95d..059e4d1f3b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1812,6 +1812,18 @@ en:
       what_are_you_doing: "What are you doing?"
       remove_status: "Remove status"
 
+    popup:
+      primary: "Got it!"
+      secondary: "don't show me these tips"
+
+      first_notification:
+        title: "Your first notification!"
+        content: "Notifications are used to keep you up to date with what is happening in the community."
+
+      topic_timeline:
+        title: "Topic timeline"
+        content: "Scroll quickly through a post using the topic timeline."
+
     loading: "Loading..."
     errors:
       prev_page: "while trying to load"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ba19e4c7f3..a3af49bfd1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2349,6 +2349,7 @@ en:
     sitemap_page_size: "Number of URLs to include in each sitemap page. Max 50.000"
 
     enable_user_status: "(experimental) Allow users to set custom status message (emoji + description)."
+    enable_onboarding_popups: "(experimental) Enable educational popups that describe key features to users"
 
     short_title: "The short title will be used on the user's home screen, launcher, or other places where space may be limited. It should be limited to 12 characters."
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 8bccaafaf0..43100b93b6 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -379,6 +379,9 @@ basic:
   enable_user_status:
     client: true
     default: false
+  enable_onboarding_popups:
+    client: true
+    default: false
 
 login:
   invite_only:
diff --git a/db/migrate/20220923212549_add_seen_popups_to_user_options.rb b/db/migrate/20220923212549_add_seen_popups_to_user_options.rb
new file mode 100644
index 0000000000..782d4cb3ec
--- /dev/null
+++ b/db/migrate/20220923212549_add_seen_popups_to_user_options.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSeenPopupsToUserOptions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options, :seen_popups, :integer, array: true
+  end
+end
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 4decff31b9..8f367ec7e8 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -8,6 +8,20 @@ RSpec.describe SiteSerializer do
     Site.clear_cache
   end
 
+  describe '#onboarding_popup_types' do
+    it 'is included if enable_onboarding_popups' do
+      SiteSetting.enable_onboarding_popups = true
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:onboarding_popup_types]).to eq(OnboardingPopup.types)
+    end
+
+    it 'is not included if enable_onboarding_popups is disabled' do
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:onboarding_popup_types]).to eq(nil)
+    end
+  end
+
   it "includes category custom fields only if its preloaded" do
     category.custom_fields["enable_marketplace"] = true
     category.save_custom_fields
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 7539b4e4ad..abcfc5448f 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -525,6 +525,20 @@ RSpec.describe UserUpdater do
       end
     end
 
+    context 'when skip_new_user_tips is edited' do
+      it 'updates all fields' do
+        UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: true)
+
+        expect(user.user_option.skip_new_user_tips).to eq(true)
+        expect(user.user_option.seen_popups).to eq(OnboardingPopup.types.values)
+
+        UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: false)
+
+        expect(user.user_option.skip_new_user_tips).to eq(false)
+        expect(user.user_option.seen_popups).to eq(nil)
+      end
+    end
+
     it "logs the action" do
       user = Fabricate(:user, name: 'Billy Bob')
 

From c32ab701113149a3511e654b963a5184c24dc997 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 12 Oct 2022 20:07:07 +0400
Subject: [PATCH 131/332] FIX: alignment of user status emoji on posts (#18563)

---
 app/assets/stylesheets/common/base/topic-post.scss | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index a943ed9cc1..e228dd2dd7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -235,9 +235,12 @@ $quote-share-maxwidth: 150px;
     align-items: center;
   }
 
-  img.emoji {
-    width: 1em;
-    height: 1em;
+  .user-status-message {
+    display: flex;
+    img.emoji {
+      width: 1em;
+      height: 1em;
+    }
   }
 }
 

From 98620f8e0e551185df9082dbf7cbf1d3072949f4 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 12 Oct 2022 20:54:24 +0400
Subject: [PATCH 132/332] FIX: status emoji was shown on the left on mobile
 (#18567)

---
 .../javascripts/discourse/app/widgets/post-user-status.js     | 2 ++
 app/assets/stylesheets/mobile/topic-post.scss                 | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/post-user-status.js b/app/assets/javascripts/discourse/app/widgets/post-user-status.js
index 0e04857537..104e1c007c 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-user-status.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-user-status.js
@@ -3,6 +3,8 @@ import RenderGlimmer from "discourse/widgets/render-glimmer";
 import { hbs } from "ember-cli-htmlbars";
 
 createWidget("post-user-status", {
+  tagName: "span.user-status-message-wrap",
+
   html(attrs) {
     return [
       new RenderGlimmer(
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index a1e0c6d0e1..e5ff07b7da 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -362,6 +362,10 @@ span.highlighted {
       order: 2;
     }
 
+    .user-status-message-wrap {
+      order: 2;
+    }
+
     .second {
       order: 3;
       flex-basis: 100%;

From da9ce77ffd5533e2d8723f92b90450ef7353ee71 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Wed, 12 Oct 2022 19:01:01 +0200
Subject: [PATCH 133/332] UX: danger colour update (#18516)

* UX: danger colour update

* Update test
---
 app/assets/stylesheets/common/foundation/colors.scss | 2 +-
 spec/models/report_spec.rb                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/foundation/colors.scss b/app/assets/stylesheets/common/foundation/colors.scss
index ddfce76228..650c8ae29b 100644
--- a/app/assets/stylesheets/common/foundation/colors.scss
+++ b/app/assets/stylesheets/common/foundation/colors.scss
@@ -5,6 +5,6 @@ $quaternary: #e45735 !default;
 $header_background: #ffffff !default;
 $header_primary: #333333 !default;
 $highlight: #ffff4d !default;
-$danger: #e45735 !default;
+$danger: #c80001 !default;
 $success: #009900 !default;
 $love: #fa6c8d !default;
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index e68de4c75a..dae205cdaf 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -1220,7 +1220,7 @@ RSpec.describe Report do
         page_view_logged_in_report = reports.data.find { |r| r[:req] == "page_view_logged_in" }
         page_view_anon_report = reports.data.find { |r| r[:req] == "page_view_anon" }
 
-        expect(page_view_crawler_report[:color]).to eql("rgba(228,87,53,0.75)")
+        expect(page_view_crawler_report[:color]).to eql("rgba(200,0,1,0.75)")
         expect(page_view_crawler_report[:data][0][:y]).to eql(3)
 
         expect(page_view_logged_in_report[:color]).to eql("rgba(0,136,204,1)")

From efb116d2bd4d1e02df9ddf79316112e0555b4c1e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 12 Oct 2022 11:09:45 -0600
Subject: [PATCH 134/332] FIX: Reset related site settings on general category
 delete (#18548)

* FIX: Reset related site settings on general category delete

If the new seeded General category is deleted we also need to delete the
corresponding site setting for it so that we don't try and reference it.

This fixes a bug in the category dropdown composer.

This change creates the `clear_related_site_settings` after destroy
hook that could also be used by other features in the future, like maybe
when we have a `default_category_id` site_setting.

Looks like if `nil` out a site setting it is set to `0`?

```
[9] pry(main)> SiteSetting.general_category_id = nil
  SiteSetting Load (0.4ms)  SELECT "site_settings".* FROM "site_settings" WHERE "site_settings"."name" = 'general_category_id' LIMIT 1
=> nil
[10] pry(main)> SiteSetting.general_category_id
=> 0
```

That is why the tests check if the value is `< 1` and not `nil`.

* Use -1 instead of nil because it is the default
---
 app/models/category.rb       |  7 +++++++
 spec/models/category_spec.rb | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/models/category.rb b/app/models/category.rb
index adafc49a0f..0efbb5f3ed 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -70,6 +70,7 @@ class Category < ActiveRecord::Base
 
   after_create :create_category_definition
   after_destroy :trash_category_definition
+  after_destroy :clear_related_site_settings
 
   before_save :apply_permissions
   before_save :downcase_email
@@ -312,6 +313,12 @@ class Category < ActiveRecord::Base
     self.topic&.trash!
   end
 
+  def clear_related_site_settings
+    if self.id == SiteSetting.general_category_id
+      SiteSetting.general_category_id = -1
+    end
+  end
+
   def topic_url
     if has_attribute?("topic_slug")
       Topic.relative_url(topic_id, read_attribute(:topic_slug))
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 942b38180c..da0cf3bb4a 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -1286,4 +1286,16 @@ RSpec.describe Category do
       end
     end
   end
+
+  describe '#deleting the general category' do
+    fab!(:category) { Fabricate(:category) }
+
+    it 'should empty out the general_category_id site_setting' do
+      SiteSetting.general_category_id = category.id
+      category.destroy
+
+      expect(SiteSetting.general_category_id).to_not eq(category.id)
+      expect(SiteSetting.general_category_id).to be < 1
+    end
+  end
 end

From c4812948f6bfa2bc2871c031386a5ab0eeefa6f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 20:25:49 +0200
Subject: [PATCH 135/332] Build(deps-dev): Bump rspec-rails from 5.1.2 to 6.0.0
 (#18534)

* Build(deps-dev): Bump rspec-rails from 5.1.2 to 6.0.0

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.1.2 to 6.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.2...v6.0.0)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* FIX: Set the default level of FakeLogger

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jarek Radosz <jradosz@gmail.com>
---
 Gemfile.lock                | 16 ++++++++--------
 spec/support/fake_logger.rb |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5fcd7ceef1..dfcf2b8f3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,14 +390,14 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+    rspec-rails (6.0.0)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
     rspec-support (3.11.1)
     rss (0.2.9)
       rexml
diff --git a/spec/support/fake_logger.rb b/spec/support/fake_logger.rb
index 507e6d9062..376aab4c8c 100644
--- a/spec/support/fake_logger.rb
+++ b/spec/support/fake_logger.rb
@@ -10,6 +10,7 @@ class FakeLogger
     @warnings = []
     @errors = []
     @fatals = []
+    @level = Logger::DEBUG
   end
 
   def debug(message)

From d7c5a7033d5ffd5646fd594ec5389b9668027a1a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 12 Oct 2022 14:35:31 -0400
Subject: [PATCH 136/332] A11Y: Make "Load parent post" element accessible
 (#18568)

---
 app/assets/javascripts/discourse/app/widgets/post.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index e2fa3ab3c0..275b98c7c1 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -140,6 +140,12 @@ createWidget("reply-to-tab", {
     return { loading: false };
   },
 
+  buildAttributes() {
+    return {
+      tabindex: "0",
+    };
+  },
+
   html(attrs, state) {
     const icon = state.loading ? h("div.spinner.small") : iconNode("share");
     const name = prioritizeNameFallback(

From 231dc10bbdc13d2935e148547abcb8e83b75a6c8 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Wed, 12 Oct 2022 13:38:42 -0500
Subject: [PATCH 137/332] Add replaceContent selectKit modifier (#18569)

Add the ability to modify a selectKit's content with `replaceContent`

Eg.

```
      api.modifySelectKit("combo-box").replaceContent(() => {
        return {
          id: "foo",
          name: "Foo",
        };
      });
```

will override existing content to only include the passed object
---
 .../components/select-kit/api-test.js         | 30 +++++++++++++++++++
 .../select-kit/addon/mixins/plugin-api.js     | 21 +++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
index 7ee117c5aa..3bfdebbf00 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
@@ -102,4 +102,34 @@ module("Integration | Component | select-kit/api", function (hooks) {
 
     assert.strictEqual(query("#test").innerText, "foo");
   });
+
+  test("modifySelectKit(identifier).replaceContent", async function (assert) {
+    setDefaultState(this, null, { content: DEFAULT_CONTENT });
+
+    withPluginApi("0.8.43", (api) => {
+      api.modifySelectKit("combo-box").replaceContent(() => {
+        return {
+          id: "alpaca",
+          name: "Alpaca",
+        };
+      });
+      api.modifySelectKit("combo-box").replaceContent(() => {});
+    });
+
+    await render(hbs`
+      <ComboBox @value={{this.value}} @content={{this.content}} @onChange={{this.onChange}} />
+      <SingleSelect @value={{this.value}} @content={{this.content}} @onChange={{this.onChange}} />
+    `);
+    await this.comboBox.expand();
+
+    assert.strictEqual(this.comboBox.rows().length, 1);
+
+    const replacementRow = this.comboBox.rowByIndex(0);
+    assert.ok(replacementRow.exists());
+    assert.strictEqual(replacementRow.value(), "alpaca");
+
+    await this.comboBox.collapse();
+
+    assert.notOk(this.singleSelect.rowByValue("alpaca").exists());
+  });
 });
diff --git a/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js b/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
index 7bf055f657..f206221bdf 100644
--- a/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
+++ b/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
@@ -29,6 +29,15 @@ function onChange(pluginApiIdentifiers, mutationFunction) {
   _onChangeCallbacks[pluginApiIdentifiers].push(mutationFunction);
 }
 
+let _replaceContentCallbacks = {};
+function replaceContent(pluginApiIdentifiers, contentFunction) {
+  if (isNone(_replaceContentCallbacks[pluginApiIdentifiers])) {
+    _replaceContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _replaceContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
 export function applyContentPluginApiCallbacks(content, component) {
   makeArray(component.pluginApiIdentifiers).forEach((key) => {
     (_prependContentCallbacks[key] || []).forEach((c) => {
@@ -43,6 +52,13 @@ export function applyContentPluginApiCallbacks(content, component) {
         content = content.concat(makeArray(appendedContent));
       }
     });
+
+    (_replaceContentCallbacks[key] || []).forEach((c) => {
+      const replacementContent = c(component, content);
+      if (replacementContent) {
+        content = makeArray(replacementContent);
+      }
+    });
   });
 
   return content;
@@ -68,6 +84,10 @@ export function modifySelectKit(targetedIdentifier) {
       onChange(targetedIdentifier, callback);
       return modifySelectKit(targetedIdentifier);
     },
+    replaceContent: (callback) => {
+      replaceContent(targetedIdentifier, callback);
+      return modifySelectKit(targetedIdentifier);
+    },
   };
 }
 
@@ -75,6 +95,7 @@ export function clearCallbacks() {
   _appendContentCallbacks = {};
   _prependContentCallbacks = {};
   _onChangeCallbacks = {};
+  _replaceContentCallbacks = {};
 }
 
 const EMPTY_ARRAY = Object.freeze([]);

From 0fe111e4928e5788673934462af47c1c5251fa59 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 12 Oct 2022 23:35:25 +0400
Subject: [PATCH 138/332] FEATURE: add user status to user preferences (#18532)

---
 .../app/controllers/preferences/account.js    |  18 ++
 .../javascripts/discourse/app/models/user.js  |   1 +
 .../app/routes/preferences-account.js         |   1 +
 .../app/templates/preferences/account.hbs     |  18 ++
 ...er-preferences-account-user-status-test.js | 129 +++++++++++
 app/controllers/users_controller.rb           |   4 +
 app/services/user_updater.rb                  |  20 +-
 config/locales/client.en.yml                  |   3 +
 spec/requests/users_controller_spec.rb        | 218 ++++++++++++++++++
 9 files changed, 410 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-user-status-test.js

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 94ba197cfd..5d1c18c1bd 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -11,6 +11,7 @@ import getURL from "discourse-common/lib/get-url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 import { next } from "@ember/runloop";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(CanCheckEmails, {
   dialog: service(),
@@ -22,16 +23,19 @@ export default Controller.extend(CanCheckEmails, {
       "title",
       "primary_group_id",
       "flair_group_id",
+      "status",
     ];
     this.set("revoking", {});
   },
 
   canEditName: setting("enable_names"),
+  canSelectUserStatus: setting("enable_user_status"),
   canSaveUser: true,
 
   newNameInput: null,
   newTitleInput: null,
   newPrimaryGroupInput: null,
+  newStatus: null,
 
   revoking: null,
 
@@ -146,6 +150,19 @@ export default Controller.extend(CanCheckEmails, {
       });
   },
 
+  @action
+  showUserStatusModal(status) {
+    showModal("user-status", {
+      title: "user_status.set_custom_status",
+      modalClass: "user-status",
+      model: {
+        status,
+        saveAction: async (s) => this.set("newStatus", s),
+        deleteAction: async () => this.set("newStatus", null),
+      },
+    });
+  },
+
   actions: {
     save() {
       this.set("saved", false);
@@ -155,6 +172,7 @@ export default Controller.extend(CanCheckEmails, {
         title: this.newTitleInput,
         primary_group_id: this.newPrimaryGroupInput,
         flair_group_id: this.newFlairGroupId,
+        status: this.newStatus,
       });
 
       return this.model
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index d829fb8e18..70e1abd31f 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -69,6 +69,7 @@ let userFields = [
   "user_notification_schedule",
   "sidebar_category_ids",
   "sidebar_tag_names",
+  "status",
 ];
 
 export function addSaveableUserField(fieldName) {
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js
index fc12eb6c07..e7516e2f20 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-account.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-account.js
@@ -31,6 +31,7 @@ export default RestrictedUserRoute.extend({
       newTitleInput: user.get("title"),
       newPrimaryGroupInput: user.get("primary_group_id"),
       newFlairGroupId: user.get("flair_group_id"),
+      newStatus: user.status,
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 40ae04547a..6d7069c5f9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -173,6 +173,24 @@
   </div>
 {{/if}}
 
+{{#if this.canSelectUserStatus}}
+  <div class="control-group pref-user-status">
+    <label class="control-label">{{i18n "user.status.title"}}</label>
+    <div class="controls">
+      {{#if this.newStatus}}
+        <UserStatusMessage @status={{this.newStatus}} @showDescription={{true}} />
+      {{else}}
+        <span class="static">{{i18n "user.status.not_set"}}</span>
+      {{/if}}
+      <DButton
+        @action={{action "showUserStatusModal"}}
+        @actionParam={{this.newStatus}}
+        @class="btn-default btn-small pad-left"
+        @icon="pencil-alt"/>
+    </div>
+  </div>
+{{/if}}
+
 {{#if this.canSelectPrimaryGroup}}
   <div class="control-group pref-primary-group">
     <label class="control-label">{{i18n "user.primary_group.title"}}</label>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-user-status-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-user-status-test.js
new file mode 100644
index 0000000000..b89854744e
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-user-status-test.js
@@ -0,0 +1,129 @@
+import {
+  acceptance,
+  exists,
+  query,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+async function openUserStatusModal() {
+  await click(".pref-user-status .btn-default");
+}
+
+async function pickEmoji(emoji) {
+  await click(".btn-emoji");
+  await fillIn(".emoji-picker-content .filter", emoji);
+  await click(".results .emoji");
+}
+
+async function setStatus(status) {
+  await openUserStatusModal();
+  await pickEmoji(status.emoji);
+  await fillIn(".user-status-description", status.description);
+  await click(".modal-footer .btn-primary"); // save and close modal
+}
+
+acceptance("User Profile - Account - User Status", function (needs) {
+  const username = "eviltrout";
+  const status = {
+    emoji: "tooth",
+    description: "off to dentist",
+  };
+
+  needs.user({ username, status });
+
+  test("doesn't render status block if status is disabled in site settings", async function (assert) {
+    this.siteSettings.enable_user_status = false;
+    await visit(`/u/${username}/preferences/account`);
+    assert.notOk(exists(".pref-user-status"));
+  });
+
+  test("renders status block if status is enabled in site settings", async function (assert) {
+    this.siteSettings.enable_user_status = true;
+
+    await visit(`/u/${username}/preferences/account`);
+
+    assert.ok(
+      exists(".pref-user-status .user-status-message"),
+      "status is shown"
+    );
+    assert.ok(
+      exists(`.pref-user-status .emoji[alt='${status.emoji}']`),
+      "status emoji is correct"
+    );
+    assert.equal(
+      query(
+        `.pref-user-status .user-status-message-description`
+      ).innerText.trim(),
+      status.description,
+      "status description is correct"
+    );
+  });
+
+  test("the status modal sets status", async function (assert) {
+    this.siteSettings.enable_user_status = true;
+    updateCurrentUser({ status: null });
+
+    await visit(`/u/${username}/preferences/account`);
+    assert.notOk(
+      exists(".pref-user-status .user-status-message"),
+      "status isn't shown"
+    );
+
+    await setStatus(status);
+
+    assert.ok(
+      exists(".pref-user-status .user-status-message"),
+      "status is shown"
+    );
+    assert.ok(
+      exists(`.pref-user-status .emoji[alt='${status.emoji}']`),
+      "status emoji is correct"
+    );
+    assert.equal(
+      query(
+        `.pref-user-status .user-status-message-description`
+      ).innerText.trim(),
+      status.description,
+      "status description is correct"
+    );
+  });
+
+  test("the status modal updates status", async function (assert) {
+    this.siteSettings.enable_user_status = true;
+
+    await visit(`/u/${username}/preferences/account`);
+    const newStatus = { emoji: "surfing_man", description: "surfing" };
+    await setStatus(newStatus);
+
+    assert.ok(
+      exists(".pref-user-status .user-status-message"),
+      "status is shown"
+    );
+    assert.ok(
+      exists(`.pref-user-status .emoji[alt='${newStatus.emoji}']`),
+      "status emoji is correct"
+    );
+    assert.equal(
+      query(
+        `.pref-user-status .user-status-message-description`
+      ).innerText.trim(),
+      newStatus.description,
+      "status description is correct"
+    );
+  });
+
+  test("the status modal clears status", async function (assert) {
+    this.siteSettings.enable_user_status = true;
+
+    await visit(`/u/${username}/preferences/account`);
+    await openUserStatusModal();
+    await click(".btn.delete-status");
+
+    assert.notOk(
+      exists(".pref-user-status .user-status-message"),
+      "status isn't shown"
+    );
+  });
+});
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1e24e3d5d5..63f06911f3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1965,6 +1965,10 @@ class UsersController < ApplicationController
       end
     end
 
+    if SiteSetting.enable_user_status
+      permitted << { status: [:emoji, :description, :ends_at] }
+    end
+
     result = params
       .permit(permitted, theme_ids: [], seen_popups: [])
       .reverse_merge(
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 4de4057b4b..31feebbf91 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -218,9 +218,17 @@ class UserUpdater
         update_sidebar_tag_section_links(attributes[:sidebar_tag_names])
       end
 
+      if SiteSetting.enable_user_status?
+        update_user_status(attributes[:status])
+      end
+
       name_changed = user.name_changed?
-      if (saved = (!save_options || user.user_option.save) && (user_notification_schedule.nil? || user_notification_schedule.save) && user_profile.save && user.save) &&
-         (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
+      saved = (!save_options || user.user_option.save) &&
+        (user_notification_schedule.nil? || user_notification_schedule.save) &&
+        user_profile.save &&
+        user.save
+
+      if saved && (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
 
         StaffActionLogger.new(@actor).log_name_change(
           user.id,
@@ -341,6 +349,14 @@ class UserUpdater
     end
   end
 
+  def update_user_status(status)
+    if status.blank?
+      @user.clear_status!
+    else
+      @user.set_status!(status[:description], status[:emoji], status[:ends_at])
+    end
+  end
+
   attr_reader :user, :guardian
 
   def format_url(website)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 059e4d1f3b..350d32feb0 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1793,6 +1793,9 @@ en:
         title: "Flair"
         none: "(none)"
         instructions: "icon displayed next to your profile picture"
+      status:
+        title: "Custom Status"
+        not_set: "Not set"
       primary_group:
         title: "Primary Group"
         none: "(none)"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 56276bdecc..5c41f7d92b 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2472,6 +2472,224 @@ RSpec.describe UsersController do
         expect(response.status).to eq(400)
       end
     end
+
+    context "with user status" do
+      context "as a regular user" do
+        before do
+          SiteSetting.enable_user_status = true
+          sign_in(user)
+        end
+
+        it "sets user status" do
+          status = {
+            emoji: "tooth",
+            description: "off to dentist",
+          }
+
+          put "/u/#{user.username}.json", params: {
+            status: status
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).not_to be_nil
+          expect(user.user_status.emoji).to eq(status[:emoji])
+          expect(user.user_status.description).to eq(status[:description])
+        end
+
+        it "updates user status" do
+          user.set_status!("off to dentist", "tooth")
+          user.reload
+
+          new_status = {
+            emoji: "surfing_man",
+            description: "surfing",
+          }
+          put "/u/#{user.username}.json", params: {
+            status: new_status
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).not_to be_nil
+          expect(user.user_status.emoji).to eq(new_status[:emoji])
+          expect(user.user_status.description).to eq(new_status[:description])
+        end
+
+        it "clears user status" do
+          user.set_status!("off to dentist", "tooth")
+          user.reload
+
+          put "/u/#{user.username}.json", params: {
+            status: nil
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).to be_nil
+        end
+
+        it "can't set status of another user" do
+          put "/u/#{user1.username}.json", params: {
+            status: {
+              emoji: "tooth",
+              description: "off to dentist",
+            }
+          }
+          expect(response.status).to eq(403)
+
+          user1.reload
+          expect(user1.user_status).to be_nil
+        end
+
+        it "can't update status of another user" do
+          old_status = {
+            emoji: "tooth",
+            description: "off to dentist",
+          }
+          user1.set_status!(old_status[:description], old_status[:emoji])
+          user1.reload
+
+          new_status = {
+            emoji: "surfing_man",
+            description: "surfing",
+          }
+          put "/u/#{user1.username}.json", params: {
+            status: new_status
+          }
+          expect(response.status).to eq(403)
+
+          user1.reload
+          expect(user1.user_status).not_to be_nil
+          expect(user1.user_status.emoji).to eq(old_status[:emoji])
+          expect(user1.user_status.description).to eq(old_status[:description])
+        end
+
+        it "can't clear status of another user" do
+          user1.set_status!("off to dentist", "tooth")
+          user1.reload
+
+          put "/u/#{user1.username}.json", params: {
+            status: nil
+          }
+          expect(response.status).to eq(403)
+
+          user1.reload
+          expect(user1.user_status).not_to be_nil
+        end
+
+        context 'when user status is disabled' do
+          before do
+            SiteSetting.enable_user_status = false
+          end
+
+          it "doesn't set user status" do
+            put "/u/#{user.username}.json", params: {
+              status: {
+                emoji: "tooth",
+                description: "off to dentist",
+              }
+            }
+            expect(response.status).to eq(200)
+
+            user.reload
+            expect(user.user_status).to be_nil
+          end
+
+          it "doesn't update user status" do
+            old_status = {
+              emoji: "tooth",
+              description: "off to dentist",
+            }
+            user.set_status!(old_status[:description], old_status[:emoji])
+            user.reload
+
+            new_status = {
+              emoji: "surfing_man",
+              description: "surfing",
+            }
+            put "/u/#{user.username}.json", params: {
+              status: new_status
+            }
+            expect(response.status).to eq(200)
+
+            user.reload
+            expect(user.user_status).not_to be_nil
+            expect(user.user_status.emoji).to eq(old_status[:emoji])
+            expect(user.user_status.description).to eq(old_status[:description])
+          end
+
+          it "doesn't clear user status" do
+            user.set_status!("off to dentist", "tooth")
+            user.reload
+
+            put "/u/#{user.username}.json", params: {
+              status: nil
+            }
+            expect(response.status).to eq(200)
+
+            user.reload
+            expect(user.user_status).not_to be_nil
+          end
+        end
+      end
+
+      context 'as a staff user' do
+        before do
+          SiteSetting.enable_user_status = true
+          sign_in(moderator)
+        end
+
+        it "sets another user's status" do
+          status = {
+            emoji: "tooth",
+            description: "off to dentist",
+          }
+
+          put "/u/#{user.username}.json", params: {
+            status: status
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).not_to be_nil
+          expect(user.user_status.emoji).to eq(status[:emoji])
+          expect(user.user_status.description).to eq(status[:description])
+        end
+
+        it "updates another user's status" do
+          user.set_status!("off to dentist", "tooth")
+          user.reload
+
+          new_status = {
+            emoji: "surfing_man",
+            description: "surfing",
+          }
+          put "/u/#{user.username}.json", params: {
+            status: new_status
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).not_to be_nil
+          expect(user.user_status.emoji).to eq(new_status[:emoji])
+          expect(user.user_status.description).to eq(new_status[:description])
+        end
+
+        it "clears another user's status" do
+          user.set_status!("off to dentist", "tooth")
+          user.reload
+
+          put "/u/#{user.username}.json", params: {
+            status: nil
+          }
+          expect(response.status).to eq(200)
+
+          user.reload
+          expect(user.user_status).to be_nil
+        end
+      end
+    end
   end
 
   describe '#badge_title' do

From 7f167de10b32116fb782081e8c06d9de88547b9a Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Thu, 13 Oct 2022 02:43:56 +0530
Subject: [PATCH 139/332] FIX: remove `nil` items before sorting the sha1
 string array. (#18571)

Previously, when the array had both nil and string values it returned the error "comparison of NilClass with String failed". Now I added the `.compact` method to prevent this issue as per @martin-brennan's suggestion https://github.com/discourse/discourse/pull/18431#discussion_r984204788
---
 lib/stylesheet/manager/builder.rb   |  2 +-
 spec/lib/stylesheet/manager_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/stylesheet/manager/builder.rb b/lib/stylesheet/manager/builder.rb
index 137d48db9f..f4da9d14dc 100644
--- a/lib/stylesheet/manager/builder.rb
+++ b/lib/stylesheet/manager/builder.rb
@@ -225,7 +225,7 @@ class Stylesheet::Manager::Builder
       sha1s << upload_field.upload&.sha1
     end
 
-    Digest::SHA1.hexdigest(sha1s.sort!.join("\n"))
+    Digest::SHA1.hexdigest(sha1s.compact.sort!.join("\n"))
   end
 
   def default_digest
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index caae0e9a83..5818d846d8 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -374,6 +374,16 @@ RSpec.describe Stylesheet::Manager do
         type_id: ThemeField.types[:theme_upload_var]
       )
 
+      upload2 = UploadCreator.new(image2, "icon.png").create_for(-1)
+      field = ThemeField.create!(
+        theme_id: theme.id,
+        target_id: Theme.targets[:common],
+        name: "icon",
+        value: "",
+        upload_id: upload2.id,
+        type_id: ThemeField.types[:theme_upload_var]
+      )
+
       manager = manager(theme.id)
 
       builder = Stylesheet::Manager::Builder.new(

From 58e4b43fe4c07db1e21f5fa299ee4a7330791cd0 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 13 Oct 2022 09:01:19 +1100
Subject: [PATCH 140/332] FIX: replace prefixCSS with prefixElementColors
 (#18556)

Instead of having `prefixCSS`, only `prefixElementColors` are available to reduce chances of exposing XSS.
---
 .../sidebar/anonymous/categories-section.hbs           |  4 ++--
 .../app/components/sidebar/section-link-prefix.hbs     |  3 +--
 .../discourse/app/components/sidebar/section-link.hbs  |  5 +++--
 .../discourse/app/components/sidebar/section-link.js   | 10 ++++++++--
 .../app/components/sidebar/user/categories-section.hbs |  4 ++--
 .../user/categories-section/category-section-link.js   |  8 ++------
 .../acceptance/sidebar-user-categories-section-test.js |  2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
index 7b7ee5b749..6a174ed7a6 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
@@ -13,8 +13,8 @@
       @model={{sectionLink.model}}
       @prefixType={{sectionLink.prefixType}}
       @prefixValue={{sectionLink.prefixValue}}
-      @prefixCSS={{sectionLink.prefixCSS}}
-      @prefixColor={{sectionLink.prefixColor}} >
+      @prefixColor={{sectionLink.prefixColor}}
+      @prefixElementColors={{sectionLink.prefixElementColors}} >
     </Sidebar::SectionLink>
   {{/each}}
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
index 3af9d14f7e..31c5ec6748 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
@@ -15,9 +15,8 @@
     {{/if}}
 
     {{#if (eq @prefixType "span")}}
-      <span style={{html-safe @prefixCSS}} class="prefix-span"></span>
+      <span style={{html-safe (concat "background: linear-gradient(90deg, " @prefixElementColors ")")}} class="prefix-span"></span>
     {{/if}}
-
     {{#if @prefixBadge}}
       {{d-icon @prefixBadge class="prefix-badge"}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
index 0cc9938e76..c29385e2c0 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
@@ -6,7 +6,8 @@
           @prefixType={{@prefixType}}
           @prefixValue={{@prefixValue}}
           @prefixCSSClass={{@prefixCSSClass}}
-          @prefixCSS={{this.prefixCSS}}
+          @prefixColor={{this.prefixColor}}
+          @prefixElementColors={{this.prefixElementColors}}
           @prefixBadge={{@prefixBadge}}
         />
 
@@ -28,8 +29,8 @@
           @prefixType={{@prefixType}}
           @prefixValue={{@prefixValue}}
           @prefixCSSClass={{@prefixCSSClass}}
-          @prefixCSS={{this.prefixCSS}}
           @prefixColor={{this.prefixColor}}
+          @prefixElementColors={{this.prefixElementColors}}
           @prefixBadge={{@prefixBadge}}
         />
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index 6155739c72..e472e99ac7 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -51,7 +51,13 @@ export default class SectionLink extends Component {
     return "#" + color;
   }
 
-  get prefixCSS() {
-    return this.args.prefixCSS;
+  get prefixElementColors() {
+    const prefixElementColors = this.args.prefixElementColors.filter((color) =>
+      color?.match(/^\w{6}$/)
+    );
+    if (prefixElementColors.length === 1) {
+      prefixElementColors.push(prefixElementColors[0]);
+    }
+    return prefixElementColors.map((color) => `#${color} 50%`).join(", ");
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 2d40a98883..06470cf81e 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -19,8 +19,8 @@
         @prefixBadge={{sectionLink.prefixBadge}}
         @prefixType={{sectionLink.prefixType}}
         @prefixValue={{sectionLink.prefixValue}}
-        @prefixCSS={{sectionLink.prefixCSS}}
-        @prefixColor={{sectionLink.prefixColor}} >
+        @prefixColor={{sectionLink.prefixColor}}
+        @prefixElementColors={{sectionLink.prefixElementColors}} >
       </Sidebar::SectionLink>
     {{/each}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index e7172d5f04..8af34cdb3f 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -52,12 +52,8 @@ export default class CategorySectionLink {
     return "span";
   }
 
-  get prefixCSS() {
-    if (this.category.parentCategory) {
-      return `background: linear-gradient(90deg, #${this.category.parentCategory.color} 50%, #${this.category.color} 50%)`;
-    } else {
-      return `background: #${this.category.color}`;
-    }
+  get prefixElementColors() {
+    return [this.category.parentCategory?.color, this.category.color];
   }
 
   get prefixColor() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 42a9959883..d69611fec9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -197,7 +197,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: #${category1.color}"]`
+        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category1.color} 50%, #${category1.color} 50%)"]`
       ),
       "category1 section link is rendered with solid prefix icon color"
     );

From deb0656b63512387cea498ed15c9aaee9adae2f9 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 13 Oct 2022 08:37:28 +0800
Subject: [PATCH 141/332] UX: Hide tags section in sidebar when user has no
 visible tags (#18539)

Also hides the tags configuration for sidebar under user preferences

Internal ref: /t/73500
---
 .../app/components/sidebar/user/sections.hbs  |  2 +-
 .../app/templates/preferences/sidebar.hbs     |  2 +-
 .../sidebar-user-tags-section-test.js         | 12 ++++++
 .../tests/acceptance/sidebar-user-test.js     |  8 +++-
 .../user-preferences-sidebar-test.js          |  5 ++-
 .../concerns/user_sidebar_tags_mixin.rb       | 12 +++++-
 .../current_user_serializer_spec.rb           |  2 +
 spec/serializers/user_serializer_spec.rb      |  2 +
 spec/support/user_sidebar_tags_mixin.rb       | 41 +++++++++++++++++++
 9 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 spec/support/user_sidebar_tags_mixin.rb

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
index 0cb880c614..f3a01651bd 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
@@ -2,7 +2,7 @@
   <Sidebar::User::CommunitySection @collapsable={{@collapsableSections}}/>
   <Sidebar::User::CategoriesSection @collapsable={{@collapsableSections}}/>
 
-  {{#if this.siteSettings.tagging_enabled}}
+  {{#if this.currentUser.display_sidebar_tags}}
     <Sidebar::User::TagsSection @collapsable={{@collapsableSections}}/>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
index dd55ee6942..61a6286787 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
@@ -15,7 +15,7 @@
   <div class="instructions">{{i18n "user.experimental_sidebar.categories_section_instruction"}}</div>
 </div>
 
-{{#if this.siteSettings.tagging_enabled}}
+{{#if this.model.display_sidebar_tags}}
   <div class="control-group preferences-sidebar-tags">
     <legend class="control-label">{{i18n "user.experimental_sidebar.tags_section"}}</legend>
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index 29f082fdc7..cdd7e790d9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -58,6 +58,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
         pm_only: false,
       },
     ],
+    display_sidebar_tags: true,
   });
 
   needs.pretender((server, helper) => {
@@ -90,6 +91,17 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     });
   });
 
+  test("section is not displayed when display_sidebar_tags property is false", async function (assert) {
+    updateCurrentUser({ display_sidebar_tags: false });
+
+    await visit("/");
+
+    assert.notOk(
+      exists(".sidebar-section-tags"),
+      "tags section is not displayed"
+    );
+  });
+
   test("clicking on section header button", async function (assert) {
     await visit("/");
     await click(".sidebar-section-tags .sidebar-section-header-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
index 10ed04ae0f..24e7473b18 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
@@ -1,7 +1,11 @@
 import I18n from "I18n";
 import { test } from "qunit";
 import { click, visit } from "@ember/test-helpers";
-import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import {
+  acceptance,
+  exists,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance(
   "Sidebar - Logged on user - Experimental sidebar and hamburger setting disabled",
@@ -171,7 +175,7 @@ acceptance(
     });
 
     test("clean up topic tracking state state changed callbacks when sidebar is destroyed", async function (assert) {
-      this.siteSettings.tagging_enabled = true;
+      updateCurrentUser({ display_sidebar_tags: true });
 
       await visit("/");
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
index 5e48f669bd..4637783240 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
@@ -13,6 +13,7 @@ acceptance("User Preferences - Sidebar", function (needs) {
   needs.user({
     sidebar_category_ids: [],
     sidebar_tags: [],
+    display_sidebar_tags: true,
   });
 
   needs.settings({
@@ -51,8 +52,8 @@ acceptance("User Preferences - Sidebar", function (needs) {
     });
   });
 
-  test("user should not see tag chooser when tagging is disabled", async function (assert) {
-    this.siteSettings.tagging_enabled = false;
+  test("user should not see tag chooser when display_sidebar_tags property is false", async function (assert) {
+    updateCurrentUser({ display_sidebar_tags: false });
 
     await visit("/u/eviltrout/preferences/sidebar");
 
diff --git a/app/serializers/concerns/user_sidebar_tags_mixin.rb b/app/serializers/concerns/user_sidebar_tags_mixin.rb
index f9ec79fbee..e387f01c31 100644
--- a/app/serializers/concerns/user_sidebar_tags_mixin.rb
+++ b/app/serializers/concerns/user_sidebar_tags_mixin.rb
@@ -2,10 +2,20 @@
 
 module UserSidebarTagsMixin
   def self.included(base)
+    base.attributes :display_sidebar_tags
+
     base.has_many :sidebar_tags, serializer: Sidebar::TagSerializer, embed: :objects
   end
 
   def include_sidebar_tags?
-    SiteSetting.enable_experimental_sidebar_hamburger && SiteSetting.tagging_enabled
+    include_display_sidebar_tags?
+  end
+
+  def display_sidebar_tags
+    DiscourseTagging.filter_visible(Tag, scope).exists?
+  end
+
+  def include_display_sidebar_tags?
+    SiteSetting.tagging_enabled && SiteSetting.enable_experimental_sidebar_hamburger
   end
 end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index db40891fa5..267eedac16 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -387,4 +387,6 @@ RSpec.describe CurrentUserSerializer do
       expect(serializer.as_json[:associated_account_ids]).to eq({ "twitter" => "1" })
     end
   end
+
+  include_examples "#display_sidebar_tags", described_class
 end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 966d5f225f..b5abe360d2 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -424,4 +424,6 @@ RSpec.describe UserSerializer do
       end
     end
   end
+
+  include_examples "#display_sidebar_tags", UserSerializer
 end
diff --git a/spec/support/user_sidebar_tags_mixin.rb b/spec/support/user_sidebar_tags_mixin.rb
new file mode 100644
index 0000000000..0b874c59e6
--- /dev/null
+++ b/spec/support/user_sidebar_tags_mixin.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "#display_sidebar_tags" do |serializer_klass|
+  fab!(:tag) { Fabricate(:tag) }
+  fab!(:user) { Fabricate(:user) }
+  let(:serializer) { serializer_klass.new(user, scope: Guardian.new(user), root: false) }
+
+  before do
+    SiteSetting.enable_experimental_sidebar_hamburger = true
+  end
+
+  it 'should not be included in serialised object when experimental hamburger and sidebar has been disabled' do
+    SiteSetting.tagging_enabled = true
+    SiteSetting.enable_experimental_sidebar_hamburger = false
+
+    expect(serializer.as_json[:display_sidebar_tags]).to eq(nil)
+  end
+
+  it 'should not be included in serialised object when tagging has been disabled' do
+    SiteSetting.tagging_enabled = false
+
+    expect(serializer.as_json[:display_sidebar_tags]).to eq(nil)
+  end
+
+  it 'should be true when user has visible tags' do
+    SiteSetting.tagging_enabled = true
+
+    Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])
+    user.update!(admin: true)
+
+    expect(serializer.as_json[:display_sidebar_tags]).to eq(true)
+  end
+
+  it 'should be false when user has no visible tags' do
+    SiteSetting.tagging_enabled = true
+
+    Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])
+
+    expect(serializer.as_json[:display_sidebar_tags]).to eq(false)
+  end
+end

From 8e80f4c2112b9b6c2ff86cef5e51e12d2f442b02 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 13 Oct 2022 09:18:39 +0800
Subject: [PATCH 142/332] UX: Conditionally hide sidebar categories section for
 user (#18557)

If a site has no default sidebar categories configured:
  * Show categories section if user has categories configured
  * Hide categories section if user does not have categories configured

If a site has default sidebar categories configured:
  * Always show categories section
---
 .../sidebar/user/categories-section.hbs       | 64 ++++++++++---------
 .../sidebar/user/categories-section.js        | 14 ++++
 .../sidebar-user-categories-section-test.js   | 26 +++++++-
 .../user-preferences-sidebar-test.js          | 27 +++++++-
 .../discourse/tests/helpers/site-settings.js  |  1 +
 5 files changed, 99 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 06470cf81e..4b09f94ee7 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -1,33 +1,35 @@
-<Sidebar::Section
-  @sectionName="categories"
-  @headerLinkText={{i18n "sidebar.sections.categories.header_link_text"}}
-  @headerActions={{array (hash action=this.editTracked title=(i18n "sidebar.sections.categories.header_action_title"))}}
-  @headerActionsIcon="pencil-alt"
-  @collapsable={{@collapsable}} >
+{{#if this.shouldDisplay}}
+  <Sidebar::Section
+    @sectionName="categories"
+    @headerLinkText={{i18n "sidebar.sections.categories.header_link_text"}}
+    @headerActions={{array (hash action=this.editTracked title=(i18n "sidebar.sections.categories.header_action_title"))}}
+    @headerActionsIcon="pencil-alt"
+    @collapsable={{@collapsable}} >
 
-  {{#if (gt this.sectionLinks.length 0)}}
-    {{#each this.sectionLinks as |sectionLink|}}
-      <Sidebar::SectionLink
-        @linkName={{sectionLink.name}}
-        @route={{sectionLink.route}}
-        @query={{sectionLink.query}}
-        @title={{sectionLink.title}}
-        @content={{sectionLink.text}}
-        @currentWhen={{sectionLink.currentWhen}}
-        @model={{sectionLink.model}}
-        @badgeText={{sectionLink.badgeText}}
-        @prefixBadge={{sectionLink.prefixBadge}}
-        @prefixType={{sectionLink.prefixType}}
-        @prefixValue={{sectionLink.prefixValue}}
-        @prefixColor={{sectionLink.prefixColor}}
-        @prefixElementColors={{sectionLink.prefixElementColors}} >
-      </Sidebar::SectionLink>
-    {{/each}}
-  {{else}}
-    <Sidebar::SectionMessage>
-      {{html-safe this.noCategoriesText}}
-    </Sidebar::SectionMessage>
-  {{/if}}
+    {{#if (gt this.sectionLinks.length 0)}}
+      {{#each this.sectionLinks as |sectionLink|}}
+        <Sidebar::SectionLink
+          @linkName={{sectionLink.name}}
+          @route={{sectionLink.route}}
+          @query={{sectionLink.query}}
+          @title={{sectionLink.title}}
+          @content={{sectionLink.text}}
+          @currentWhen={{sectionLink.currentWhen}}
+          @model={{sectionLink.model}}
+          @badgeText={{sectionLink.badgeText}}
+          @prefixBadge={{sectionLink.prefixBadge}}
+          @prefixType={{sectionLink.prefixType}}
+          @prefixValue={{sectionLink.prefixValue}}
+          @prefixColor={{sectionLink.prefixColor}}
+          @prefixElementColors={{sectionLink.prefixElementColors}} >
+        </Sidebar::SectionLink>
+      {{/each}}
+    {{else}}
+      <Sidebar::SectionMessage>
+        {{html-safe this.noCategoriesText}}
+      </Sidebar::SectionMessage>
+    {{/if}}
 
-  <Sidebar::Common::AllCategoriesSectionLink />
-</Sidebar::Section>
+    <Sidebar::Common::AllCategoriesSectionLink />
+  </Sidebar::Section>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
index 4e0d3c3e7c..a10320c114 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
@@ -42,6 +42,20 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
     )}</a>`;
   }
 
+  /**
+   * If a site has no default sidebar categories configured, show categories section if the user has categories configured.
+   * Otherwise, hide the categories section from the sidebar for the user.
+   *
+   * If a site has default sidebar categories configured, always show categories section for the user.
+   */
+  get shouldDisplay() {
+    if (this.siteSettings.default_sidebar_categories.length > 0) {
+      return true;
+    } else {
+      return this.categories.length > 0;
+    }
+  }
+
   @action
   editTracked() {
     this.router.transitionTo("preferences.sidebar", this.currentUser);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index d69611fec9..cdf51c82cb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -103,6 +103,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
   };
 
   test("clicking on section header link", async function (assert) {
+    setupUserSidebarCategories();
+
     await visit("/t/280");
     await click(".sidebar-section-categories .sidebar-section-header");
 
@@ -113,6 +115,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
   });
 
   test("clicking on section header button", async function (assert) {
+    setupUserSidebarCategories();
+
     await visit("/");
     await click(".sidebar-section-categories .sidebar-section-header-button");
 
@@ -123,9 +127,29 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
   });
 
-  test("category section links when user has not added any categories", async function (assert) {
+  test("categories section is hidden when user has not added any categories and there are no default categories configured", async function (assert) {
+    updateCurrentUser({ sidebar_category_ids: [] });
+
     await visit("/");
 
+    assert.notOk(
+      exists(".sidebar-section-categories"),
+      "categories section is not shown"
+    );
+  });
+
+  test("categories section is shown when user has not added any categories but default categories have been configured", async function (assert) {
+    updateCurrentUser({ sidebar_category_ids: [] });
+    const categories = Site.current().categories;
+    this.siteSettings.default_sidebar_categories = `${categories[0].id}|${categories[1].id}`;
+
+    await visit("/");
+
+    assert.ok(
+      exists(".sidebar-section-categories"),
+      "categories section is shown"
+    );
+
     assert.ok(
       exists(".sidebar-section-message"),
       "the no categories message is displayed"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
index 4637783240..619c28e0b8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
@@ -100,7 +100,32 @@ acceptance("User Preferences - Sidebar", function (needs) {
     );
   });
 
-  test("user adding categories to sidebar", async function (assert) {
+  test("user adding categories to sidebar when default sidebar categories have not been configured", async function (assert) {
+    await visit("/u/eviltrout/preferences/sidebar");
+
+    assert.notOk(exists(".sidebar-section-categories"));
+
+    const categorySelector = selectKit(".category-selector");
+    await categorySelector.expand();
+    await categorySelector.selectKitSelectRowByName("support");
+    await categorySelector.selectKitSelectRowByName("bug");
+
+    await click(".save-changes");
+
+    assert.ok(
+      exists(".sidebar-section-categories .sidebar-section-link-support"),
+      "support category has been added to sidebar"
+    );
+
+    assert.ok(
+      exists(".sidebar-section-categories .sidebar-section-link-bug"),
+      "bug category has been added to sidebar"
+    );
+  });
+
+  test("user adding categories to sidebar when default sidebar categories have been configured", async function (assert) {
+    this.siteSettings.default_sidebar_categories = "5";
+
     await visit("/");
     await click(".sidebar-section-categories .sidebar-section-header-button");
 
diff --git a/app/assets/javascripts/discourse/tests/helpers/site-settings.js b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
index 7909b030a2..6ddb88fec3 100644
--- a/app/assets/javascripts/discourse/tests/helpers/site-settings.js
+++ b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
@@ -101,6 +101,7 @@ const ORIGINAL_SETTINGS = {
   external_emoji_url: "",
   remove_muted_tags_from_latest: "always",
   enable_group_directory: true,
+  default_sidebar_categories: "",
 };
 
 let siteSettings = Object.assign({}, ORIGINAL_SETTINGS);

From 940eb0ce4db2936b1069e65898a053afad07e01a Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 13 Oct 2022 09:52:25 +0800
Subject: [PATCH 143/332] UX: Conditionally display sidebar tags section for
 user (#18558)

If a site has no default sidebar tags configured, show tags section if the user has personal sidebar tags configured.
Otherwise, hide the tags section from the sidebar for the user.

If a site has default sidebar tags configured, always display the tags section.
---
 .../components/sidebar/user/tags-section.hbs  | 56 ++++++++++---------
 .../components/sidebar/user/tags-section.js   | 15 +++++
 .../sidebar-user-tags-section-test.js         | 19 ++++++-
 .../user-preferences-sidebar-test.js          | 35 +++++++++---
 .../discourse/tests/helpers/site-settings.js  |  1 +
 5 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
index 3edfa60b72..248a672f79 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
@@ -1,29 +1,31 @@
-<Sidebar::Section
-  @sectionName="tags"
-  @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
-  @headerActions={{array (hash action=this.editTracked title=(i18n "sidebar.sections.tags.header_action_title"))}}
-  @headerActionsIcon="pencil-alt"
-  @collapsable={{@collapsable}}>
+{{#if this.shouldDisplay}}
+  <Sidebar::Section
+    @sectionName="tags"
+    @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
+    @headerActions={{array (hash action=this.editTracked title=(i18n "sidebar.sections.tags.header_action_title"))}}
+    @headerActionsIcon="pencil-alt"
+    @collapsable={{@collapsable}}>
 
-  {{#if (gt this.sectionLinks.length 0)}}
-    {{#each this.sectionLinks as |sectionLink|}}
-      <Sidebar::SectionLink
-        @linkName={{sectionLink.name}}
-        @route={{sectionLink.route}}
-        @title={{sectionLink.title}}
-        @content={{sectionLink.text}}
-        @currentWhen={{sectionLink.currentWhen}}
-        @prefixType={{sectionLink.prefixType}}
-        @prefixValue={{sectionLink.prefixValue}}
-        @badgeText={{sectionLink.badgeText}}
-        @models={{sectionLink.models}} >
-      </Sidebar::SectionLink>
-    {{/each}}
-  {{else}}
-    <Sidebar::SectionMessage>
-      {{html-safe this.noTagsText}}
-    </Sidebar::SectionMessage>
-  {{/if}}
+    {{#if (gt this.sectionLinks.length 0)}}
+      {{#each this.sectionLinks as |sectionLink|}}
+        <Sidebar::SectionLink
+          @linkName={{sectionLink.name}}
+          @route={{sectionLink.route}}
+          @title={{sectionLink.title}}
+          @content={{sectionLink.text}}
+          @currentWhen={{sectionLink.currentWhen}}
+          @prefixType={{sectionLink.prefixType}}
+          @prefixValue={{sectionLink.prefixValue}}
+          @badgeText={{sectionLink.badgeText}}
+          @models={{sectionLink.models}} >
+        </Sidebar::SectionLink>
+      {{/each}}
+    {{else}}
+      <Sidebar::SectionMessage>
+        {{html-safe this.noTagsText}}
+      </Sidebar::SectionMessage>
+    {{/if}}
 
-  <Sidebar::Common::AllTagsSectionLink />
-</Sidebar::Section>
+    <Sidebar::Common::AllTagsSectionLink />
+  </Sidebar::Section>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index 59649c991f..94e8a64b15 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -13,6 +13,7 @@ export default class SidebarUserTagsSection extends Component {
   @service topicTrackingState;
   @service pmTopicTrackingState;
   @service currentUser;
+  @service siteSettings;
 
   constructor() {
     super(...arguments);
@@ -63,6 +64,20 @@ export default class SidebarUserTagsSection extends Component {
     )}</a>`;
   }
 
+  /**
+   * If a site has no default sidebar tags configured, show tags section if the user has personal sidebar tags configured.
+   * Otherwise, hide the tags section from the sidebar for the user.
+   *
+   * If a site has default sidebar tags configured, always display the tags section.
+   */
+  get shouldDisplay() {
+    if (this.siteSettings.default_sidebar_tags.length > 0) {
+      return true;
+    } else {
+      return this.currentUser.sidebarTags.length > 0;
+    }
+  }
+
   @action
   editTracked() {
     this.router.transitionTo("preferences.sidebar", this.currentUser);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index cdd7e790d9..707b11f80a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -113,13 +113,30 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
   });
 
-  test("section content when user has not added any tags", async function (assert) {
+  test("tags section is hidden when user has not added any tags and there are no default tags configured", async function (assert) {
     updateCurrentUser({
       sidebar_tags: [],
     });
 
     await visit("/");
 
+    assert.notOk(
+      exists(".sidebar-section-tags"),
+      "tags section is not displayed"
+    );
+  });
+
+  test("tags section is shown when user has not added any tags but default tags have been configured", async function (assert) {
+    updateCurrentUser({
+      sidebar_tags: [],
+    });
+
+    this.siteSettings.default_sidebar_tags = "tag1|tag2";
+
+    await visit("/");
+
+    assert.ok(exists(".sidebar-section-tags"), "tags section is shown");
+
     assert.strictEqual(
       query(
         ".sidebar-section-tags .sidebar-section-message"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
index 619c28e0b8..023a119a26 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
@@ -52,14 +52,6 @@ acceptance("User Preferences - Sidebar", function (needs) {
     });
   });
 
-  test("user should not see tag chooser when display_sidebar_tags property is false", async function (assert) {
-    updateCurrentUser({ display_sidebar_tags: false });
-
-    await visit("/u/eviltrout/preferences/sidebar");
-
-    assert.ok(!exists(".tag-chooser"), "tag chooser is not displayed");
-  });
-
   test("user encountering error when adding categories to sidebar", async function (assert) {
     updateCurrentUser({ sidebar_category_ids: [6] });
 
@@ -193,7 +185,32 @@ acceptance("User Preferences - Sidebar", function (needs) {
     );
   });
 
-  test("user adding tags to sidebar", async function (assert) {
+  test("user should not see tag chooser when display_sidebar_tags property is false", async function (assert) {
+    updateCurrentUser({ display_sidebar_tags: false });
+
+    await visit("/u/eviltrout/preferences/sidebar");
+
+    assert.ok(!exists(".tag-chooser"), "tag chooser is not displayed");
+  });
+
+  test("user adding tags to sidebar when default tags have not been configured", async function (assert) {
+    await visit("/u/eviltrout/preferences/sidebar");
+
+    const tagChooser = selectKit(".tag-chooser");
+    await tagChooser.expand();
+    await tagChooser.selectKitSelectRowByName("monkey");
+
+    await click(".save-changes");
+
+    assert.ok(
+      exists(".sidebar-section-tags .sidebar-section-link-monkey"),
+      "monkey tag has been added to sidebar"
+    );
+  });
+
+  test("user adding tags to sidebar when default tags have been configured", async function (assert) {
+    this.siteSettings.default_sidebar_tags = "tag1|tag2";
+
     await visit("/");
     await click(".sidebar-section-tags .sidebar-section-header-button");
 
diff --git a/app/assets/javascripts/discourse/tests/helpers/site-settings.js b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
index 6ddb88fec3..f822ec1365 100644
--- a/app/assets/javascripts/discourse/tests/helpers/site-settings.js
+++ b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
@@ -102,6 +102,7 @@ const ORIGINAL_SETTINGS = {
   remove_muted_tags_from_latest: "always",
   enable_group_directory: true,
   default_sidebar_categories: "",
+  default_sidebar_tags: "",
 };
 
 let siteSettings = Object.assign({}, ORIGINAL_SETTINGS);

From 7e94fa86d77636f5268fae23fb87d2996c3ea378 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 13 Oct 2022 17:00:20 +0800
Subject: [PATCH 144/332] FIX: Category sidebar link not active when filtered
 by none and all (#18578)

---
 .../category-section-link.js                  |  2 +-
 .../sidebar-user-categories-section-test.js   | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 8af34cdb3f..4cdd34bc94 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -37,7 +37,7 @@ export default class CategorySectionLink {
   }
 
   get currentWhen() {
-    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory discovery.category";
+    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory discovery.category discovery.categoryNone discovery.categoryAll";
   }
 
   get title() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index cdf51c82cb..96656d8cf1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -78,6 +78,12 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       });
     });
 
+    server.get(`/c/:categorySlug/:categoryId/none/l/latest.json`, () => {
+      return helper.response(
+        cloneJSON(discoveryFixture["/c/bug/1/l/latest.json"])
+      );
+    });
+
     server.get("/c/:categorySlug/:categoryId/find_by_slug.json", () => {
       return helper.response(cloneJSON(categoryFixture["/c/1/show.json"]));
     });
@@ -355,6 +361,40 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
   });
 
+  test("visiting category discovery no subcategoriees route", async function (assert) {
+    const { category1 } = setupUserSidebarCategories();
+
+    await visit(`/c/${category1.slug}/${category1.id}/none`);
+
+    assert.strictEqual(
+      count(".sidebar-section-categories .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-${category1.slug}.active`),
+      "the category1 section link is marked as active for the none route"
+    );
+  });
+
+  test("visiting category discovery includes all subcategories route", async function (assert) {
+    const { category1 } = setupUserSidebarCategories();
+
+    await visit(`/c/${category1.slug}/${category1.id}/all`);
+
+    assert.strictEqual(
+      count(".sidebar-section-categories .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-${category1.slug}.active`),
+      "the category1 section link is marked as active for the all route"
+    );
+  });
+
   test("new and unread count for categories link", async function (assert) {
     const { category1, category2 } = setupUserSidebarCategories();
 

From c16cb0e00b35fa6d09539276d36f2b2c6eda7d70 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 13 Oct 2022 17:00:46 +0800
Subject: [PATCH 145/332] FIX: Missing category badge for category with color
 stored as 3-digit hex code (#18579)

On the server side, the only limitation for `Category#color` is a length
limit of 6. Therefore, we cannot assume on the client side that the hex
code is always 6 digits.
---
 .../app/components/sidebar/section-link.js         |  4 +++-
 .../sidebar-user-categories-section-test.js        | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index e472e99ac7..8dd0574aa9 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -53,11 +53,13 @@ export default class SectionLink extends Component {
 
   get prefixElementColors() {
     const prefixElementColors = this.args.prefixElementColors.filter((color) =>
-      color?.match(/^\w{6}$/)
+      color?.slice(0, 6)
     );
+
     if (prefixElementColors.length === 1) {
       prefixElementColors.push(prefixElementColors[0]);
     }
+
     return prefixElementColors.map((color) => `#${color} 50%`).join(", ");
   }
 }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 96656d8cf1..20a402d535 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -291,6 +291,20 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
   });
 
+  test("category section link for category with 3-digit hex code for color", async function (assert) {
+    const { category1 } = setupUserSidebarCategories();
+    category1.set("color", "888");
+
+    await visit("/");
+
+    assert.ok(
+      exists(
+        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #888 50%, #888 50%)"]`
+      ),
+      "category1 section link is rendered with the right solid prefix icon color"
+    );
+  });
+
   test("category section link have the right title", async function (assert) {
     const categories = Site.current().categories;
 

From beaf009b4a3144cf7acfa2f58d1bb8cb372d1059 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 13 Oct 2022 19:10:18 +1000
Subject: [PATCH 146/332] FIX: action_code_path not being loaded for
 user-stream-item (#18577)

This commit fixes an issue where we had a typo in the
UserAction.stream query which meant that action_code_path
was not loaded correctly. Once that was fixed, we were also
not actually using the action_code_path in the user-stream-item,
so that has been fixed here too.

The bug this caused was that, when the link for the action was
clicked within the user-stream-item, the user would be redirected
to a URL ending with `[missing%20%%7Bpath%7D%20value]` because
the I18n call did not have the path present.
---
 .../discourse/app/components/user-stream-item.js   |  3 ++-
 .../discourse/app/widgets/post-small-action.js     | 14 ++++++++++++--
 app/models/user_action.rb                          |  2 +-
 spec/models/user_action_spec.rb                    |  2 ++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-stream-item.js b/app/assets/javascripts/discourse/app/components/user-stream-item.js
index 1928eedae6..d64fa25ca9 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream-item.js
+++ b/app/assets/javascripts/discourse/app/components/user-stream-item.js
@@ -28,7 +28,8 @@ export default Component.extend({
   actionDescription: actionDescription(
     "item.action_code",
     "item.created_at",
-    "item.action_code_who"
+    "item.action_code_who",
+    "item.action_code_path"
   ),
 
   @discourseComputed("item.draft_username", "item.username")
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index eaed373535..e13857f331 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -26,11 +26,21 @@ export function actionDescriptionHtml(actionCode, createdAt, username, path) {
   return htmlSafe(I18n.t(`action_codes.${actionCode}`, { who, when, path }));
 }
 
-export function actionDescription(actionCode, createdAt, username) {
+export function actionDescription(
+  actionCode,
+  createdAt,
+  username,
+  path = null
+) {
   return computed(actionCode, createdAt, function () {
     const ac = this.get(actionCode);
     if (ac) {
-      return actionDescriptionHtml(ac, this.get(createdAt), this.get(username));
+      return actionDescriptionHtml(
+        ac,
+        this.get(createdAt),
+        this.get(username),
+        path ? this.get(path) : null
+      );
     }
   });
 }
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 4f13a970a9..25eabac3ff 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -232,7 +232,7 @@ class UserAction < ActiveRecord::Base
       JOIN users au on au.id = a.user_id
       LEFT JOIN categories c on c.id = t.category_id
       LEFT JOIN post_custom_fields pc ON pc.post_id = a.target_post_id AND pc.name = 'action_code_who'
-      LEFT JOIN post_custom_fields pc2 ON pc2.post_id = a.target_post_id AND pc.name = 'action_code_path'
+      LEFT JOIN post_custom_fields pc2 ON pc2.post_id = a.target_post_id AND pc2.name = 'action_code_path'
       /*where*/
       /*order_by*/
       /*offset*/
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index d47309c01a..17a95f01e0 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -122,6 +122,7 @@ RSpec.describe UserAction do
         log_test_action(action_type: UserAction::ASSIGNED)
         private_post.custom_fields ||= {}
         private_post.custom_fields["action_code_who"] = 'testing'
+        private_post.custom_fields["action_code_path"] = '/p/1234'
         private_post.custom_fields["random_field"] = 'random_value'
         private_post.save!
       end
@@ -133,6 +134,7 @@ RSpec.describe UserAction do
 
         expect(user_action_row.action_type).to eq(UserAction::ASSIGNED)
         expect(user_action_row.action_code_who).to eq('testing')
+        expect(user_action_row.action_code_path).to eq('/p/1234')
       end
     end
 

From 4b2cc2de1e4abeb9db20e7c8620ff21e52e66d0f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 13 Oct 2022 14:24:41 +0300
Subject: [PATCH 147/332] FIX: Show timelines dates as clickable (#18580)

These two dates used to have the default cursor when hovering. This
commit removes the 'cursor: default' CSS property.
---
 app/assets/stylesheets/common/topic-timeline.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index b2c510e1b4..fb707e5abf 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -212,7 +212,6 @@
     }
 
     .start-date {
-      @include unselectable;
       color: var(--primary-med-or-secondary-med);
     }
 
@@ -296,7 +295,6 @@
     }
 
     .now-date {
-      @include unselectable;
       display: inline-block;
       color: var(--primary-med-or-secondary-med);
       margin-top: 0.5em;

From 45f93ae75da59593c341d29394ed1e8842df4ea1 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 13 Oct 2022 08:39:52 -0500
Subject: [PATCH 148/332] UX: Onboarding edits (#18581)

* UX: Adjust size of svg arrow

* UX: Refactor & style edits
---
 .../javascripts/discourse/app/lib/popup.js    |  1 +
 .../stylesheets/common/base/_index.scss       |  1 +
 .../stylesheets/common/base/d-onboarding.scss | 37 +++++++++++++++++++
 .../stylesheets/common/base/d-popover.scss    |  1 +
 .../stylesheets/common/base/discourse.scss    | 19 ----------
 5 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 app/assets/stylesheets/common/base/d-onboarding.scss

diff --git a/app/assets/javascripts/discourse/app/lib/popup.js b/app/assets/javascripts/discourse/app/lib/popup.js
index f098f75e81..bbd110309e 100644
--- a/app/assets/javascripts/discourse/app/lib/popup.js
+++ b/app/assets/javascripts/discourse/app/lib/popup.js
@@ -23,6 +23,7 @@ export function showPopup(options) {
     showOnCreate: true,
     hideOnClick: false,
     trigger: "manual",
+    theme: "d-onboarding",
 
     // It must be interactive to make buttons work.
     interactive: true,
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
index 0af5ac8581..163ec74b3c 100644
--- a/app/assets/stylesheets/common/base/_index.scss
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -12,6 +12,7 @@
 @import "crawler_layout";
 @import "d-icon";
 @import "d-popover";
+@import "d-onboarding";
 @import "dialog";
 @import "directory";
 @import "discourse";
diff --git a/app/assets/stylesheets/common/base/d-onboarding.scss b/app/assets/stylesheets/common/base/d-onboarding.scss
new file mode 100644
index 0000000000..f7f795d9d7
--- /dev/null
+++ b/app/assets/stylesheets/common/base/d-onboarding.scss
@@ -0,0 +1,37 @@
+.onboarding-popup-container {
+  min-width: 300px;
+  padding: 0.5em;
+  text-align: left;
+
+  .onboarding-popup-title {
+    font-size: $font-up-2;
+    font-weight: bold;
+  }
+
+  .onboarding-popup-content {
+    margin-top: 0.25em;
+  }
+
+  .onboarding-popup-buttons {
+    margin-top: 1em;
+  }
+}
+
+.tippy-box[data-theme~="d-onboarding"][data-placement^="left"]
+  > .tippy-svg-arrow
+  > svg {
+  left: 11px;
+}
+
+.tippy-box[data-theme~="d-onboarding"][data-placement^="bottom"]
+  > .tippy-svg-arrow
+  > svg {
+  top: -13px;
+  left: -1px;
+}
+
+.tippy-box[data-theme~="d-onboarding"] > .tippy-svg-arrow:after,
+.tippy-box[data-theme~="d-onboarding"] > .tippy-svg-arrow > svg {
+  width: 18px;
+  height: 18px;
+}
diff --git a/app/assets/stylesheets/common/base/d-popover.scss b/app/assets/stylesheets/common/base/d-popover.scss
index 7c4547c2ec..588aa1d2fc 100644
--- a/app/assets/stylesheets/common/base/d-popover.scss
+++ b/app/assets/stylesheets/common/base/d-popover.scss
@@ -14,6 +14,7 @@ $d-popover-border: var(--primary-low);
 .tippy-box[data-placement^="bottom"] .tippy-svg-arrow > svg {
   top: -10px;
 }
+
 .tippy-rounded-arrow {
   fill: $d-popover-background;
   .svg-arrow {
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 9a52a296a8..fe579fe9f0 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -570,25 +570,6 @@ table {
   animation-name: ping;
 }
 
-.onboarding-popup-container {
-  min-width: 300px;
-  padding: 0.5em;
-  text-align: left;
-
-  .onboarding-popup-title {
-    font-size: $font-up-2;
-    font-weight: bold;
-  }
-
-  .onboarding-popup-content {
-    margin-top: 0.25em;
-  }
-
-  .onboarding-popup-buttons {
-    margin-top: 1em;
-  }
-}
-
 .fade {
   opacity: 0;
   transition: opacity 0.15s linear;

From e0a6d12c551ceae36e7d3d94f6a8dba0cf1d14d2 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 13 Oct 2022 16:04:42 +0100
Subject: [PATCH 149/332] Use service account credentials for fetching google
 hd groups (#18329)

The previous implementation would attempt to fetch groups using the end-user's Google auth token. This only worked for admin accounts, or users with 'delegated' access to the `admin.directory.group.readonly` API.

This commit changes the approach to use a single 'service account' for fetching the groups. This removes the need to add permissions to all regular user accounts. I'll be updating the [meta docs](https://meta.discourse.org/t/226850) with instructions on setting up the service account.

This is technically a breaking change in behavior, but the existing implementation was marked experimental, and is currently unusable in production google workspace environments.
---
 config/locales/server.en.yml                  |   6 +-
 config/site_settings.yml                      |   5 +
 lib/auth.rb                                   |   1 -
 lib/auth/google_oauth2_authenticator.rb       |  97 ++++++++++++--
 .../discourse_google_oauth2.rb                |  45 -------
 .../google_oauth2_hd_groups_validator.rb      |   2 +-
 .../auth/google_oauth2_authenticator_spec.rb  |  72 +++++++++-
 .../discourse_google_oauth2_spec.rb           | 124 ------------------
 spec/models/associated_group_spec.rb          |   2 +
 .../omniauth_callbacks_controller_spec.rb     |  41 ++++--
 10 files changed, 196 insertions(+), 199 deletions(-)
 delete mode 100644 lib/auth/omniauth_strategies/discourse_google_oauth2.rb
 delete mode 100644 spec/lib/auth/omniauth_strategies/discourse_google_oauth2_spec.rb

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a3af49bfd1..da54a8fc6d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1732,7 +1732,9 @@ en:
     google_oauth2_client_secret: "Client secret of your Google application."
     google_oauth2_prompt: "An optional space-delimited list of string values that specifies whether the authorization server prompts the user for reauthentication and consent. See <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> for the possible values."
     google_oauth2_hd: "An optional Google Apps Hosted domain that the sign-in will be limited to. See <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> for more details."
-    google_oauth2_hd_groups: "(experimental) Retrieve users' Google groups on the hosted domain on authentication. Retrieved Google groups can be used to grant automatic Discourse group membership (see group settings)."
+    google_oauth2_hd_groups: "(experimental) Retrieve users' Google groups on the hosted domain on authentication. Retrieved Google groups can be used to grant automatic Discourse group membership (see group settings). For more information see https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "An email address belonging to a Google Workspace administrator account. Will be used with the service account credentials to fetch group information."
+    google_oauth2_hd_groups_service_account_json: "JSON formatted key information for the Service Account. Will be used to fetch group information."
 
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret. See <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
     twitter_consumer_key: "Consumer key for Twitter authentication, registered at <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2427,7 +2429,7 @@ en:
       unicode_usernames_avatars: "The internal system avatars do not support Unicode usernames."
       list_value_count: "The list must contain exactly %{count} values."
       markdown_linkify_tlds: "You cannot include a value of '*'."
-      google_oauth2_hd_groups: "You must first set 'google oauth2 hd' before enabling this setting."
+      google_oauth2_hd_groups: "You must configure all 'google oauth2 hd' settings before enabling this setting."
       search_tokenize_chinese_enabled: "You must disable 'search_tokenize_chinese' before enabling this setting."
       search_tokenize_japanese_enabled: "You must disable 'search_tokenize_japanese' before enabling this setting."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "You cannot enable DiscourseConnect if 2FA is enforced."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 43100b93b6..7d6f03510c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -429,6 +429,11 @@ login:
   google_oauth2_hd_groups:
     default: false
     validator: GoogleOauth2HdGroupsValidator
+  google_oauth2_hd_groups_service_account_admin_email:
+    default: ""
+  google_oauth2_hd_groups_service_account_json:
+    default: ""
+    textarea: true
   enable_twitter_logins:
     default: false
   twitter_consumer_key:
diff --git a/lib/auth.rb b/lib/auth.rb
index 21e2716250..f501d90157 100644
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -6,7 +6,6 @@ require 'auth/auth_provider'
 require 'auth/result'
 require 'auth/authenticator'
 require 'auth/managed_authenticator'
-require 'auth/omniauth_strategies/discourse_google_oauth2'
 require 'auth/facebook_authenticator'
 require 'auth/github_authenticator'
 require 'auth/twitter_authenticator'
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index 02e015cd10..ba35b1fecd 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 class Auth::GoogleOAuth2Authenticator < Auth::ManagedAuthenticator
+  GROUPS_SCOPE ||= "https://www.googleapis.com/auth/admin.directory.group.readonly"
+  GROUPS_DOMAIN ||= "admin.googleapis.com"
+  GROUPS_PATH ||= "/admin/directory/v1/groups"
+  OAUTH2_BASE_URL ||= "https://oauth2.googleapis.com"
+
   def name
     "google_oauth2"
   end
@@ -16,7 +21,6 @@ class Auth::GoogleOAuth2Authenticator < Auth::ManagedAuthenticator
   end
 
   def register_middleware(omniauth)
-    strategy_class = Auth::OmniAuthStrategies::DiscourseGoogleOauth2
     options = {
       setup: lambda { |env|
         strategy = env["omniauth.strategy"]
@@ -36,25 +40,96 @@ class Auth::GoogleOAuth2Authenticator < Auth::ManagedAuthenticator
         # the JWT can fail due to clock skew, so let's skip it completely.
         # https://github.com/zquestz/omniauth-google-oauth2/pull/392
         strategy.options[:skip_jwt] = true
-        strategy.options[:request_groups] = provides_groups?
-
-        if provides_groups?
-          strategy.options[:scope] = "#{strategy_class::DEFAULT_SCOPE},#{strategy_class::GROUPS_SCOPE}"
-        end
       }
     }
-    omniauth.provider strategy_class, options
+    omniauth.provider :google_oauth2, options
   end
 
   def after_authenticate(auth_token, existing_account: nil)
-    result = super
-    if provides_groups? && (groups = auth_token[:extra][:raw_groups])
-      result.associated_groups = groups.map { |group| group.slice(:id, :name) }
+    groups = provides_groups? ? raw_groups(auth_token.uid) : nil
+    if groups
+      auth_token.extra[:raw_groups] = groups
     end
+
+    result = super
+
+    if groups
+      result.associated_groups = groups.map { |group| group.with_indifferent_access.slice(:id, :name) }
+    end
+
     result
   end
 
   def provides_groups?
-    SiteSetting.google_oauth2_hd.present? && SiteSetting.google_oauth2_hd_groups
+    SiteSetting.google_oauth2_hd.present? &&
+      SiteSetting.google_oauth2_hd_groups &&
+      SiteSetting.google_oauth2_hd_groups_service_account_admin_email.present? &&
+      SiteSetting.google_oauth2_hd_groups_service_account_json.present?
+  end
+
+  private
+
+  def raw_groups(uid)
+    groups = []
+    page_token = nil
+    groups_url = "https://#{GROUPS_DOMAIN}#{GROUPS_PATH}"
+    client = build_service_account_client
+    return if client.nil?
+
+    loop do
+      params = {
+        userKey: uid
+      }
+      params[:pageToken] = page_token if page_token
+
+      response = client.get(groups_url, params: params, raise_errors: false)
+
+      if response.status == 200
+        response = response.parsed
+        groups.push(*response['groups'])
+        page_token = response['nextPageToken']
+        break if page_token.nil?
+      else
+        Rails.logger.error("[Discourse Google OAuth2] failed to retrieve groups for #{uid} - status #{response.status}")
+        break
+      end
+    end
+
+    groups
+  end
+
+  def build_service_account_client
+    service_account_info = JSON.parse(SiteSetting.google_oauth2_hd_groups_service_account_json)
+
+    payload = {
+      iss: service_account_info["client_email"],
+      aud: "#{OAUTH2_BASE_URL}/token",
+      scope: GROUPS_SCOPE,
+      iat: Time.now.to_i,
+      exp: Time.now.to_i + 60,
+      sub: SiteSetting.google_oauth2_hd_groups_service_account_admin_email
+    }
+    headers = { "alg" => "RS256", "typ" => "JWT" }
+    key = OpenSSL::PKey::RSA.new(service_account_info["private_key"])
+
+    encoded_jwt = ::JWT.encode(payload, key, 'RS256', headers)
+
+    client = OAuth2::Client.new(
+      SiteSetting.google_oauth2_client_id,
+      SiteSetting.google_oauth2_client_secret,
+      site: OAUTH2_BASE_URL
+    )
+
+    token_response = client.request(:post, '/token', body: {
+      grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
+      assertion: encoded_jwt
+    },  raise_errors: false)
+
+    if token_response.status != 200
+      Rails.logger.error("[Discourse Google OAuth2] failed to retrieve group fetch token - status #{token_response.status}")
+      return
+    end
+
+    OAuth2::AccessToken.from_hash(client, token_response.parsed)
   end
 end
diff --git a/lib/auth/omniauth_strategies/discourse_google_oauth2.rb b/lib/auth/omniauth_strategies/discourse_google_oauth2.rb
deleted file mode 100644
index 326e26d81b..0000000000
--- a/lib/auth/omniauth_strategies/discourse_google_oauth2.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class Auth::OmniAuthStrategies
-  class DiscourseGoogleOauth2 < OmniAuth::Strategies::GoogleOauth2
-    GROUPS_SCOPE ||= "admin.directory.group.readonly"
-    GROUPS_DOMAIN ||= "admin.googleapis.com"
-    GROUPS_PATH ||= "/admin/directory/v1/groups"
-
-    def extra
-      hash = {}
-      hash[:raw_info] = raw_info
-      hash[:raw_groups] = raw_groups if options[:request_groups]
-      hash
-    end
-
-    def raw_groups
-      @raw_groups ||= begin
-        groups = []
-        page_token = nil
-        groups_url = "https://#{GROUPS_DOMAIN}#{GROUPS_PATH}"
-
-        loop do
-          params = {
-            userKey: uid
-          }
-          params[:pageToken] = page_token if page_token
-
-          response = access_token.get(groups_url, params: params, raise_errors: false)
-
-          if response.status == 200
-            response = response.parsed
-            groups.push(*response['groups'])
-            page_token = response['nextPageToken']
-            break if page_token.nil?
-          else
-            Rails.logger.error("[Discourse Google OAuth2] failed to retrieve groups for #{uid} - status #{response.status}")
-            break
-          end
-        end
-
-        groups
-      end
-    end
-  end
-end
diff --git a/lib/validators/google_oauth2_hd_groups_validator.rb b/lib/validators/google_oauth2_hd_groups_validator.rb
index b4c3f91431..39acf6b9bf 100644
--- a/lib/validators/google_oauth2_hd_groups_validator.rb
+++ b/lib/validators/google_oauth2_hd_groups_validator.rb
@@ -6,7 +6,7 @@ class GoogleOauth2HdGroupsValidator
   end
 
   def valid_value?(value)
-    @valid = value == "f" || SiteSetting.google_oauth2_hd.present?
+    @valid = value == "f" || (SiteSetting.google_oauth2_hd.present? && SiteSetting.google_oauth2_hd_groups_service_account_admin_email.present? && SiteSetting.google_oauth2_hd_groups_service_account_json.present?)
   end
 
   def error_message
diff --git a/spec/lib/auth/google_oauth2_authenticator_spec.rb b/spec/lib/auth/google_oauth2_authenticator_spec.rb
index 661ef1f25c..f610763ed3 100644
--- a/spec/lib/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/lib/auth/google_oauth2_authenticator_spec.rb
@@ -117,7 +117,7 @@ RSpec.describe Auth::GoogleOAuth2Authenticator do
         group1 = OmniAuth::AuthHash.new(id: "12345", name: "group1")
         group2 = OmniAuth::AuthHash.new(id: "67890", name: "group2")
         @groups = [group1, group2]
-        @groups_hash = OmniAuth::AuthHash.new(
+        @auth_hash = OmniAuth::AuthHash.new(
           provider: "google_oauth2",
           uid: "123456789",
           info: {
@@ -132,26 +132,86 @@ RSpec.describe Auth::GoogleOAuth2Authenticator do
               email_verified: true,
               name: "Jane Doe"
             },
-            raw_groups: @groups
           }
         )
       end
 
       context "when enabled" do
+        let(:private_key) { OpenSSL::PKey::RSA.generate(2048) }
+
+        let(:group_response) {
+          {
+            groups: [
+              {
+                id: "12345",
+                name: "group1"
+              },
+              {
+                id: "67890",
+                name: "group2"
+              }
+            ]
+          }
+        }
+
         before do
+          SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "admin@example.com"
+          SiteSetting.google_oauth2_hd_groups_service_account_json = {
+            "private_key" => private_key.to_s,
+            "client_email": "discourse-group-sync@example.iam.gserviceaccount.com",
+          }.to_json
           SiteSetting.google_oauth2_hd_groups = true
+
+          token = "abcde"
+
+          stub_request(:post, "https://oauth2.googleapis.com/token").to_return do |request|
+            jwt = Rack::Utils.parse_query(request.body)["assertion"]
+            decoded_token = JWT.decode(jwt, private_key.public_key, true, { algorithm: 'RS256' })
+            {
+              status: 200,
+              body: { "access_token" => token, "type" => "bearer" }.to_json,
+              headers: { "Content-Type" => "application/json" }
+            }
+          rescue JWT::VerificationError
+            {
+              status: 403,
+              body: "Invalid JWT"
+            }
+          end
+
+          stub_request(:get, "https://admin.googleapis.com/admin/directory/v1/groups?userKey=#{@auth_hash.uid}").
+            with(headers: { "Authorization" => "Bearer #{token}" }).
+            to_return do
+              {
+                status: 200,
+                body: group_response.to_json,
+                headers: {
+                  "Content-Type" => "application/json"
+                }
+              }
+            end
         end
 
         it "adds associated groups" do
-          result = described_class.new.after_authenticate(@groups_hash)
+          result = described_class.new.after_authenticate(@auth_hash)
           expect(result.associated_groups).to eq(@groups)
         end
 
         it "handles a blank groups array" do
-          @groups_hash[:extra][:raw_groups] = []
-          result = described_class.new.after_authenticate(@groups_hash)
+          group_response[:groups] = []
+          result = described_class.new.after_authenticate(@auth_hash)
           expect(result.associated_groups).to eq([])
         end
+
+        it "doesn't explode with invalid credentials" do
+          SiteSetting.google_oauth2_hd_groups_service_account_json = {
+            "private_key" => OpenSSL::PKey::RSA.generate(2048).to_s,
+            "client_email": "discourse-group-sync@example.iam.gserviceaccount.com",
+          }.to_json
+
+          result = described_class.new.after_authenticate(@auth_hash)
+          expect(result.associated_groups).to eq(nil)
+        end
       end
 
       context "when disabled" do
@@ -160,7 +220,7 @@ RSpec.describe Auth::GoogleOAuth2Authenticator do
         end
 
         it "doesnt add associated groups" do
-          result = described_class.new.after_authenticate(@groups_hash)
+          result = described_class.new.after_authenticate(@auth_hash)
           expect(result.associated_groups).to eq(nil)
         end
       end
diff --git a/spec/lib/auth/omniauth_strategies/discourse_google_oauth2_spec.rb b/spec/lib/auth/omniauth_strategies/discourse_google_oauth2_spec.rb
deleted file mode 100644
index 37229ecae4..0000000000
--- a/spec/lib/auth/omniauth_strategies/discourse_google_oauth2_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Auth::OmniAuthStrategies::DiscourseGoogleOauth2 do
-  let(:response_hash) do
-    {
-      email: 'user@domain.com',
-      email_verified: true
-    }
-  end
-  let(:groups) do
-    [
-      {
-        id: "12345",
-        name: "group1"
-      },
-      {
-        id: "67890",
-        name: "group2"
-      }
-    ]
-  end
-  let(:uid) { "12345" }
-  let(:domain) { "domain.com" }
-
-  def build_response(body, code = 200)
-    [code, { 'Content-Type' => 'application/json' }, body.to_json]
-  end
-
-  def build_client(groups_response)
-    OAuth2::Client.new('abc', 'def') do |builder|
-      builder.request :url_encoded
-      builder.adapter :test do |stub|
-        stub.get('/oauth2/v3/userinfo') { build_response(response_hash) }
-        stub.get(described_class::GROUPS_PATH) { groups_response }
-      end
-    end
-  end
-
-  let(:successful_groups_client) do
-    build_client(
-      build_response(
-        groups: groups
-      )
-    )
-  end
-
-  let(:unsuccessful_groups_client) do
-    build_client(
-      build_response(
-        error: {
-          code: 403,
-          message: "Not Authorized to access this resource/api"
-        }
-      )
-    )
-  end
-
-  let(:successful_groups_token) do
-    OAuth2::AccessToken.from_hash(successful_groups_client, {})
-  end
-
-  let(:unsuccessful_groups_token) do
-    OAuth2::AccessToken.from_hash(unsuccessful_groups_client, {})
-  end
-
-  def app
-    lambda do |_env|
-      [200, {}, ["Hello."]]
-    end
-  end
-
-  def build_strategy(access_token)
-    strategy = described_class.new(app, 'appid', 'secret', @options)
-    strategy.stubs(:uid).returns(uid)
-    strategy.stubs(:access_token).returns(access_token)
-    strategy
-  end
-
-  before do
-    @options = {}
-    OmniAuth.config.test_mode = true
-  end
-
-  after do
-    OmniAuth.config.test_mode = false
-  end
-
-  context 'when request_groups is true' do
-    before do
-      @options[:request_groups] = true
-    end
-
-    context 'when groups request successful' do
-      before do
-        @strategy = build_strategy(successful_groups_token)
-      end
-
-      it 'should include users groups' do
-        expect(@strategy.extra[:raw_groups].map(&:symbolize_keys)).to eq(groups)
-      end
-    end
-
-    context 'when groups request unsuccessful' do
-      before do
-        @strategy = build_strategy(unsuccessful_groups_token)
-      end
-
-      it 'users groups should be empty' do
-        expect(@strategy.extra[:raw_groups].empty?).to eq(true)
-      end
-    end
-  end
-
-  context 'when request_groups is not true' do
-    before do
-      @options[:request_groups] = false
-      @strategy = build_strategy(successful_groups_token)
-    end
-
-    it 'should not include users groups' do
-      expect(@strategy.extra).not_to have_key(:raw_groups)
-    end
-  end
-end
diff --git a/spec/models/associated_group_spec.rb b/spec/models/associated_group_spec.rb
index 55f0ec6cb5..916927504a 100644
--- a/spec/models/associated_group_spec.rb
+++ b/spec/models/associated_group_spec.rb
@@ -14,6 +14,8 @@ RSpec.describe AssociatedGroup do
     SiteSetting.enable_google_oauth2_logins = true
     SiteSetting.google_oauth2_hd = 'domain.com'
     SiteSetting.google_oauth2_hd_groups = false
+    SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "test@example.com"
+    SiteSetting.google_oauth2_hd_groups_service_account_json = "{}"
     expect(described_class.has_provider?).to eq(false)
 
     SiteSetting.google_oauth2_hd_groups = true
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 441fc5c8cc..1bf1e9a9aa 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -786,9 +786,7 @@ RSpec.describe Users::OmniauthCallbacksController do
       end
 
       context "when groups are enabled" do
-        let(:strategy_class) { Auth::OmniAuthStrategies::DiscourseGoogleOauth2 }
-        let(:groups_url) { "#{strategy_class::GROUPS_DOMAIN}#{strategy_class::GROUPS_PATH}" }
-        let(:groups_scope) { strategy_class::DEFAULT_SCOPE + strategy_class::GROUPS_SCOPE }
+        let(:private_key) { OpenSSL::PKey::RSA.generate(2048) }
         let(:group1) { { id: "12345", name: "group1" } }
         let(:group2) { { id: "67890", name: "group2" } }
         let(:uid) { "12345" }
@@ -796,22 +794,50 @@ RSpec.describe Users::OmniauthCallbacksController do
         let(:domain) { "mydomain.com" }
 
         def mock_omniauth_for_groups(groups)
-          raw_groups = groups.map { |group| OmniAuth::AuthHash.new(group) }
           mock_auth = OmniAuth.config.mock_auth[:google_oauth2]
-          mock_auth[:extra][:raw_groups] = raw_groups
           OmniAuth.config.mock_auth[:google_oauth2] = mock_auth
           Rails.application.env_config["omniauth.auth"] = mock_auth
+
+          SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "admin@example.com"
+          SiteSetting.google_oauth2_hd_groups_service_account_json = {
+            "private_key" => private_key.to_s,
+            "client_email": "discourse-group-sync@example.iam.gserviceaccount.com",
+          }.to_json
+          SiteSetting.google_oauth2_hd_groups = true
+
+          stub_request(:post, "https://oauth2.googleapis.com/token").to_return do |request|
+            jwt = Rack::Utils.parse_query(request.body)["assertion"]
+            decoded_token = JWT.decode(jwt, private_key.public_key, true, { algorithm: 'RS256' })
+            {
+              status: 200,
+              body: { "access_token" => token, "type" => "bearer" }.to_json,
+              headers: { "Content-Type" => "application/json" }
+            }
+          end
+
+          stub_request(:get, "https://admin.googleapis.com/admin/directory/v1/groups?userKey=#{mock_auth.uid}").
+            with(headers: { "Authorization" => "Bearer #{token}" }).
+            to_return do
+              {
+                status: 200,
+                body: { groups: groups }.to_json,
+                headers: {
+                  "Content-Type" => "application/json"
+                }
+              }
+            end
         end
 
         before do
           SiteSetting.google_oauth2_hd = domain
+          SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "test@example.com"
+          SiteSetting.google_oauth2_hd_groups_service_account_json = "{}"
           SiteSetting.google_oauth2_hd_groups = true
         end
 
         it "updates associated groups" do
           mock_omniauth_for_groups([group1, group2])
           get "/auth/google_oauth2/callback.json", params: {
-            scope: groups_scope.split(' '),
             code: 'abcde',
             hd: domain
           }
@@ -829,7 +855,6 @@ RSpec.describe Users::OmniauthCallbacksController do
 
           mock_omniauth_for_groups([group1])
           get "/auth/google_oauth2/callback.json", params: {
-            scope: groups_scope.split(' '),
             code: 'abcde',
             hd: domain
           }
@@ -842,7 +867,6 @@ RSpec.describe Users::OmniauthCallbacksController do
 
           mock_omniauth_for_groups([])
           get "/auth/google_oauth2/callback.json", params: {
-            scope: groups_scope.split(' '),
             code: 'abcde',
             hd: domain
           }
@@ -858,7 +882,6 @@ RSpec.describe Users::OmniauthCallbacksController do
           mock_omniauth_for_groups([])
 
           get "/auth/google_oauth2/callback.json", params: {
-            scope: groups_scope.split(' '),
             code: 'abcde',
             hd: domain
           }

From 74a6a868d2456aa300e1cbe6ff5bb3ecd4b3234f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 13 Oct 2022 16:15:45 -0400
Subject: [PATCH 150/332] A11Y: Fix tab order in "Feature topic" modal (#18576)

Tab order acts strangely in Chrome when the last focusable element in a
modal is a radio group: it switches focus to the address bar. This is a
problem, because for keyboard users, it becomes very hard to return to
the previous context.

This PR adds a focusable "Cancel" button, whose mere presence fixes the
issue.
---
 .../discourse/app/templates/components/choose-topic.hbs         | 2 +-
 .../discourse/app/templates/modal/feature-topic-on-profile.hbs  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
index c27eec45a4..76753b8b44 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
@@ -13,7 +13,7 @@
   {{#if this.noResults}}
     <p>{{i18n "choose_topic.none_found"}}</p>
   {{else}}
-    <div class="choose-topic-list">
+    <div class="choose-topic-list" role="radiogroup">
       {{#each this.topics as |t|}}
         <div class="controls existing-topic">
           <label class="radio">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
index 2652b139c8..698250e790 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
@@ -4,4 +4,5 @@
 
 <div class="modal-footer">
   <DButton @action={{action "save"}} @class="btn-primary save-featured-topic-on-profile" @disabled={{this.noTopicSelected}} @label="user.feature_topic_on_profile.save" />
+  <DButton @action={{route-action "closeModal" }} @label="cancel" @class="btn-flat" />
 </div>

From c81763dcd8a9f536aa77281bc32e147a69674c70 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 13 Oct 2022 16:16:05 -0400
Subject: [PATCH 151/332] A11Y: Make input popup errors keyboard-accessible
 (#18570)

Also sets focus to the nearest input when popups are dismissed.
---
 .../app/components/popup-input-tip.js         | 17 ++++++++++++++--
 .../tests/acceptance/composer-test.js         | 20 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
index 1bd8b266be..e92c143e9a 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.js
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
@@ -5,13 +5,15 @@ import { getOwner } from "discourse-common/lib/get-owner";
 import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
+  tagName: "a",
   classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
-  attributeBindings: ["role", "ariaLabel"],
+  attributeBindings: ["role", "ariaLabel", "tabindex"],
   rerenderTriggers: ["validation.reason"],
   tipReason: null,
   lastShownAt: or("shownAt", "validation.lastShownAt"),
   bad: reads("validation.failed"),
   good: not("bad"),
+  tabindex: "0",
 
   @discourseComputed("bad")
   role(bad) {
@@ -25,10 +27,21 @@ export default Component.extend({
     return reason?.replace(/(<([^>]+)>)/gi, "");
   },
 
-  click() {
+  dismiss() {
     this.set("shownAt", null);
     const composer = getOwner(this).lookup("controller:composer");
     composer.clearLastValidatedAt();
+    this.element.previousElementSibling?.focus();
+  },
+
+  click() {
+    this.dismiss();
+  },
+
+  keyDown(event) {
+    if (event.key === "Enter") {
+      this.dismiss();
+    }
   },
 
   didReceiveAttrs() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 061c086c74..fe74e72aa7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -4,6 +4,7 @@ import {
   fillIn,
   settled,
   triggerEvent,
+  triggerKeyEvent,
   visit,
 } from "@ember/test-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
@@ -176,16 +177,29 @@ acceptance("Composer", function (needs) {
 
     await click("#reply-control button.create");
     assert.ok(
-      !exists(".title-input .popup-tip.bad.hide"),
+      exists(".title-input .popup-tip.bad"),
       "it shows the empty title error"
     );
     assert.ok(
-      !exists(".d-editor-wrapper .popup-tip.bad.hide"),
+      exists(".d-editor-textarea-wrapper .popup-tip.bad"),
       "it shows the empty body error"
     );
 
     await fillIn("#reply-title", "this is my new topic title");
-    assert.ok(exists(".title-input .popup-tip.good"), "the title is now good");
+    assert.ok(
+      exists(".title-input .popup-tip.good.hide"),
+      "the title is now good"
+    );
+
+    await triggerKeyEvent(
+      ".d-editor-textarea-wrapper .popup-tip.bad",
+      "keydown",
+      "Enter"
+    );
+    assert.ok(
+      exists(".d-editor-textarea-wrapper .popup-tip.bad.hide"),
+      "body error is dismissed via keyboard"
+    );
 
     await fillIn(".d-editor-input", "this is the *content* of a post");
     assert.strictEqual(

From 78044ad2aaa78a7b6903d2416f7838d223bfaeb2 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 13 Oct 2022 16:16:22 -0400
Subject: [PATCH 152/332] A11Y: Trap focus on auth security modal (#18573)

---
 app/assets/javascripts/discourse/app/controllers/auth-token.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
index 52ddce5f4d..3e089cbaf4 100644
--- a/app/assets/javascripts/discourse/app/controllers/auth-token.js
+++ b/app/assets/javascripts/discourse/app/controllers/auth-token.js
@@ -14,6 +14,8 @@ export default Controller.extend(ModalFunctionality, {
     ).then((posts) => {
       if (posts.length > 0) {
         this.set("latest_post", posts[0]);
+        // slightly hacky, but default d-modal focus gets reset
+        document.querySelector(".d-modal .modal-close")?.focus();
       }
     });
   },

From d1d0241d8bebf042a59c47d031f7f7189155cfa2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:25:44 +0200
Subject: [PATCH 153/332] Build(deps): Bump stackprof from 0.2.21 to 0.2.22
 (#18589)

Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.21 to 0.2.22.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.21...v0.2.22)

---
updated-dependencies:
- dependency-name: stackprof
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index dfcf2b8f3b..6a78e19886 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -469,7 +469,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sshkey (2.0.0)
-    stackprof (0.2.21)
+    stackprof (0.2.22)
     test-prof (1.0.10)
     thor (1.2.1)
     tilt (2.0.11)

From 92bfea2f2ba994001679f2b943a38b1af09005eb Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Fri, 14 Oct 2022 03:26:21 +0200
Subject: [PATCH 154/332] UX: hide keyboard shortcuts on mobile (#18575)

---
 .../discourse/app/components/sidebar/footer.hbs      | 12 +++++++-----
 .../tests/acceptance/sidebar-mobile-test.js          | 10 ++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
index 1f7aae7831..59c181b360 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
@@ -9,11 +9,13 @@
           @class="sidebar-footer-actions-button sidebar-footer-actions-toggle-mobile-view" />
       {{/if}}
 
-      <DButton
-        @action={{route-action "showKeyboardShortcutsHelp"}}
-        @title="keyboard_shortcuts_help.title"
-        @icon="keyboard"
-        @class="sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts" />
+      {{#if this.site.desktopView}}
+        <DButton
+          @action={{route-action "showKeyboardShortcutsHelp"}}
+          @title="keyboard_shortcuts_help.title"
+          @icon="keyboard"
+          @class="sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts" />
+      {{/if}}
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js
index 64bfe6c65e..3241278e81 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js
@@ -74,4 +74,14 @@ acceptance("Sidebar - Mobile - User with sidebar enabled", function (needs) {
       "displays the desktop icon for the button"
     );
   });
+
+  test("keyboard shortcuts button is hidden", async function (assert) {
+    await visit("/");
+    await click(".hamburger-dropdown");
+
+    assert.notOk(
+      exists(".sidebar-footer-actions-keyboard-shortcuts"),
+      "keyboard shortcuts button is not shown on mobile"
+    );
+  });
 });

From 7718ef97cc8a87589f2246d9f1ec139a3a53682e Mon Sep 17 00:00:00 2001
From: Jean <jmperez127@gmail.com>
Date: Thu, 13 Oct 2022 22:32:48 -0400
Subject: [PATCH 155/332] DEV: add plugin connectors to the admin user lists
 table (#18590)

---
 .../javascripts/admin/addon/templates/users-list-show.hbs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index 970f9e9b90..c56b8a0862 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -25,6 +25,8 @@
         <TableHeaderToggle @field="posts_read" @labelKey="admin.user.posts_read_count" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
         <TableHeaderToggle @field="read_time" @labelKey="admin.user.time_read" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
         <TableHeaderToggle @field="created" @labelKey="created" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <PluginOutlet @name="admin-users-list-thead-after" @args={{hash order=this.order asc=this.asc}} />
+
         {{#if this.siteSettings.must_approve_users}}
           <th>{{i18n "admin.users.approved"}}</th>
         {{/if}}
@@ -80,6 +82,8 @@
               <div>{{format-duration user.created_at_age}}</div>
             </td>
 
+            <PluginOutlet @name="admin-users-list-td-after" @args={{hash user=user query=this.query}} />
+
             {{#if this.siteSettings.must_approve_users}}
               <td>{{i18n-yes-no user.approved}}</td>
             {{/if}}

From 2c5e8f17635fd4e6d280a3dc794335711e19970e Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 14 Oct 2022 12:44:31 +0200
Subject: [PATCH 156/332] DEV: Asyncify loadTopicView (#18585)

See https://github.com/discourse/discourse/pull/14838#issuecomment-1271935405 for details about `controllerReady` logic.

Co-authored-by: David Taylor <david@taylorhq.com>
---
 app/assets/javascripts/discourse/app/models/topic.js | 12 ++++++------
 .../discourse/app/routes/topic-from-params.js        |  1 +
 app/assets/javascripts/discourse/app/routes/topic.js |  1 +
 .../javascripts/discourse/app/templates/topic.hbs    |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 1776e9f5d1..5b2c1e5a1b 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -24,7 +24,7 @@ import DiscourseURL, { userPath } from "discourse/lib/url";
 import deprecated from "discourse-common/lib/deprecated";
 import { applyModelTransformations } from "discourse/lib/model-transformers";
 
-export function loadTopicView(topic, args) {
+export async function loadTopicView(topic, args) {
   const data = deepMerge({}, args);
   const url = `${getURL("/t/")}${topic.id}`;
   const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
@@ -33,12 +33,12 @@ export function loadTopicView(topic, args) {
   delete data.__type;
   delete data.store;
 
-  return PreloadStore.getAndRemove(`topic_${topic.id}`, () =>
+  const json = await PreloadStore.getAndRemove(`topic_${topic.id}`, () =>
     ajax(jsonUrl, { data })
-  ).then((json) => {
-    topic.updateFromJson(json);
-    return json;
-  });
+  );
+
+  topic.updateFromJson(json);
+  return json;
 }
 
 export const ID_CONSTRAINT = /^\d+$/;
diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
index 5875089d6d..0dc639f03b 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -80,6 +80,7 @@ export default DiscourseRoute.extend({
       enteredAt: Date.now().toString(),
       userLastReadPostNumber: topic.last_read_post_number,
       highestPostNumber: topic.highest_post_number,
+      controllerReady: true,
     });
 
     this.appEvents.trigger("page:topic-loaded", topic);
diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
index 6764143a01..615b353e4e 100644
--- a/app/assets/javascripts/discourse/app/routes/topic.js
+++ b/app/assets/javascripts/discourse/app/routes/topic.js
@@ -23,6 +23,7 @@ const TopicRoute = DiscourseRoute.extend({
       isTransitioning: false,
       scheduledReplace: null,
       lastScrollPos: null,
+      controllerReady: true,
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 85186edfe2..05a64c9d1e 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -13,7 +13,7 @@
 
   <PluginOutlet @name="topic-above-post-stream" @tagName="span" @connectorTagName="div" @args={{hash model=this.model editFirstPost=(action "editFirstPost")}} />
 
-  {{#if this.model.postStream.loaded}}
+  {{#if (and this.controllerReady this.model.postStream.loaded)}}
     {{#if this.model.postStream.firstPostPresent}}
       <TopicTitle @cancelled={{action "cancelEditingTopic"}} @save={{action "finishedEditingTopic"}} @model={{this.model}}>
         {{#if this.editingTopic}}

From a5156d18ffea01e2e55c474502a340439199aaab Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 14 Oct 2022 13:15:58 +0200
Subject: [PATCH 157/332] DEV: Modernize controller unit tests (#17412)

Aligns controller tests with the Ember standard, by using `module` and `setupTest` instead of our custom `discourseModule`)
---
 .../admin-customize-themes-show-test.js       |  28 +-
 .../admin-customize-themes-test.js            |  21 +-
 .../controllers/admin-user-badges-test.js     |  15 +-
 .../unit/controllers/avatar-selector-test.js  |  22 +-
 .../unit/controllers/create-account-test.js   |  23 +-
 .../tests/unit/controllers/history-test.js    |  34 +-
 .../controllers/preferences-account-test.js   |  31 +-
 .../controllers/preferences-profile-test.js   |  28 +-
 .../preferences-second-factor-test.js         |  22 +-
 .../controllers/reorder-categories-test.js    |  69 +--
 .../tests/unit/controllers/topic-test.js      | 438 +++++++-----------
 .../controllers/user-notifications-test.js    |  41 +-
 .../controllers/poll-ui-builder-test.js       |  35 +-
 13 files changed, 352 insertions(+), 455 deletions(-)
 rename plugins/poll/test/javascripts/{ => unit}/controllers/poll-ui-builder-test.js (95%)

diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
index d3a311787c..8de26d6885 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
@@ -1,8 +1,10 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import Theme from "admin/models/theme";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 
-discourseModule("Unit | Controller | admin-customize-themes-show", function () {
+module("Unit | Controller | admin-customize-themes-show", function (hooks) {
+  setupTest(hooks);
+
   test("can display source url for remote themes", function (assert) {
     const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
     const remoteTheme = Theme.create({
@@ -13,12 +15,14 @@ discourseModule("Unit | Controller | admin-customize-themes-show", function () {
         remote_url: repoUrl,
       },
     });
-    const controller = this.getController("admin-customize-themes-show", {
-      model: remoteTheme,
-    });
+
+    const controller = this.owner.lookup(
+      "controller:admin-customize-themes-show"
+    );
+    controller.setProperties({ model: remoteTheme });
 
     assert.deepEqual(
-      controller.get("remoteThemeLink"),
+      controller.remoteThemeLink,
       repoUrl,
       "returns theme's repo URL"
     );
@@ -34,12 +38,14 @@ discourseModule("Unit | Controller | admin-customize-themes-show", function () {
         branch: "beta",
       },
     });
-    const controller = this.getController("admin-customize-themes-show", {
-      model: remoteTheme,
-    });
+
+    const controller = this.owner.lookup(
+      "controller:admin-customize-themes-show"
+    );
+    controller.setProperties({ model: remoteTheme });
 
     assert.deepEqual(
-      controller.get("remoteThemeLink"),
+      controller.remoteThemeLink,
       "https://github.com/discourse/discourse-brand-header/tree/beta",
       "returns theme's repo URL to branch"
     );
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js
index bdd9136f09..c7fb02385e 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js
@@ -1,8 +1,10 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import Theme from "admin/models/theme";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 
-discourseModule("Unit | Controller | admin-customize-themes", function () {
+module("Unit | Controller | admin-customize-themes", function (hooks) {
+  setupTest(hooks);
+
   test("can list themes correctly", function (assert) {
     const defaultTheme = Theme.create({
       id: 2,
@@ -22,7 +24,8 @@ discourseModule("Unit | Controller | admin-customize-themes", function () {
       component: true,
     });
 
-    const controller = this.getController("admin-customize-themes", {
+    const controller = this.owner.lookup("controller:admin-customize-themes");
+    controller.setProperties({
       model: [
         strayTheme2,
         strayTheme1,
@@ -33,16 +36,14 @@ discourseModule("Unit | Controller | admin-customize-themes", function () {
     });
 
     assert.deepEqual(
-      controller.get("fullThemes").map((t) => t.get("name")),
-      [strayTheme2, strayTheme1, userTheme, defaultTheme].map((t) =>
-        t.get("name")
-      ),
+      controller.fullThemes.map((t) => t.name),
+      [strayTheme2, strayTheme1, userTheme, defaultTheme].map((t) => t.name),
       "returns a list of themes without components"
     );
 
     assert.deepEqual(
-      controller.get("childThemes").map((t) => t.get("name")),
-      [componentTheme].map((t) => t.get("name")),
+      controller.childThemes.map((t) => t.name),
+      [componentTheme].map((t) => t.name),
       "separate components from themes"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js
index 439079f0f5..6f0e5acfcc 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js
@@ -1,8 +1,10 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import Badge from "discourse/models/badge";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 
-discourseModule("Unit | Controller | admin-user-badges", function () {
+module("Unit | Controller | admin-user-badges", function (hooks) {
+  setupTest(hooks);
+
   test("grantableBadges", function (assert) {
     const badgeFirst = Badge.create({
       id: 3,
@@ -35,7 +37,8 @@ discourseModule("Unit | Controller | admin-user-badges", function () {
       manually_grantable: false,
     });
 
-    const controller = this.getController("admin-user-badges", {
+    const controller = this.owner.lookup("controller:admin-user-badges");
+    controller.setProperties({
       model: [],
       badges: [
         badgeLast,
@@ -47,9 +50,7 @@ discourseModule("Unit | Controller | admin-user-badges", function () {
     });
 
     const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
-    const badgeNames = controller.get("grantableBadges").map(function (badge) {
-      return badge.name;
-    });
+    const badgeNames = controller.grantableBadges.map((badge) => badge.name);
 
     assert.notOk(
       badgeNames.includes(badgeDisabled),
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
index 5fccc71c59..b4f35f4697 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
@@ -1,12 +1,9 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import EmberObject from "@ember/object";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { registerRouter } from "discourse/mapping-router";
-import { test } from "qunit";
 
-discourseModule("Unit | Controller | avatar-selector", function (hooks) {
-  hooks.beforeEach(function () {
-    registerRouter(this.registry);
-  });
+module("Unit | Controller | avatar-selector", function (hooks) {
+  setupTest(hooks);
 
   test("avatarTemplate", function (assert) {
     const user = EmberObject.create({
@@ -18,27 +15,26 @@ discourseModule("Unit | Controller | avatar-selector", function (hooks) {
       gravatar_avatar_upload_id: 2,
       custom_avatar_upload_id: 3,
     });
-    const avatarSelectorController = this.getController("avatar-selector", {
-      user,
-    });
+    const controller = this.owner.lookup("controller:avatar-selector");
+    controller.setProperties({ user });
 
     user.set("avatar_template", "system");
     assert.strictEqual(
-      avatarSelectorController.get("selectedUploadId"),
+      controller.selectedUploadId,
       1,
       "we are using system by default"
     );
 
     user.set("avatar_template", "gravatar");
     assert.strictEqual(
-      avatarSelectorController.get("selectedUploadId"),
+      controller.selectedUploadId,
       2,
       "we are using gravatar when set"
     );
 
     user.set("avatar_template", "avatar");
     assert.strictEqual(
-      avatarSelectorController.get("selectedUploadId"),
+      controller.selectedUploadId,
       3,
       "we are using custom when set"
     );
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
index 83a1ccd86e..16fb852d77 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
@@ -1,12 +1,14 @@
-import I18n from "I18n";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import { settled } from "@ember/test-helpers";
+import I18n from "I18n";
+
+module("Unit | Controller | create-account", function (hooks) {
+  setupTest(hooks);
 
-discourseModule("Unit | Controller | create-account", function () {
   test("basicUsernameValidation", function (assert) {
     const testInvalidUsername = (username, expectedReason) => {
-      const controller = this.getController("create-account");
+      const controller = this.owner.lookup("controller:create-account");
       controller.set("accountUsername", username);
 
       let validation = controller.basicUsernameValidation(username);
@@ -25,7 +27,8 @@ discourseModule("Unit | Controller | create-account", function () {
       I18n.t("user.username.too_long")
     );
 
-    const controller = this.getController("create-account", {
+    const controller = this.owner.lookup("controller:create-account");
+    controller.setProperties({
       accountUsername: "porkchops",
       prefilledUsername: "porkchops",
     });
@@ -40,7 +43,7 @@ discourseModule("Unit | Controller | create-account", function () {
   });
 
   test("passwordValidation", async function (assert) {
-    const controller = this.getController("create-account");
+    const controller = this.owner.lookup("controller:create-account");
 
     controller.set("authProvider", "");
     controller.set("accountEmail", "pork@chops.com");
@@ -65,12 +68,12 @@ discourseModule("Unit | Controller | create-account", function () {
       assert.strictEqual(
         controller.passwordValidation.failed,
         true,
-        "password should be invalid: " + password
+        `password should be invalid: ${password}`
       );
       assert.strictEqual(
         controller.passwordValidation.reason,
         expectedReason,
-        "password validation reason: " + password + ", " + expectedReason
+        `password validation reason: ${password}, ${expectedReason}`
       );
     };
 
@@ -87,7 +90,7 @@ discourseModule("Unit | Controller | create-account", function () {
   });
 
   test("authProviderDisplayName", function (assert) {
-    const controller = this.getController("create-account");
+    const controller = this.owner.lookup("controller:create-account");
 
     assert.strictEqual(
       controller.authProviderDisplayName("facebook"),
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
index e82b084c83..cb3670e43d 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
@@ -1,40 +1,42 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+
+module("Unit | Controller | history", function (hooks) {
+  setupTest(hooks);
 
-discourseModule("Unit | Controller | history", function () {
   test("displayEdit", async function (assert) {
-    const HistoryController = this.getController("history");
+    const controller = this.owner.lookup("controller:history");
 
-    HistoryController.setProperties({
+    controller.setProperties({
       model: { last_revision: 3, current_revision: 3, can_edit: false },
       topicController: {},
     });
 
     assert.strictEqual(
-      HistoryController.get("displayEdit"),
+      controller.displayEdit,
       false,
       "it should not display edit button when user cannot edit the post"
     );
 
-    HistoryController.set("model.can_edit", true);
+    controller.set("model.can_edit", true);
 
     assert.strictEqual(
-      HistoryController.get("displayEdit"),
+      controller.displayEdit,
       true,
       "it should display edit button when user can edit the post"
     );
 
-    HistoryController.set("topicController", null);
+    controller.set("topicController", null);
     assert.strictEqual(
-      HistoryController.get("displayEdit"),
+      controller.displayEdit,
       false,
       "it should not display edit button when there is not topic controller"
     );
-    HistoryController.set("topicController", {});
+    controller.set("topicController", {});
 
-    HistoryController.set("model.current_revision", 2);
+    controller.set("model.current_revision", 2);
     assert.strictEqual(
-      HistoryController.get("displayEdit"),
+      controller.displayEdit,
       false,
       "it should only display the edit button on the latest revision"
     );
@@ -97,7 +99,7 @@ discourseModule("Unit | Controller | history", function () {
     </tbody>
   </table>`;
 
-    HistoryController.setProperties({
+    controller.setProperties({
       viewMode: "side_by_side",
       model: {
         body_changes: {
@@ -106,9 +108,9 @@ discourseModule("Unit | Controller | history", function () {
       },
     });
 
-    await HistoryController.bodyDiffChanged();
+    await controller.bodyDiffChanged();
 
-    const output = HistoryController.get("bodyDiff");
+    const output = controller.bodyDiff;
     assert.strictEqual(
       output,
       expectedOutput,
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
index c9598f238a..cb5394df13 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
@@ -1,12 +1,18 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+
+module("Unit | Controller | preferences/account", function (hooks) {
+  setupTest(hooks);
 
-discourseModule("Unit | Controller | preferences/account", function () {
   test("updating of associated accounts", function (assert) {
-    const controller = this.getController("preferences/account", {
-      siteSettings: {
-        enable_google_oauth2_logins: true,
-      },
+    const siteSettings = this.owner.lookup("service:site-settings");
+    siteSettings.enable_google_oauth2_logins = true;
+
+    const site = this.owner.lookup("service:site");
+    site.set("isMobileDevice", false);
+
+    const controller = this.owner.lookup("controller:preferences/account");
+    controller.setProperties({
       model: {
         id: 70,
         second_factor_enabled: true,
@@ -15,20 +21,17 @@ discourseModule("Unit | Controller | preferences/account", function () {
       currentUser: {
         id: 1234,
       },
-      site: {
-        isMobileDevice: false,
-      },
     });
 
-    assert.strictEqual(controller.get("canUpdateAssociatedAccounts"), false);
+    assert.strictEqual(controller.canUpdateAssociatedAccounts, false);
 
     controller.set("model.second_factor_enabled", false);
-    assert.strictEqual(controller.get("canUpdateAssociatedAccounts"), false);
+    assert.strictEqual(controller.canUpdateAssociatedAccounts, false);
 
     controller.set("model.is_anonymous", false);
-    assert.strictEqual(controller.get("canUpdateAssociatedAccounts"), false);
+    assert.strictEqual(controller.canUpdateAssociatedAccounts, false);
 
     controller.set("model.id", 1234);
-    assert.strictEqual(controller.get("canUpdateAssociatedAccounts"), true);
+    assert.strictEqual(controller.canUpdateAssociatedAccounts, true);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-profile-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-profile-test.js
index ff1caaca0c..95f7e33dd2 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-profile-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-profile-test.js
@@ -1,11 +1,20 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import User from "discourse/models/user";
-import Site from "discourse/models/site";
 
-discourseModule("Unit | Controller | preferences/profile", function () {
+module("Unit | Controller | preferences/profile", function (hooks) {
+  setupTest(hooks);
+
   test("prepare custom field data", function (assert) {
-    const controller = this.getController("preferences/profile", {
+    const site = this.owner.lookup("service:site");
+    site.set("user_fields", [
+      { position: 1, id: 1, editable: true },
+      { position: 2, id: 2, editable: true },
+      { position: 3, id: 3, editable: true },
+    ]);
+
+    const controller = this.owner.lookup("controller:preferences/profile");
+    controller.setProperties({
       model: User.create({
         id: 70,
         second_factor_enabled: true,
@@ -21,15 +30,6 @@ discourseModule("Unit | Controller | preferences/profile", function () {
       },
     });
 
-    Site.currentProp("user_fields", [
-      { position: 1, id: 1, editable: true },
-      { position: 2, id: 2, editable: true },
-      { position: 3, id: 3, editable: true },
-    ]);
-
-    // Since there are no injections in unit tests
-    controller.set("site", Site.current());
-
     controller.send("_updateUserFields");
 
     const fields = controller.model.user_fields;
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
index 604c59dbb8..87ad94119d 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
@@ -1,13 +1,17 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+
+module("Unit | Controller | preferences/second-factor", function (hooks) {
+  setupTest(hooks);
 
-discourseModule("Unit | Controller | preferences/second-factor", function () {
   test("displayOAuthWarning when OAuth login methods are enabled", function (assert) {
-    const controller = this.getController("preferences/second-factor", {
-      siteSettings: {
-        enable_google_oauth2_logins: true,
-      },
-    });
-    assert.strictEqual(controller.get("displayOAuthWarning"), true);
+    const siteSettings = this.owner.lookup("service:site-settings");
+    siteSettings.enable_google_oauth2_logins = true;
+
+    const controller = this.owner.lookup(
+      "controller:preferences/second-factor"
+    );
+
+    assert.strictEqual(controller.displayOAuthWarning, true);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
index d88ee256a9..2ff3fd18ca 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
@@ -1,27 +1,30 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import createStore from "discourse/tests/helpers/create-store";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 
-discourseModule("Unit | Controller | reorder-categories", function () {
+module("Unit | Controller | reorder-categories", function (hooks) {
+  setupTest(hooks);
+
   test("reorder set unique position number", function (assert) {
+    const controller = this.owner.lookup("controller:reorder-categories");
     const store = createStore();
 
-    const categories = [];
-    for (let i = 0; i < 3; ++i) {
-      categories.push(store.createRecord("category", { id: i, position: 0 }));
-    }
+    const site = this.owner.lookup("service:site");
+    site.set("categories", [
+      store.createRecord("category", { id: 1, position: 0 }),
+      store.createRecord("category", { id: 2, position: 0 }),
+      store.createRecord("category", { id: 3, position: 0 }),
+    ]);
 
-    const controller = this.getController("reorder-categories", {
-      site: { categories },
-    });
     controller.reorder();
 
-    controller.get("categoriesOrdered").forEach((category, index) => {
+    controller.categoriesOrdered.forEach((category, index) => {
       assert.strictEqual(category.get("position"), index);
     });
   });
 
   test("reorder places subcategories after their parent categories, while maintaining the relative order", function (assert) {
+    const controller = this.owner.lookup("controller:reorder-categories");
     const store = createStore();
 
     const parent = store.createRecord("category", {
@@ -48,18 +51,19 @@ discourseModule("Unit | Controller | reorder-categories", function () {
     });
 
     const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
-    const controller = this.getController("reorder-categories", {
-      site: { categories: [child2, parent, other, child1] },
-    });
+    const site = this.owner.lookup("service:site");
+    site.set("categories", [child2, parent, other, child1]);
+
     controller.reorder();
 
     assert.deepEqual(
-      controller.get("categoriesOrdered").mapBy("slug"),
+      controller.categoriesOrdered.mapBy("slug"),
       expectedOrderSlugs
     );
   });
 
   test("changing the position number of a category should place it at given position", function (assert) {
+    const controller = this.owner.lookup("controller:reorder-categories");
     const store = createStore();
 
     const elem1 = store.createRecord("category", {
@@ -80,14 +84,13 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const controller = this.getController("reorder-categories", {
-      site: { categories: [elem1, elem2, elem3] },
-    });
+    const site = this.owner.lookup("service:site");
+    site.set("categories", [elem1, elem2, elem3]);
 
     // Move category 'foo' from position 0 to position 2
     controller.send("change", elem1, { target: { value: "2" } });
 
-    assert.deepEqual(controller.get("categoriesOrdered").mapBy("slug"), [
+    assert.deepEqual(controller.categoriesOrdered.mapBy("slug"), [
       "bar",
       "test",
       "foo",
@@ -95,6 +98,7 @@ discourseModule("Unit | Controller | reorder-categories", function () {
   });
 
   test("changing the position number of a category should place it at given position and respect children", function (assert) {
+    const controller = this.owner.lookup("controller:reorder-categories");
     const store = createStore();
 
     const elem1 = store.createRecord("category", {
@@ -106,7 +110,7 @@ discourseModule("Unit | Controller | reorder-categories", function () {
     const child1 = store.createRecord("category", {
       id: 4,
       position: 1,
-      slug: "foochild",
+      slug: "foo-child",
       parent_category_id: 1,
     });
 
@@ -122,34 +126,34 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const controller = this.getController("reorder-categories", {
-      site: { categories: [elem1, child1, elem2, elem3] },
-    });
+    const site = this.owner.lookup("service:site");
+    site.set("categories", [elem1, child1, elem2, elem3]);
 
     controller.send("change", elem1, { target: { value: 3 } });
 
-    assert.deepEqual(controller.get("categoriesOrdered").mapBy("slug"), [
+    assert.deepEqual(controller.categoriesOrdered.mapBy("slug"), [
       "bar",
       "test",
       "foo",
-      "foochild",
+      "foo-child",
     ]);
   });
 
   test("changing the position through click on arrow of a category should place it at given position and respect children", function (assert) {
+    const controller = this.owner.lookup("controller:reorder-categories");
     const store = createStore();
 
     const child2 = store.createRecord("category", {
       id: 105,
       position: 2,
-      slug: "foochildchild",
+      slug: "foo-child-child",
       parent_category_id: 104,
     });
 
     const child1 = store.createRecord("category", {
       id: 104,
       position: 1,
-      slug: "foochild",
+      slug: "foo-child",
       parent_category_id: 101,
       subcategories: [child2],
     });
@@ -173,19 +177,18 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const controller = this.getController("reorder-categories", {
-      site: { categories: [elem1, child1, child2, elem2, elem3] },
-    });
+    const site = this.owner.lookup("service:site");
+    site.set("categories", [elem1, child1, child2, elem2, elem3]);
 
     controller.reorder();
 
     controller.send("moveDown", elem1);
 
-    assert.deepEqual(controller.get("categoriesOrdered").mapBy("slug"), [
+    assert.deepEqual(controller.categoriesOrdered.mapBy("slug"), [
       "bar",
       "foo",
-      "foochild",
-      "foochildchild",
+      "foo-child",
+      "foo-child-child",
       "test",
     ]);
   });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
index 9dcfcf0242..803f6586e8 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
@@ -1,66 +1,50 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+import { settled } from "@ember/test-helpers";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import EmberObject from "@ember/object";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import { next } from "@ember/runloop";
-import pretender, { response } from "discourse/tests/helpers/create-pretender";
-import { settled } from "@ember/test-helpers";
-import { test } from "qunit";
 
 function topicWithStream(streamDetails) {
   let topic = Topic.create();
-  topic.get("postStream").setProperties(streamDetails);
+  topic.postStream.setProperties(streamDetails);
   return topic;
 }
 
-discourseModule("Unit | Controller | topic", function (hooks) {
-  hooks.beforeEach(function () {
-    this.registry.injection("controller", "appEvents", "service:app-events");
-  });
-
-  hooks.afterEach(function () {
-    this.registry.unregister("service:current-user");
-    let topic = this.container.lookup("controller:topic");
-    topic.setProperties({
-      selectedPostIds: [],
-      selectedPostUsername: null,
-    });
-  });
+module("Unit | Controller | topic", function (hooks) {
+  setupTest(hooks);
 
   test("editTopic", function (assert) {
+    const controller = this.owner.lookup("controller:topic");
     const model = Topic.create();
-    const controller = this.getController("topic", { model });
-    assert.notOk(
-      controller.get("editingTopic"),
-      "we are not editing by default"
-    );
+    controller.setProperties({ model });
+    assert.notOk(controller.editingTopic, "we are not editing by default");
 
     controller.set("model.details.can_edit", false);
-    controller.send("editTopic");
+    controller.editTopic();
 
     assert.notOk(
-      controller.get("editingTopic"),
+      controller.editingTopic,
       "calling editTopic doesn't enable editing unless the user can edit"
     );
 
     controller.set("model.details.can_edit", true);
-    controller.send("editTopic");
+    controller.editTopic();
 
     assert.ok(
-      controller.get("editingTopic"),
+      controller.editingTopic,
       "calling editTopic enables editing if the user can edit"
     );
-    assert.strictEqual(controller.get("buffered.title"), model.get("title"));
-    assert.strictEqual(
-      controller.get("buffered.category_id"),
-      model.get("category_id")
-    );
+    assert.strictEqual(controller.buffered.title, model.title);
+    assert.strictEqual(controller.buffered.category_id, model.category_id);
 
     controller.send("cancelEditingTopic");
 
     assert.notOk(
-      controller.get("editingTopic"),
+      controller.editingTopic,
       "cancelling edit mode reverts the property value"
     );
   });
@@ -69,17 +53,15 @@ discourseModule("Unit | Controller | topic", function (hooks) {
     const model = Topic.create();
     let destroyed = false;
     let modalDisplayed = false;
-    model.destroy = async () => {
-      destroyed = true;
-    };
-    const controller = this.getController("topic", {
+    model.destroy = async () => (destroyed = true);
+
+    const siteSettings = this.owner.lookup("service:site-settings");
+    siteSettings.min_topic_views_for_delete_confirm = 5;
+
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({
       model,
-      siteSettings: {
-        min_topic_views_for_delete_confirm: 5,
-      },
-      deleteTopicModal: () => {
-        modalDisplayed = true;
-      },
+      deleteTopicModal: () => (modalDisplayed = true),
     });
 
     model.set("views", 10000);
@@ -94,82 +76,79 @@ discourseModule("Unit | Controller | topic", function (hooks) {
 
   test("toggleMultiSelect", async function (assert) {
     const model = Topic.create();
-    const controller = this.getController("topic", { model });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     assert.notOk(
-      controller.get("multiSelect"),
+      controller.multiSelect,
       "multi selection mode is disabled by default"
     );
 
-    controller.get("selectedPostIds").pushObject(1);
-    assert.strictEqual(controller.get("selectedPostIds.length"), 1);
+    controller.selectedPostIds.pushObject(1);
+    assert.strictEqual(controller.selectedPostIds.length, 1);
 
     controller.send("toggleMultiSelect");
     await settled();
 
     assert.ok(
-      controller.get("multiSelect"),
+      controller.multiSelect,
       "calling 'toggleMultiSelect' once enables multi selection mode"
     );
     assert.strictEqual(
-      controller.get("selectedPostIds.length"),
+      controller.selectedPostIds.length,
       0,
       "toggling 'multiSelect' clears 'selectedPostIds'"
     );
 
-    controller.get("selectedPostIds").pushObject(2);
-    assert.strictEqual(controller.get("selectedPostIds.length"), 1);
+    controller.selectedPostIds.pushObject(2);
+    assert.strictEqual(controller.selectedPostIds.length, 1);
 
     controller.send("toggleMultiSelect");
     await settled();
 
     assert.notOk(
-      controller.get("multiSelect"),
+      controller.multiSelect,
       "calling 'toggleMultiSelect' twice disables multi selection mode"
     );
     assert.strictEqual(
-      controller.get("selectedPostIds.length"),
+      controller.selectedPostIds.length,
       0,
       "toggling 'multiSelect' clears 'selectedPostIds'"
     );
   });
 
   test("selectedPosts", function (assert) {
-    let model = topicWithStream({ posts: [{ id: 1 }, { id: 2 }, { id: 3 }] });
-    const controller = this.getController("topic", { model });
+    const model = topicWithStream({ posts: [{ id: 1 }, { id: 2 }, { id: 3 }] });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     controller.set("selectedPostIds", [1, 2, 42]);
 
     assert.strictEqual(
-      controller.get("selectedPosts.length"),
+      controller.selectedPosts.length,
       2,
       "selectedPosts only contains already loaded posts"
     );
     assert.notOk(
-      controller.get("selectedPosts").some((p) => p === undefined),
+      controller.selectedPosts.some((p) => p === undefined),
       "selectedPosts only contains valid post objects"
     );
   });
 
   test("selectedAllPosts", function (assert) {
-    let model = topicWithStream({ stream: [1, 2, 3] });
-    const controller = this.getController("topic", { model });
+    const model = topicWithStream({ stream: [1, 2, 3] });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     controller.set("selectedPostIds", [1, 2]);
+    assert.notOk(controller.selectedAllPosts, "not all posts are selected");
 
-    assert.notOk(
-      controller.get("selectedAllPosts"),
-      "not all posts are selected"
-    );
-
-    controller.get("selectedPostIds").pushObject(3);
-
-    assert.ok(controller.get("selectedAllPosts"), "all posts are selected");
-
-    controller.get("selectedPostIds").pushObject(42);
+    controller.selectedPostIds.pushObject(3);
+    assert.ok(controller.selectedAllPosts, "all posts are selected");
 
+    controller.selectedPostIds.pushObject(42);
     assert.ok(
-      controller.get("selectedAllPosts"),
+      controller.selectedAllPosts,
       "all posts (including filtered posts) are selected"
     );
 
@@ -177,15 +156,14 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       "postStream.isMegaTopic": true,
       posts_count: 1,
     });
-
     assert.ok(
-      controller.get("selectedAllPosts"),
-      "it uses the topic's post count for megatopics"
+      controller.selectedAllPosts,
+      "it uses the topic's post count for mega-topics"
     );
   });
 
   test("selectedPostsUsername", function (assert) {
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, username: "gary" },
         { id: 2, username: "gary" },
@@ -193,84 +171,69 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       ],
       stream: [1, 2, 3],
     });
-    const controller = this.getController("topic", { model });
-    const selectedPostIds = controller.get("selectedPostIds");
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     assert.strictEqual(
-      controller.get("selectedPostsUsername"),
+      controller.selectedPostsUsername,
       undefined,
       "no username when no selected posts"
     );
 
-    selectedPostIds.pushObject(1);
-
+    controller.selectedPostIds.pushObject(1);
     assert.strictEqual(
-      controller.get("selectedPostsUsername"),
+      controller.selectedPostsUsername,
       "gary",
       "username of the selected posts"
     );
 
-    selectedPostIds.pushObject(2);
-
+    controller.selectedPostIds.pushObject(2);
     assert.strictEqual(
-      controller.get("selectedPostsUsername"),
+      controller.selectedPostsUsername,
       "gary",
       "username of all the selected posts when same user"
     );
 
-    selectedPostIds.pushObject(3);
-
+    controller.selectedPostIds.pushObject(3);
     assert.strictEqual(
-      controller.get("selectedPostsUsername"),
+      controller.selectedPostsUsername,
       undefined,
       "no username when more than 1 user"
     );
 
-    selectedPostIds.replace(2, 1, [42]);
-
+    controller.selectedPostIds.replace(2, 1, [42]);
     assert.strictEqual(
-      controller.get("selectedPostsUsername"),
+      controller.selectedPostsUsername,
       undefined,
       "no username when not already loaded posts are selected"
     );
   });
 
   test("showSelectedPostsAtBottom", function (assert) {
-    const site = EmberObject.create({ mobileView: false });
     const model = Topic.create({ posts_count: 3 });
-    const controller = this.getController("topic", { model, site });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
-    assert.notOk(
-      controller.get("showSelectedPostsAtBottom"),
-      "false on desktop"
-    );
+    assert.notOk(controller.showSelectedPostsAtBottom, "false on desktop");
 
+    const site = this.owner.lookup("service:site");
     site.set("mobileView", true);
 
     assert.notOk(
-      controller.get("showSelectedPostsAtBottom"),
+      controller.showSelectedPostsAtBottom,
       "requires at least 3 posts on mobile"
     );
 
     model.set("posts_count", 4);
-
     assert.ok(
-      controller.get("showSelectedPostsAtBottom"),
+      controller.showSelectedPostsAtBottom,
       "true when mobile and more than 3 posts"
     );
   });
 
   test("canDeleteSelected", function (assert) {
     const currentUser = User.create({ admin: false });
-    this.registry.register("service:current-user", currentUser, {
-      instantiate: false,
-    });
-    this.registry.injection(
-      "controller",
-      "currentUser",
-      "service:current-user"
-    );
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, can_delete: false },
         { id: 2, can_delete: true },
@@ -278,47 +241,45 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       ],
       stream: [1, 2, 3],
     });
-    const controller = this.getController("topic", {
+
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({
       model,
+      currentUser,
     });
-    const selectedPostIds = controller.get("selectedPostIds");
 
     assert.notOk(
-      controller.get("canDeleteSelected"),
+      controller.canDeleteSelected,
       "false when no posts are selected"
     );
 
-    selectedPostIds.pushObject(1);
-
+    controller.selectedPostIds.pushObject(1);
     assert.notOk(
-      controller.get("canDeleteSelected"),
+      controller.canDeleteSelected,
       "false when can't delete one of the selected posts"
     );
 
-    selectedPostIds.replace(0, 1, [2, 3]);
-
+    controller.selectedPostIds.replace(0, 1, [2, 3]);
     assert.ok(
-      controller.get("canDeleteSelected"),
+      controller.canDeleteSelected,
       "true when all selected posts can be deleted"
     );
 
-    selectedPostIds.pushObject(1);
-
+    controller.selectedPostIds.pushObject(1);
     assert.notOk(
-      controller.get("canDeleteSelected"),
+      controller.canDeleteSelected,
       "false when all posts are selected and user is staff"
     );
 
     currentUser.set("admin", true);
-
     assert.ok(
-      controller.get("canDeleteSelected"),
+      controller.canDeleteSelected,
       "true when all posts are selected and user is staff"
     );
   });
 
   test("Can split/merge topic", function (assert) {
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, post_number: 1, post_type: 1 },
         { id: 2, post_number: 2, post_type: 4 },
@@ -327,140 +288,111 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       stream: [1, 2, 3],
     });
     model.set("details.can_move_posts", false);
-    const controller = this.getController("topic", { model });
-    const selectedPostIds = controller.get("selectedPostIds");
+
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     assert.notOk(
-      controller.get("canMergeTopic"),
+      controller.canMergeTopic,
       "can't merge topic when no posts are selected"
     );
 
-    selectedPostIds.pushObject(1);
+    controller.selectedPostIds.pushObject(1);
 
     assert.notOk(
-      controller.get("canMergeTopic"),
+      controller.canMergeTopic,
       "can't merge topic when can't move posts"
     );
 
     model.set("details.can_move_posts", true);
 
-    assert.ok(controller.get("canMergeTopic"), "can merge topic");
+    assert.ok(controller.canMergeTopic, "can merge topic");
 
-    selectedPostIds.removeObject(1);
-    selectedPostIds.pushObject(2);
+    controller.selectedPostIds.removeObject(1);
+    controller.selectedPostIds.pushObject(2);
 
     assert.ok(
-      controller.get("canMergeTopic"),
+      controller.canMergeTopic,
       "can merge topic when 1st post is not a regular post"
     );
 
-    selectedPostIds.pushObject(3);
+    controller.selectedPostIds.pushObject(3);
 
     assert.ok(
-      controller.get("canMergeTopic"),
+      controller.canMergeTopic,
       "can merge topic when all posts are selected"
     );
   });
 
   test("canChangeOwner", function (assert) {
     const currentUser = User.create({ admin: false });
-    this.registry.register("service:current-user", currentUser, {
-      instantiate: false,
-    });
-    this.registry.injection(
-      "controller",
-      "currentUser",
-      "service:current-user"
-    );
-
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, username: "gary" },
         { id: 2, username: "lili" },
       ],
       stream: [1, 2],
     });
-    const controller = this.getController("topic", {
-      model,
-    });
-    const selectedPostIds = controller.get("selectedPostIds");
+    model.set("currentUser", currentUser);
 
-    assert.notOk(
-      controller.get("canChangeOwner"),
-      "false when no posts are selected"
-    );
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model, currentUser });
 
-    selectedPostIds.pushObject(1);
+    assert.notOk(controller.canChangeOwner, "false when no posts are selected");
 
-    assert.notOk(controller.get("canChangeOwner"), "false when not admin");
+    controller.selectedPostIds.pushObject(1);
+    assert.notOk(controller.canChangeOwner, "false when not admin");
 
     currentUser.set("admin", true);
-
     assert.ok(
-      controller.get("canChangeOwner"),
+      controller.canChangeOwner,
       "true when admin and one post is selected"
     );
 
-    selectedPostIds.pushObject(2);
-
+    controller.selectedPostIds.pushObject(2);
     assert.notOk(
-      controller.get("canChangeOwner"),
+      controller.canChangeOwner,
       "false when admin but more than 1 user"
     );
   });
 
   test("modCanChangeOwner", function (assert) {
     const currentUser = User.create({ moderator: false });
-    this.registry.register("service:current-user", currentUser, {
-      instantiate: false,
-    });
-    this.registry.injection(
-      "controller",
-      "currentUser",
-      "service:current-user"
-    );
-
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, username: "gary" },
         { id: 2, username: "lili" },
       ],
       stream: [1, 2],
     });
-    const controller = this.getController("topic", {
-      model,
-      siteSettings: {
-        moderators_change_post_ownership: true,
-      },
-    });
-    const selectedPostIds = controller.get("selectedPostIds");
+    model.set("currentUser", currentUser);
 
-    assert.notOk(
-      controller.get("canChangeOwner"),
-      "false when no posts are selected"
-    );
+    const siteSettings = this.owner.lookup("service:site-settings");
+    siteSettings.moderators_change_post_ownership = true;
 
-    selectedPostIds.pushObject(1);
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model, currentUser });
 
-    assert.notOk(controller.get("canChangeOwner"), "false when not moderator");
+    assert.notOk(controller.canChangeOwner, "false when no posts are selected");
+
+    controller.selectedPostIds.pushObject(1);
+    assert.notOk(controller.canChangeOwner, "false when not moderator");
 
     currentUser.set("moderator", true);
-
     assert.ok(
-      controller.get("canChangeOwner"),
+      controller.canChangeOwner,
       "true when moderator and one post is selected"
     );
 
-    selectedPostIds.pushObject(2);
-
+    controller.selectedPostIds.pushObject(2);
     assert.notOk(
-      controller.get("canChangeOwner"),
+      controller.canChangeOwner,
       "false when moderator but more than 1 user"
     );
   });
 
   test("canMergePosts", function (assert) {
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [
         { id: 1, username: "gary", can_delete: true },
         { id: 2, username: "lili", can_delete: true },
@@ -469,104 +401,92 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       ],
       stream: [1, 2, 3],
     });
-    const controller = this.getController("topic", {
-      model,
-    });
-    const selectedPostIds = controller.get("selectedPostIds");
 
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
+
+    assert.notOk(controller.canMergePosts, "false when no posts are selected");
+
+    controller.selectedPostIds.pushObject(1);
     assert.notOk(
-      controller.get("canMergePosts"),
-      "false when no posts are selected"
-    );
-
-    selectedPostIds.pushObject(1);
-
-    assert.notOk(
-      controller.get("canMergePosts"),
+      controller.canMergePosts,
       "false when only one post is selected"
     );
 
-    selectedPostIds.pushObject(2);
-
+    controller.selectedPostIds.pushObject(2);
     assert.notOk(
-      controller.get("canMergePosts"),
+      controller.canMergePosts,
       "false when selected posts are from different users"
     );
 
-    selectedPostIds.replace(1, 1, [3]);
-
+    controller.selectedPostIds.replace(1, 1, [3]);
     assert.notOk(
-      controller.get("canMergePosts"),
+      controller.canMergePosts,
       "false when selected posts can't be deleted"
     );
 
-    selectedPostIds.replace(1, 1, [4]);
-
+    controller.selectedPostIds.replace(1, 1, [4]);
     assert.ok(
-      controller.get("canMergePosts"),
+      controller.canMergePosts,
       "true when all selected posts are deletable and by the same user"
     );
   });
 
   test("Select/deselect all", function (assert) {
-    let model = topicWithStream({ stream: [1, 2, 3] });
-    const controller = this.getController("topic", { model });
+    const controller = this.owner.lookup("controller:topic");
+    const model = topicWithStream({ stream: [1, 2, 3] });
+    controller.setProperties({ model });
 
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       0,
       "no posts selected by default"
     );
 
     controller.send("selectAll");
-
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       3,
       "calling 'selectAll' selects all posts"
     );
 
     controller.send("deselectAll");
-
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       0,
       "calling 'deselectAll' deselects all posts"
     );
   });
 
   test("togglePostSelection", function (assert) {
-    const controller = this.getController("topic");
-    const selectedPostIds = controller.get("selectedPostIds");
+    const controller = this.owner.lookup("controller:topic");
 
     assert.strictEqual(
-      selectedPostIds[0],
+      controller.selectedPostIds[0],
       undefined,
       "no posts selected by default"
     );
 
     controller.send("togglePostSelection", { id: 1 });
-
     assert.strictEqual(
-      selectedPostIds[0],
+      controller.selectedPostIds[0],
       1,
       "adds the selected post id if not already selected"
     );
 
     controller.send("togglePostSelection", { id: 1 });
-
     assert.strictEqual(
-      selectedPostIds[0],
+      controller.selectedPostIds[0],
       undefined,
       "removes the selected post id if already selected"
     );
   });
 
   test("selectBelow", function (assert) {
-    const site = EmberObject.create({
-      post_types: { small_action: 3, whisper: 4 },
-    });
-    let model = topicWithStream({
+    const site = this.owner.lookup("service:site");
+    site.set("post_types", { small_action: 3, whisper: 4 });
+
+    const model = topicWithStream({
       stream: [1, 2, 3, 4, 5, 6, 7, 8],
       posts: [
         { id: 5, cooked: "whisper post", post_type: 4 },
@@ -574,33 +494,18 @@ discourseModule("Unit | Controller | topic", function (hooks) {
         { id: 7, cooked: "", post_type: 4 },
       ],
     });
-    const controller = this.getController("topic", { site, model });
-    let selectedPostIds = controller.get("selectedPostIds");
 
-    assert.strictEqual(
-      selectedPostIds[0],
-      undefined,
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
+
+    assert.deepEqual(
+      controller.selectedPostIds,
+      [],
       "no posts selected by default"
     );
 
     controller.send("selectBelow", { id: 3 });
-
-    assert.strictEqual(selectedPostIds[0], 3, "selected post #3");
-    assert.strictEqual(
-      selectedPostIds[1],
-      4,
-      "also selected 1st post below post #3"
-    );
-    assert.strictEqual(
-      selectedPostIds[2],
-      5,
-      "also selected 2nd post below post #3"
-    );
-    assert.strictEqual(
-      selectedPostIds[3],
-      8,
-      "also selected 3rd post below post #3"
-    );
+    assert.deepEqual(controller.selectedPostIds, [3, 4, 5, 8]);
   });
 
   test("selectReplies", async function (assert) {
@@ -608,29 +513,30 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       response([{ id: 2, level: 1 }])
     );
 
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [{ id: 1 }, { id: 2 }],
     });
 
-    const controller = this.getController("topic", { model });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
 
     controller.send("selectReplies", { id: 1 });
     await settled();
 
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       2,
       "It should select two, the post and its replies"
     );
 
     controller.send("togglePostSelection", { id: 1 });
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       1,
       "It should be selecting one only "
     );
     assert.strictEqual(
-      controller.get("selectedPostIds")[0],
+      controller.selectedPostIds[0],
       2,
       "It should be selecting the reply id "
     );
@@ -639,17 +545,18 @@ discourseModule("Unit | Controller | topic", function (hooks) {
     await settled();
 
     assert.strictEqual(
-      controller.get("selectedPostsCount"),
+      controller.selectedPostsCount,
       2,
       "It should be selecting two, even if reply was already selected"
     );
   });
 
   test("topVisibleChanged", function (assert) {
-    let model = topicWithStream({
+    const model = topicWithStream({
       posts: [{ id: 1 }],
     });
-    const controller = this.getController("topic", { model });
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model });
     const placeholder = new Placeholder("post-placeholder");
 
     assert.strictEqual(
@@ -670,26 +577,17 @@ discourseModule("Unit | Controller | topic", function (hooks) {
       post_number: 2,
       can_delete: true,
       reply_count: 3,
-      destroy: async () => {
-        destroyed = true;
-      },
+      destroy: async () => (destroyed = true),
     });
 
     const currentUser = EmberObject.create({ moderator: true });
-    this.registry.register("service:current-user", currentUser, {
-      instantiate: false,
-    });
-    this.registry.injection(
-      "controller",
-      "currentUser",
-      "service:current-user"
-    );
-
-    let model = topicWithStream({
+    const model = topicWithStream({
       stream: [2, 3, 4],
       posts: [post, { id: 3 }, { id: 4 }],
     });
-    const controller = this.getController("topic", { model });
+
+    const controller = this.owner.lookup("controller:topic");
+    controller.setProperties({ model, currentUser });
 
     const done = assert.async();
     controller.send("deletePost", post);
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
index daa0ae2b01..7dca41ee75 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
@@ -1,24 +1,23 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import * as showModal from "discourse/lib/show-modal";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import sinon from "sinon";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import EmberObject from "@ember/object";
+import * as showModal from "discourse/lib/show-modal";
 import User from "discourse/models/user";
-import pretender from "discourse/tests/helpers/create-pretender";
 import I18n from "I18n";
 
-discourseModule("Unit | Controller | user-notifications", function () {
+module("Unit | Controller | user-notifications", function (hooks) {
+  setupTest(hooks);
+
   test("Mark read marks all models read when response is 200", async function (assert) {
     const model = [
       EmberObject.create({ read: false }),
       EmberObject.create({ read: false }),
     ];
-    const controller = this.getController("user-notifications", {
-      model,
-    });
-    pretender.put("/notifications/mark-read", () => {
-      return [200];
-    });
+    const controller = this.owner.lookup("controller:user-notifications");
+    controller.setProperties({ model });
+    pretender.put("/notifications/mark-read", () => response({}));
 
     await controller.markRead();
 
@@ -33,10 +32,9 @@ discourseModule("Unit | Controller | user-notifications", function () {
       EmberObject.create({ read: false }),
       EmberObject.create({ read: true }),
     ];
-    const controller = this.getController("user-notifications", { model });
-    pretender.put("/notifications/mark-read", () => {
-      return [500];
-    });
+    const controller = this.owner.lookup("controller:user-notifications");
+    controller.setProperties({ model });
+    pretender.put("/notifications/mark-read", () => response(500));
 
     assert.rejects(controller.markRead());
     assert.deepEqual(
@@ -49,13 +47,12 @@ discourseModule("Unit | Controller | user-notifications", function () {
   test("Marks all notifications read when no high priority notifications", function (assert) {
     let markRead = false;
     const currentUser = User.create({ unread_high_priority_notifications: 0 });
-    const controller = this.getController("user-notifications", {
+    const controller = this.owner.lookup("controller:user-notifications");
+    controller.setProperties({
       model: [],
       currentUser,
     });
-    sinon.stub(controller, "markRead").callsFake(() => {
-      markRead = true;
-    });
+    sinon.stub(controller, "markRead").callsFake(() => (markRead = true));
 
     controller.send("resetNew");
 
@@ -70,10 +67,10 @@ discourseModule("Unit | Controller | user-notifications", function () {
       .returns({
         setProperties: (properties) => (capturedProperties = properties),
       });
+
     const currentUser = User.create({ unread_high_priority_notifications: 1 });
-    const controller = this.getController("user-notifications", {
-      currentUser,
-    });
+    const controller = this.owner.lookup("controller:user-notifications");
+    controller.setProperties({ currentUser });
     const markReadFake = sinon.fake();
     sinon.stub(controller, "markRead").callsFake(markReadFake);
 
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js b/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
similarity index 95%
rename from plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js
rename to plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
index ea00d305e7..7da954e273 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js
+++ b/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
@@ -1,20 +1,22 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
 import {
   MULTIPLE_POLL_TYPE,
   NUMBER_POLL_TYPE,
   REGULAR_POLL_TYPE,
 } from "discourse/plugins/poll/controllers/poll-ui-builder";
-import { test } from "qunit";
 import { settled } from "@ember/test-helpers";
 
 function setupController(ctx) {
-  let controller = ctx.getController("poll-ui-builder");
+  const controller = ctx.owner.lookup("controller:poll-ui-builder");
   controller.set("toolbarEvent", { getText: () => "" });
   controller.onShow();
   return controller;
 }
 
-discourseModule("Unit | Controller | poll-ui-builder", function () {
+module("Unit | Controller | poll-ui-builder", function (hooks) {
+  setupTest(hooks);
+
   test("isMultiple", function (assert) {
     const controller = setupController(this);
 
@@ -22,14 +24,12 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
       pollType: MULTIPLE_POLL_TYPE,
       pollOptions: [{ value: "a" }],
     });
-
     assert.strictEqual(controller.isMultiple, true, "it should be true");
 
     controller.setProperties({
       pollType: "random",
       pollOptions: [{ value: "b" }],
     });
-
     assert.strictEqual(controller.isMultiple, false, "it should be false");
   });
 
@@ -37,11 +37,9 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     const controller = setupController(this);
 
     controller.set("pollType", REGULAR_POLL_TYPE);
-
     assert.strictEqual(controller.isNumber, false, "it should be false");
 
     controller.set("pollType", NUMBER_POLL_TYPE);
-
     assert.strictEqual(controller.isNumber, true, "it should be true");
   });
 
@@ -49,68 +47,60 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     const controller = setupController(this);
 
     controller.set("pollOptions", [{ value: "1" }, { value: "2" }]);
-
     assert.strictEqual(controller.pollOptionsCount, 2, "it should equal 2");
 
     controller.set("pollOptions", []);
-
     assert.strictEqual(controller.pollOptionsCount, 0, "it should equal 0");
   });
 
   test("disableInsert", function (assert) {
     const controller = setupController(this);
-    controller.siteSettings.poll_maximum_options = 20;
 
+    controller.siteSettings.poll_maximum_options = 20;
     assert.strictEqual(controller.disableInsert, true, "it should be true");
 
     controller.set("pollOptions", [{ value: "a" }, { value: "b" }]);
-
     assert.strictEqual(controller.disableInsert, false, "it should be false");
 
     controller.set("pollType", NUMBER_POLL_TYPE);
-
     assert.strictEqual(controller.disableInsert, false, "it should be false");
 
     controller.setProperties({
       pollType: REGULAR_POLL_TYPE,
       pollOptions: [{ value: "a" }, { value: "b" }, { value: "c" }],
     });
-
     assert.strictEqual(controller.disableInsert, false, "it should be false");
 
     controller.setProperties({
       pollType: REGULAR_POLL_TYPE,
       pollOptions: [],
     });
-
     assert.strictEqual(controller.disableInsert, true, "it should be true");
 
     controller.setProperties({
       pollType: REGULAR_POLL_TYPE,
       pollOptions: [{ value: "w" }],
     });
-
     assert.strictEqual(controller.disableInsert, false, "it should be false");
   });
 
   test("number pollOutput", async function (assert) {
-    this.siteSettings.poll_maximum_options = 20;
     const controller = setupController(this);
+    controller.siteSettings.poll_maximum_options = 20;
 
     controller.setProperties({
       pollType: NUMBER_POLL_TYPE,
       pollMin: 1,
     });
     await settled();
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=number results=always min=1 max=20 step=1]\n[/poll]\n",
       "it should return the right output"
     );
+
     controller.set("pollStep", 2);
     await settled();
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=number results=always min=1 max=20 step=2]\n[/poll]\n",
@@ -118,7 +108,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     );
 
     controller.set("publicPoll", true);
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=number results=always min=1 max=20 step=2 public=true]\n[/poll]\n",
@@ -126,7 +115,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     );
 
     controller.set("pollStep", 0);
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=number results=always min=1 max=20 step=1 public=true]\n[/poll]\n",
@@ -142,7 +130,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
       pollOptions: [{ value: "1" }, { value: "2" }],
       pollType: REGULAR_POLL_TYPE,
     });
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=regular results=always chartType=bar]\n* 1\n* 2\n[/poll]\n",
@@ -150,7 +137,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     );
 
     controller.set("publicPoll", "true");
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=regular results=always public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
@@ -158,7 +144,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     );
 
     controller.set("pollGroups", "test");
-
     assert.strictEqual(
       controller.get("pollOutput"),
       "[poll type=regular results=always public=true chartType=bar groups=test]\n* 1\n* 2\n[/poll]\n",
@@ -175,7 +160,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
       pollMin: 1,
       pollOptions: [{ value: "1" }, { value: "2" }],
     });
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=multiple results=always min=1 max=2 chartType=bar]\n* 1\n* 2\n[/poll]\n",
@@ -183,7 +167,6 @@ discourseModule("Unit | Controller | poll-ui-builder", function () {
     );
 
     controller.set("publicPoll", "true");
-
     assert.strictEqual(
       controller.pollOutput,
       "[poll type=multiple results=always min=1 max=2 public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",

From 6b4b279141d35453eb9dd48d7919782c1774f400 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 14 Oct 2022 09:32:02 -0400
Subject: [PATCH 158/332] UX: horitzontal scroll controls for new user nav
 (#18583)

---
 .../components/user-nav/preferences-nav.hbs   | 106 ++++++++++++++++++
 .../components/user-nav/preferences-nav.js    |  80 +++++++++++++
 .../discourse/app/templates/preferences.hbs   |  88 +--------------
 .../stylesheets/common/base/new-user.scss     |  77 ++++++++++++-
 app/assets/stylesheets/mobile/new-user.scss   |   5 -
 5 files changed, 266 insertions(+), 90 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js

diff --git a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
new file mode 100644
index 0000000000..a7fdca93e4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
@@ -0,0 +1,106 @@
+{{!-- template-lint-disable no-down-event-binding --}}
+
+<div class="user-navigation user-navigation-secondary {{if this.hasScroll "has-scroll"}}">
+  {{#if this.hasScroll}}
+    <a
+      role="button"
+      {{on "mousedown" this.horizScroll}}
+      data-direction="left"
+      class="nav-overflow__scroll-left btn-flat {{if this.hideLeftScroll "transparent"}}"
+    >
+      {{d-icon "chevron-left"}}
+    </a>
+  {{/if}}
+
+  <ul
+    {{did-insert this.scrollToActive}}
+    {{on-resize this.checkScroll}}
+    {{on "scroll" this.watchScroll}}
+    class="nav-pills action-list"
+  >
+    <li class="nav-account">
+      <LinkTo @route="preferences.account">
+        {{d-icon "user"}}
+        <span>{{i18n "user.preferences_nav.account"}}</span>
+      </LinkTo>
+    </li>
+    <li class="nav-security">
+      <LinkTo @route="preferences.security">
+        {{d-icon "lock"}}
+        <span>{{i18n "user.preferences_nav.security"}}</span>
+      </LinkTo>
+    </li>
+    <li class="nav-profile">
+      <LinkTo @route="preferences.profile">
+        {{d-icon "user"}}
+        <span>{{i18n "user.preferences_nav.profile"}}</span>
+      </LinkTo>
+    </li>
+    <li class="nav-emails">
+      <LinkTo @route="preferences.emails">
+        {{d-icon "envelope"}}
+        <span>{{i18n "user.preferences_nav.emails"}}</span>
+      </LinkTo>
+    </li>
+    <li class="nav-notifications">
+      <LinkTo @route="preferences.notifications">
+        {{d-icon "bell"}}
+        <span>{{i18n "user.preferences_nav.notifications"}}</span>
+      </LinkTo>
+    </li>
+    {{#if @model.can_change_tracking_preferences}}
+      <li class="indent nav-categories">
+        <LinkTo @route="preferences.categories">
+          {{d-icon "folder"}}
+          <span>{{i18n "user.preferences_nav.categories"}}</span>
+        </LinkTo>
+      </li>
+    {{/if}}
+    <li class="indent nav-users">
+      <LinkTo @route="preferences.users">
+        {{d-icon "users"}}
+        <span>{{i18n "user.preferences_nav.users"}}</span>
+      </LinkTo>
+    </li>
+    {{#if (and @model.can_change_tracking_preferences @siteSettings.tagging_enabled)}}
+      <li class="indent nav-tags">
+        <LinkTo @route="preferences.tags">
+          {{d-icon "tag"}}
+          <span>{{i18n "user.preferences_nav.tags"}}</span>
+        </LinkTo>
+      </li>
+    {{/if}}
+    <li class="nav-interface">
+      <LinkTo @route="preferences.interface">
+        {{d-icon "desktop"}}
+        <span>{{i18n "user.preferences_nav.interface"}}</span>
+      </LinkTo>
+    </li>
+    {{#if @siteSettings.enable_experimental_sidebar_hamburger}}
+      <li class="indent nav-sidebar">
+        <LinkTo @route="preferences.sidebar">
+          {{d-icon "bars"}}
+          <span>{{i18n "user.preferences_nav.sidebar"}}</span>
+        </LinkTo>
+      </li>
+    {{/if}}
+    <PluginOutlet @name="user-preferences-nav-under-interface" @connectorTagName="div" @args={{hash model=@model}} />
+    <li class="nav-apps">
+      <LinkTo @route="preferences.apps">
+        {{d-icon "mobile-alt"}}
+        <span>{{i18n "user.preferences_nav.apps"}}</span>
+      </LinkTo>
+    </li>
+    <PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=@model}} />
+  </ul>
+
+  {{#if this.hasScroll}}
+    <a
+      role="button"
+      {{on "mousedown" this.horizScroll}}
+      class="nav-overflow__scroll-right btn-flat {{if this.hideRightScroll "transparent"}}"
+    >
+      {{d-icon "chevron-right"}}
+    </a>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js
new file mode 100644
index 0000000000..1c013766bd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js
@@ -0,0 +1,80 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { bind } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class UserNavPreferencesNav extends Component {
+  @service site;
+  @tracked hasScroll;
+  @tracked hideRightScroll = false;
+  @tracked hideLeftScroll = true;
+  scrollInterval;
+
+  @bind
+  scrollToActive() {
+    document
+      .querySelector(".user-navigation-secondary a.active")
+      .scrollIntoView({ inline: "center" });
+  }
+
+  @bind
+  checkScroll(element) {
+    if (this.site.mobileView) {
+      return;
+    }
+
+    this.watchScroll(element);
+    return (this.hasScroll =
+      element.target.scrollWidth > element.target.offsetWidth);
+  }
+
+  @bind
+  stopScroll() {
+    clearInterval(this.scrollInterval);
+  }
+
+  @bind
+  watchScroll(element) {
+    if (this.site.mobileView) {
+      return;
+    }
+
+    if (
+      element.target.offsetWidth + element.target.scrollLeft ===
+      element.target.scrollWidth
+    ) {
+      this.hideRightScroll = true;
+      clearInterval(this.scrollInterval);
+    } else {
+      this.hideRightScroll = false;
+    }
+
+    if (element.target.scrollLeft === 0) {
+      this.hideLeftScroll = true;
+      clearInterval(this.scrollInterval);
+    } else {
+      this.hideLeftScroll = false;
+    }
+  }
+
+  @action
+  horizScroll(element) {
+    let scrollSpeed = 50;
+    let siblingTarget = element.target.previousElementSibling;
+
+    if (element.target.dataset.direction === "left") {
+      scrollSpeed = scrollSpeed * -1;
+      siblingTarget = element.target.nextElementSibling;
+    }
+
+    this.scrollInterval = setInterval(function () {
+      siblingTarget.scrollLeft += scrollSpeed;
+    }, 50);
+
+    this.scrollTimer;
+
+    element.target.addEventListener("mouseup", this.stopScroll);
+    element.target.addEventListener("mouseleave", this.stopScroll);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index 32ea2bf1b5..acd0dd7e4b 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -1,88 +1,12 @@
 {{#if this.currentUser.redesigned_user_page_nav_enabled}}
   <DSection @pageClass="user-preferences" />
 
-  <div class="user-navigation user-navigation-secondary">
-    <ul class="nav-pills action-list">
-      <li class="nav-account">
-        <LinkTo @route="preferences.account">
-          {{d-icon "user"}}
-          <span>{{i18n "user.preferences_nav.account"}}</span>
-        </LinkTo>
-      </li>
-      <li class="nav-security">
-        <LinkTo @route="preferences.security">
-          {{d-icon "lock"}}
-          <span>{{i18n "user.preferences_nav.security"}}</span>
-        </LinkTo>
-      </li>
-      <li class="nav-profile">
-        <LinkTo @route="preferences.profile">
-          {{d-icon "user"}}
-          <span>{{i18n "user.preferences_nav.profile"}}</span>
-        </LinkTo>
-      </li>
-      <li class="nav-emails">
-        <LinkTo @route="preferences.emails">
-          {{d-icon "envelope"}}
-          <span>{{i18n "user.preferences_nav.emails"}}</span>
-        </LinkTo>
-      </li>
-      <li class="nav-notifications">
-        <LinkTo @route="preferences.notifications">
-          {{d-icon "bell"}}
-          <span>{{i18n "user.preferences_nav.notifications"}}</span>
-        </LinkTo>
-      </li>
-      {{#if this.model.can_change_tracking_preferences}}
-        <li class="indent nav-categories">
-          <LinkTo @route="preferences.categories">
-            {{d-icon "folder"}}
-            <span>{{i18n "user.preferences_nav.categories"}}</span>
-          </LinkTo>
-        </li>
-      {{/if}}
-      <li class="indent nav-users">
-        <LinkTo @route="preferences.users">
-          {{d-icon "users"}}
-          <span>{{i18n "user.preferences_nav.users"}}</span>
-        </LinkTo>
-      </li>
-      {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
-        <li class="indent nav-tags">
-          <LinkTo @route="preferences.tags">
-            {{d-icon "tag"}}
-            <span>{{i18n "user.preferences_nav.tags"}}</span>
-          </LinkTo>
-        </li>
-      {{/if}}
-      <li class="nav-interface">
-        <LinkTo @route="preferences.interface">
-          {{d-icon "desktop"}}
-          <span>{{i18n "user.preferences_nav.interface"}}</span>
-        </LinkTo>
-      </li>
-
-      {{#if this.siteSettings.enable_experimental_sidebar_hamburger}}
-        <li class="indent nav-sidebar">
-          <LinkTo @route="preferences.sidebar">
-            {{d-icon "bars"}}
-            <span>{{i18n "user.preferences_nav.sidebar"}}</span>
-          </LinkTo>
-        </li>
-      {{/if}}
-
-      <PluginOutlet @name="user-preferences-nav-under-interface" @connectorTagName="div" @args={{hash model=this.model}} />
-
-      <li class="nav-apps">
-        <LinkTo @route="preferences.apps">
-          {{d-icon "mobile-alt"}}
-          <span>{{i18n "user.preferences_nav.apps"}}</span>
-        </LinkTo>
-      </li>
-
-      <PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=this.model}} />
-    </ul>
-  </div>
+  <UserNav::PreferencesNav
+    @user={{this.model}}
+    @viewingSelf={{this.viewingSelf}}
+    @model={{this.model}}
+    @siteSettings={{this.siteSettings}}
+  />
 {{else}}
   <DSection @pageClass="user-preferences" @class="user-secondary-navigation">
     <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index f50fe7e36b..7c4823718c 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -2,10 +2,12 @@
   margin-top: -15px; // temp, can remove margin from sibling element after nav finalized
   .user-navigation {
     --user-navigation__border-width: 4px;
+    &.user-navigation-primary {
+      border-bottom: 1px solid var(--primary-low);
+    }
     .nav-pills {
       width: 100%;
       margin: 0;
-      border-bottom: 1px solid var(--primary-low);
       .d-icon {
         font-size: var(--font-down-1);
       }
@@ -80,9 +82,12 @@
 
   .user-navigation-secondary {
     --user-navigation__border-width: 2px;
+    position: relative;
+    display: flex;
     min-width: 0;
     margin: 0.5em 0;
     gap: 0 0.5em;
+    border-bottom: 1px solid var(--primary-low);
 
     .select-kit .select-kit-header {
       height: 100%;
@@ -103,18 +108,84 @@
       }
     }
 
+    .nav-overflow__scroll-right,
+    .nav-overflow__scroll-left {
+      --fade-width: 20px;
+      opacity: 1;
+      position: absolute;
+      z-index: 2;
+      background-color: var(--secondary);
+      top: 0;
+      bottom: 0;
+      display: flex;
+      align-items: center;
+      transition: opacity 0.25s;
+      .d-icon {
+        pointer-events: none;
+        margin-bottom: 0.2em;
+        color: var(--tertiary);
+      }
+      &.transparent {
+        // hiding with opacity so we can transition visibility
+        opacity: 0;
+        pointer-events: none;
+      }
+    }
+
+    .nav-overflow__scroll-right {
+      right: 0;
+      &:before {
+        content: "";
+        margin-left: -1.5em;
+        height: 100%;
+        width: 1.5em;
+        background: linear-gradient(
+          to left,
+          rgba(var(--secondary-rgb), 1),
+          rgba(var(--secondary-rgb), 0)
+        );
+      }
+    }
+
+    .nav-overflow__scroll-left {
+      left: 0;
+      &:after {
+        content: "";
+        margin-right: -1.5em;
+        height: 100%;
+        width: 1.5em;
+        background: linear-gradient(
+          to right,
+          rgba(var(--secondary-rgb), 1),
+          rgba(var(--secondary-rgb), 0)
+        );
+      }
+    }
+
     .nav-pills {
       flex: 1 1 auto;
       font-size: var(--font-down-1);
-      flex-wrap: wrap;
       justify-content: flex-start;
+      overflow: auto;
+      position: relative;
+      scroll-behavior: smooth;
+
+      // hides scrollbars, but allows mouse scrolling
+      scrollbar-width: none;
+      &::-webkit-scrollbar {
+        height: 0;
+      }
 
       li {
-        flex: 1 1 auto;
+        flex: 1 0 auto;
 
         a {
           padding: 0.5em 0.5em
             calc(0.5em + var(--user-navigation__border-width));
+
+          span {
+            text-overflow: unset;
+          }
         }
       }
     }
diff --git a/app/assets/stylesheets/mobile/new-user.scss b/app/assets/stylesheets/mobile/new-user.scss
index 60c4715270..4977812905 100644
--- a/app/assets/stylesheets/mobile/new-user.scss
+++ b/app/assets/stylesheets/mobile/new-user.scss
@@ -3,7 +3,6 @@
     width: 100%;
 
     .nav-pills {
-      margin: 0.5em 0;
       overflow-x: auto;
       scrollbar-width: none;
 
@@ -56,10 +55,6 @@
   #navigation-bar {
     flex-wrap: nowrap;
   }
-
-  .navigation-controls {
-    margin-top: 1em;
-  }
 }
 
 .new-user-content-wrapper {

From 2933baa0cebdc16fb2fc42cdf381064e112a4737 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 14 Oct 2022 13:28:20 -0300
Subject: [PATCH 159/332] A11Y: Signal the toggle header can reorder table
 elements. (#18597)

While navigating the table, indicate what the button does and if the user pressed it or not. Also, don't lose focus after reordering elements.
---
 .../admin/addon/templates/users-list-show.hbs | 30 ++++++-----
 .../app/components/table-header-toggle.js     | 54 ++++++++++++++++++-
 .../components/table-header-toggle.hbs        |  4 +-
 config/locales/client.en.yml                  |  2 +
 4 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index c56b8a0862..87200df9ab 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -15,22 +15,24 @@
 
 <LoadMore @class="users-list-container" @selector=".users-list tr" @action={{action "loadMore"}}>
   {{#if this.model}}
-    <table class="table users-list grid">
+    <table class="table users-list grid" role="table" aria-label={{this.title}}>
       <thead>
-        <TableHeaderToggle @field="username" @labelKey="username" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @class={{if this.showEmails "" "hidden"}} @field="email" @labelKey="email" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="last_emailed" @labelKey="admin.users.last_emailed" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="seen" @labelKey="last_seen" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="topics_viewed" @labelKey="admin.user.topics_entered" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="posts_read" @labelKey="admin.user.posts_read_count" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="read_time" @labelKey="admin.user.time_read" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="created" @labelKey="created" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
-        <PluginOutlet @name="admin-users-list-thead-after" @args={{hash order=this.order asc=this.asc}} />
+        <tr>
+          <TableHeaderToggle @field="username" @labelKey="username" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @class={{if this.showEmails "" "hidden"}} @field="email" @labelKey="email" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="last_emailed" @labelKey="admin.users.last_emailed" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="seen" @labelKey="last_seen" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="topics_viewed" @labelKey="admin.user.topics_entered" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="posts_read" @labelKey="admin.user.posts_read_count" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="read_time" @labelKey="admin.user.time_read" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <TableHeaderToggle @field="created" @labelKey="created" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+          <PluginOutlet @name="admin-users-list-thead-after" @args={{hash order=this.order asc=this.asc}} />
 
-        {{#if this.siteSettings.must_approve_users}}
-          <th>{{i18n "admin.users.approved"}}</th>
-        {{/if}}
-        <th>&nbsp;</th>
+          {{#if this.siteSettings.must_approve_users}}
+            <th>{{i18n "admin.users.approved"}}</th>
+          {{/if}}
+          <th>&nbsp;</th>
+        </tr>
       </thead>
       <tbody>
         {{#each this.model as |user|}}
diff --git a/app/assets/javascripts/discourse/app/components/table-header-toggle.js b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
index 259bb0ca4e..78dc01dffe 100644
--- a/app/assets/javascripts/discourse/app/components/table-header-toggle.js
+++ b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
@@ -1,18 +1,32 @@
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { htmlSafe } from "@ember/template";
+import { schedule } from "@ember/runloop";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
 
 export default Component.extend({
   tagName: "th",
   classNames: ["sortable"],
-  attributeBindings: ["title", "colspan"],
+  attributeBindings: ["title", "colspan", "ariaSort:aria-sort", "role"],
+  role: "columnheader",
   labelKey: null,
   chevronIcon: null,
   columnIcon: null,
   translated: false,
   automatic: false,
   onActiveRender: null,
+  pressedState: null,
+  ariaLabel: null,
 
+  @discourseComputed("order", "field", "asc")
+  ariaSort() {
+    if (this.order === this.field) {
+      return this.asc ? "ascending" : "descending";
+    } else {
+      return "none";
+    }
+  },
   toggleProperties() {
     if (this.order === this.field) {
       this.set("asc", this.asc ? null : true);
@@ -43,10 +57,48 @@ export default Component.extend({
     }
     this.set("id", `table-header-toggle-${this.field.replace(/\s/g, "")}`);
     this.toggleChevron();
+    this._updateA11yAttributes();
   },
   didRender() {
     if (this.onActiveRender && this.chevronIcon) {
       this.onActiveRender(this.element);
     }
   },
+  _updateA11yAttributes() {
+    let criteria = "";
+    const pressed = this.order === this.field;
+
+    if (this.icon === "heart") {
+      criteria += `${I18n.t("likes_lowercase", { count: 2 })} `;
+    }
+
+    if (this.translated) {
+      criteria += this.field;
+    } else {
+      const labelKey = this.labelKey || `directory.${this.field}`;
+
+      criteria += I18n.t(labelKey + "_long", {
+        defaultValue: I18n.t(labelKey),
+      });
+    }
+
+    this.set("ariaLabel", I18n.t("directory.sort.label", { criteria }));
+
+    if (pressed) {
+      if (this.asc) {
+        this.set("pressedState", "mixed");
+      } else {
+        this.set("pressedState", "true");
+      }
+
+      this._focusHeader();
+    } else {
+      this.set("pressedState", "false");
+    }
+  },
+  _focusHeader() {
+    schedule("afterRender", () => {
+      document.getElementById(this.id)?.focus();
+    });
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
index b4a450f649..998f8ad30c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
@@ -2,7 +2,9 @@
   class="header-contents"
   id={{this.id}}
   role="button"
-  tabindex="0">
+  tabindex="0"
+  aria-label={{this.ariaLabel}}
+  aria-pressed={{this.pressedState}}>
   {{directory-table-header-title field=this.field labelKey=this.labelKey icon=this.icon translated=this.translated}}
   {{this.chevronIcon}}
 </span>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 350d32feb0..a29be711cf 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -720,6 +720,8 @@ en:
         reset_to_default: "Reset to default"
       group:
         all: "all groups"
+      sort:
+        label: "Sort by %{criteria}"
 
     group_histories:
       actions:

From 07a6b6f55ccb7240c9126f05ba6b84edda89af6c Mon Sep 17 00:00:00 2001
From: Tobias Eigen <tobiaseigen@gmail.com>
Date: Fri, 14 Oct 2022 11:46:24 -0700
Subject: [PATCH 160/332] updated copy for Create your Welcome Topic CTA
 (#18600)

Fixed a typo and added more guidance on info the welcome topic should contain.
---
 config/locales/client.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a29be711cf..dd16711acd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4230,7 +4230,7 @@ en:
 
     welcome_topic_banner:
       title: "Create your Welcome Topic"
-      description: 'Your welcome topic is the first thing new arrivals will read. Think of it as your one paragraph "elevator pitch" or "mission statement"'
+      description: 'Your welcome topic is the first thing new members will read. Think of it as your “elevator pitch” or “mission statement.” Let everyone know who this community is for, what they can expect to find here, and what you’d like them to do first.'
       button_title: "Start Editing"
 
     until: "Until:"

From 588bb2ccf27825134fa321074f7b998f708709ea Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 14 Oct 2022 17:47:29 -0300
Subject: [PATCH 161/332] A11Y: Add more information to the "reply to" button
 label. (#18604)

Includes the post number and poster's username for screen readers.
---
 app/assets/javascripts/discourse/app/widgets/post-menu.js | 8 ++++++++
 config/locales/client.en.yml                              | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 6c0e520ee2..c3e186caed 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -239,6 +239,10 @@ registerButton("reply-small", (attrs) => {
     title: "post.controls.reply",
     icon: "reply",
     className: "reply",
+    translatedAriaLabel: I18n.t("post.sr_reply_to", {
+      post_number: attrs.post_number,
+      username: attrs.username,
+    }),
   };
 
   return args;
@@ -323,6 +327,10 @@ registerButton("reply", (attrs, state, siteSettings, postMenuSettings) => {
     title: "post.controls.reply",
     icon: "reply",
     className: "reply create fade-out",
+    translatedAriaLabel: I18n.t("post.sr_reply_to", {
+      post_number: attrs.post_number,
+      username: attrs.username,
+    }),
   };
 
   if (!attrs.canCreatePost) {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dd16711acd..34696fb3c3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3210,6 +3210,7 @@ en:
       gap:
         one: "view %{count} hidden reply"
         other: "view %{count} hidden replies"
+      sr_reply_to: "Reply to post #%{post_number} by @%{username}"
 
       notice:
         new_user: "This is the first time %{user} has posted — let’s welcome them to our community!"

From 3bd94b27947729b986885b1c3456515a0af73730 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 15 Oct 2022 07:09:00 -0500
Subject: [PATCH 162/332] DEV: includes search_aliases in emoji object (#18608)

This is an information we need on client side for example when filtering emojis.
---
 app/models/emoji.rb       | 3 ++-
 spec/models/emoji_spec.rb | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 2333a913f4..0519b1abe8 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -10,7 +10,7 @@ class Emoji
 
   include ActiveModel::SerializerSupport
 
-  attr_accessor :name, :url, :tonable, :group
+  attr_accessor :name, :url, :tonable, :group, :search_aliases
 
   def self.global_emoji_cache
     @global_emoji_cache ||= DistributedCache.new("global_emoji_cache", namespace: false)
@@ -95,6 +95,7 @@ class Emoji
       e.tonable = Emoji.tonable_emojis.include?(name)
       e.url = Emoji.url_for(filename)
       e.group = groups[name] || DEFAULT_GROUP
+      e.search_aliases = search_aliases[name] || []
     end
   end
 
diff --git a/spec/models/emoji_spec.rb b/spec/models/emoji_spec.rb
index 0cdbcb9df8..6e13304ee5 100644
--- a/spec/models/emoji_spec.rb
+++ b/spec/models/emoji_spec.rb
@@ -148,5 +148,10 @@ RSpec.describe Emoji do
       emoji = Emoji.create_from_db_item("name" => "scotland")
       expect(emoji.group).to eq("flags")
     end
+
+    it "sets the search aliases of the emoji" do
+      emoji = Emoji.create_from_db_item("name" => "sad")
+      expect(emoji.search_aliases).to contain_exactly("frowning_face", "slightly_frowning_face", "sob", "crying_cat_face", "cry", "face_holding_back_tears")
+    end
   end
 end

From 7ed87979a22e6a8667fcc47c30c182534773f9cc Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Sat, 15 Oct 2022 22:29:37 +0200
Subject: [PATCH 163/332] UX: theme setting highlight update (#18607)

---
 .../addon/templates/customize-themes-show.hbs     |  1 +
 app/assets/stylesheets/common/admin/settings.scss | 15 ++++++++++++++-
 config/locales/client.en.yml                      |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index 4fe285d33e..4fa8ebe52d 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -282,6 +282,7 @@
     {{#if this.hasSettings}}
       <div class="control-unit">
         <div class="mini-title">{{i18n "admin.customize.theme.theme_settings"}}</div>
+        <p><i>{{i18n "admin.customize.theme.overriden_settings_explanation"}}</i></p>
         <DSection @class="form-horizontal theme settings control-unit">
           {{#each this.settings as |setting|}}
             <ThemeSettingEditor @setting={{setting}} @model={{this.model}} @class="theme-setting control-unit" />
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 7e023b55b3..bb2bd1936f 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -109,8 +109,21 @@
     }
   }
   .setting.overridden {
+    input {
+      background-color: var(--highlight-medium);
+    }
     h3 {
-      color: var(--highlight-high);
+      position: relative;
+      &:before {
+        content: "";
+        position: absolute;
+        top: 0.5rem;
+        left: -1rem;
+        width: 0.5rem;
+        height: 0.5rem;
+        border-radius: 100%;
+        background-color: var(--highlight-high);
+      }
     }
   }
   .setting.overridden.string {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 34696fb3c3..3faf8f2d7e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4844,6 +4844,7 @@ en:
           has_overwritten_history: "Current theme version no longer exists because the Git history has been overwritten by a force push."
           add: "Add"
           theme_settings: "Theme Settings"
+          overriden_settings_explanation: "Overridden settings are marked with a dot and have a highlighted color. To reset these settings to the default value, press the reset button next to them."
           no_settings: "This theme has no settings."
           theme_translations: "Theme Translations"
           empty: "No items"

From bdd0a98f38ec3b03a8435c2371715f966eddde6b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 16 Oct 2022 19:38:20 +0200
Subject: [PATCH 164/332] DEV: Fix testem output (#18609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Failed tests list we're displaying at the end had incorrect ids. e.g

```
(…)
ok 2160 Chrome 106.0 - [54 ms] - Integration | Component | select-kit/category-drop: caretUpIcon
ok 2161 Chrome 106.0 - [20 ms] - Unit | Service | store: find embedded

Used JS Heap Size: 7.304GB

1..2161
# tests 2161
# pass  2152
# skip  7
# todo  0
# fail  2

Failures:

not ok 2162 Chrome 106.0 - [36 ms] - Acceptance: Unknown: Permalink URL to a static page
    ---
        actual: >
            null
        message: >
            Promise rejected during "Permalink URL to a static page": no no
        negative: >
            false
        browser log: |
    ...
not ok 2163 Chrome 106.0 - [238 ms] - Unit | Utility | text: parseAsync
    ---
        actual: >
            null
        message: >
            Promise rejected during "parseAsync": nope
        negative: >
            false
        browser log: |
    ...
Testem finished with non-zero exit code. Tests failed.
```
---
 app/assets/javascripts/discourse/testem.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/testem.js b/app/assets/javascripts/discourse/testem.js
index 1545a94f55..fbc3951418 100644
--- a/app/assets/javascripts/discourse/testem.js
+++ b/app/assets/javascripts/discourse/testem.js
@@ -18,7 +18,7 @@ class Reporter {
 
   report(prefix, data) {
     if (data.failed) {
-      this.failReports.push([prefix, data]);
+      this.failReports.push([prefix, data, this._tapReporter.id]);
     }
     this._tapReporter.report(prefix, data);
   }
@@ -28,11 +28,14 @@ class Reporter {
 
     if (this.failReports.length > 0) {
       process.stdout.write("\nFailures:\n\n");
-      this.failReports.forEach(([prefix, data]) => {
+
+      this.failReports.forEach(([prefix, data, id]) => {
         if (process.env.GITHUB_ACTIONS) {
           process.stdout.write(`::error ::QUnit Test Failure: ${data.name}\n`);
         }
-        this.report(prefix, data);
+
+        this._tapReporter.id = id;
+        this._tapReporter.report(prefix, data);
       });
     }
   }

From 2bbacb69a717e220447866f57df977ea346582dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 Oct 2022 23:57:28 +0200
Subject: [PATCH 165/332] Build(deps): Bump ember-auto-import in
 /app/assets/javascripts (#18618)

Bumps [ember-auto-import](https://github.com/ef4/ember-auto-import/tree/HEAD/packages/ember-auto-import) from 2.4.2 to 2.4.3.
- [Release notes](https://github.com/ef4/ember-auto-import/releases)
- [Changelog](https://github.com/ef4/ember-auto-import/blob/main/packages/ember-auto-import/CHANGELOG.md)
- [Commits](https://github.com/ef4/ember-auto-import/commits/v2.4.3/packages/ember-auto-import)

---
updated-dependencies:
- dependency-name: ember-auto-import
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/admin/package.json                | 2 +-
 app/assets/javascripts/discourse-common/package.json     | 2 +-
 app/assets/javascripts/discourse-hbr/package.json        | 2 +-
 app/assets/javascripts/discourse-plugins/package.json    | 2 +-
 app/assets/javascripts/discourse-widget-hbs/package.json | 2 +-
 app/assets/javascripts/discourse/package.json            | 2 +-
 app/assets/javascripts/pretty-text/package.json          | 2 +-
 app/assets/javascripts/select-kit/package.json           | 2 +-
 app/assets/javascripts/truth-helpers/package.json        | 2 +-
 app/assets/javascripts/wizard/package.json               | 2 +-
 app/assets/javascripts/yarn.lock                         | 8 ++++----
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json
index aa8025a052..4d9622994c 100644
--- a/app/assets/javascripts/admin/package.json
+++ b/app/assets/javascripts/admin/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.74.0",
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index 54748e892f..1861ab8d22 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -21,7 +21,7 @@
     "@uppy/drop-target": "^1.1.3",
     "@uppy/utils": "^4.1.0",
     "@uppy/xhr-upload": "^2.1.2",
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "ember-resolver": "^8.0.3",
diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json
index b0fd547a63..f1277846df 100644
--- a/app/assets/javascripts/discourse-hbr/package.json
+++ b/app/assets/javascripts/discourse-hbr/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "handlebars": "^4.7.6",
diff --git a/app/assets/javascripts/discourse-plugins/package.json b/app/assets/javascripts/discourse-plugins/package.json
index 3f05f3dada..e57cc55bcc 100644
--- a/app/assets/javascripts/discourse-plugins/package.json
+++ b/app/assets/javascripts/discourse-plugins/package.json
@@ -9,7 +9,7 @@
   ],
   "repository": "",
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "discourse-widget-hbs": "1.0"
diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json
index a4e6228951..0290b8e32e 100644
--- a/app/assets/javascripts/discourse-widget-hbs/package.json
+++ b/app/assets/javascripts/discourse-widget-hbs/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "handlebars": "^4.7.6",
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index c1e070d853..fb8917ea83 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -45,7 +45,7 @@
     "discourse-ensure-deprecation-order": "^1.0.0",
     "discourse-hbr": "^1.0.0",
     "discourse-widget-hbs": "^1.0.0",
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-auto-import-chunks-json-generator": "^1.0.0",
     "ember-buffered-proxy": "^2.1.1",
     "ember-cached-decorator-polyfill": "^1.0.1",
diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json
index b87b985e87..c2817a55ca 100644
--- a/app/assets/javascripts/pretty-text/package.json
+++ b/app/assets/javascripts/pretty-text/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.74.0",
diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json
index 4404f1337d..eeaba25d81 100644
--- a/app/assets/javascripts/select-kit/package.json
+++ b/app/assets/javascripts/select-kit/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.74.0"
diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json
index 0bf0865fec..bf2bbc2606 100644
--- a/app/assets/javascripts/truth-helpers/package.json
+++ b/app/assets/javascripts/truth-helpers/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.74.0"
diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json
index 492f302899..6c0f1c383f 100644
--- a/app/assets/javascripts/wizard/package.json
+++ b/app/assets/javascripts/wizard/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.74.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 676e2eb7eb..dc0f7c22b3 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -4373,10 +4373,10 @@ ember-auto-import@^1.11.3:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.2.tgz#d4d3bc6885a11cf124f606f5c37169bdf76e37ae"
-  integrity sha512-REh+1aJWpTkvN42a/ga41OuRpUsSW7UQfPr2wPtYx56o/xoSNhVBXejy7yV9ObrkN7gogz6fs2xZwih5cOwpYg==
+ember-auto-import@^2.2.3, ember-auto-import@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.3.tgz#0ff8ebe37a2016dbad2ccc10c0ef2dfbd0289b55"
+  integrity sha512-yqtXDixgtBgaNIiz3DIIjJgpPoV5/UWBnsYIR/IxwDYpsGswyRWQ4D+IamkCDtaGDkZ7dNE9QZDBOrJCAG6KNA==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"

From 3d59f767ae7c97a987dca9d165e2108b039dde89 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 17 Oct 2022 10:13:34 +1100
Subject: [PATCH 166/332] FIX: remove RS384 and RS512 cose ciphers (#18619)

RS256 was added for Windows Hello and as a side effect we speculatively added
RS384 and RS512. These ciphers were not tested and are now failing on solo
keys. It may be the case that the ciphers are not configured correctly on
our side. It may be the case that this is a Solo key bug.

Regardless, we are removing the ciphers and will only consider adding them
again if absolutely needed.
---
 lib/freedom_patches/cose_rsapkcs1.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/freedom_patches/cose_rsapkcs1.rb b/lib/freedom_patches/cose_rsapkcs1.rb
index d407260dc8..f6964e1835 100644
--- a/lib/freedom_patches/cose_rsapkcs1.rb
+++ b/lib/freedom_patches/cose_rsapkcs1.rb
@@ -44,7 +44,5 @@ module COSE
     end
 
     register(RSAPKCS1.new(-257, 'RS256', hash_function: 'SHA256'))
-    register(RSAPKCS1.new(-258, 'RS384', hash_function: 'SHA384'))
-    register(RSAPKCS1.new(-259, 'RS512', hash_function: 'SHA512'))
   end
 end

From d1304ecb460c4e589bf4a85de3baa47dbe13bec4 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 17 Oct 2022 10:33:15 +0800
Subject: [PATCH 167/332] DEV: Move sidebar site settings to the sidebar
 category (#18596)

Sidebar category is only shown in the admin panel when `enable_experimental_sidebar_hamburger` site setting is enabled
---
 config/site_settings.yml                | 22 +++++-----
 lib/site_setting_extension.rb           | 54 ++++++++++++++-----------
 spec/lib/site_setting_extension_spec.rb | 20 +++++++++
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7d6f03510c..0ea994e947 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2033,6 +2033,18 @@ developer:
     default: false
     client: true
     hidden: true
+  enable_new_user_profile_nav_groups:
+    client: true
+    type: group_list
+    list_type: compact
+    default: ""
+    allow_any: false
+    refresh: true
+  include_associated_account_ids:
+    default: false
+    hidden: true
+
+sidebar:
   enable_sidebar:
     default: true
     client: true
@@ -2044,16 +2056,6 @@ developer:
     type: tag_list
     default: ""
     client: true
-  enable_new_user_profile_nav_groups:
-    client: true
-    type: group_list
-    list_type: compact
-    default: ""
-    allow_any: false
-    refresh: true
-  include_associated_account_ids:
-    default: false
-    hidden: true
 
 embedding:
   embed_by_username:
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 0a5699bbc1..4c215de835 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -234,36 +234,42 @@ module SiteSettingExtension
     }
 
     defaults.all(default_locale)
-      .reject { |s, _| !include_hidden && hidden_settings.include?(s) }
-      .map do |s, v|
+      .reject do |setting_name, _|
+        if !include_hidden && hidden_settings.include?(setting_name)
+          true
+        elsif categories[setting_name].to_s == "sidebar" && !SiteSetting.enable_experimental_sidebar_hamburger
+          true
+        else
+          false
+        end
+      end.map do |s, v|
+        type_hash = type_supervisor.type_hash(s)
+        default = defaults.get(s, default_locale).to_s
 
-      type_hash = type_supervisor.type_hash(s)
-      default = defaults.get(s, default_locale).to_s
+        value = public_send(s)
+        value = value.map(&:to_s).join("|") if type_hash[:type].to_s == "uploaded_image_list"
 
-      value = public_send(s)
-      value = value.map(&:to_s).join("|") if type_hash[:type].to_s == "uploaded_image_list"
+        if type_hash[:type].to_s == "upload" &&
+          default.to_i < Upload::SEEDED_ID_THRESHOLD
 
-      if type_hash[:type].to_s == "upload" &&
-         default.to_i < Upload::SEEDED_ID_THRESHOLD
+          default = default_uploads[default.to_i]
+        end
 
-        default = default_uploads[default.to_i]
-      end
+        opts = {
+          setting: s,
+          description: description(s),
+          default: default,
+          value: value.to_s,
+          category: categories[s],
+          preview: previews[s],
+          secret: secret_settings.include?(s),
+          placeholder: placeholder(s)
+        }.merge!(type_hash)
 
-      opts = {
-        setting: s,
-        description: description(s),
-        default: default,
-        value: value.to_s,
-        category: categories[s],
-        preview: previews[s],
-        secret: secret_settings.include?(s),
-        placeholder: placeholder(s)
-      }.merge!(type_hash)
+        opts[:plugin] = plugins[s] if plugins[s]
 
-      opts[:plugin] = plugins[s] if plugins[s]
-
-      opts
-    end.unshift(locale_setting_hash)
+        opts
+      end.unshift(locale_setting_hash)
   end
 
   def description(setting)
diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rb
index c26024b672..ad39c656ef 100644
--- a/spec/lib/site_setting_extension_spec.rb
+++ b/spec/lib/site_setting_extension_spec.rb
@@ -832,4 +832,24 @@ RSpec.describe SiteSettingExtension do
       end
     end
   end
+
+  describe 'sidebar category site settings' do
+    describe '.all_settings' do
+      before do
+        settings.setting(:test_setting, 88, category: :sidebar)
+      end
+
+      it 'does not include the sidebar category setting when enable_experimental_sidebar_hamburger site setting is disabled' do
+        SiteSetting.enable_experimental_sidebar_hamburger = false
+
+        expect(settings.all_settings.detect { |s| s[:setting] == :test_setting }).to eq(nil)
+      end
+
+      it 'includes the sidebar category setting when enable_experimental_sidebar_hamburger site setting is enabled' do
+        SiteSetting.enable_experimental_sidebar_hamburger = true
+
+        expect(settings.all_settings.detect { |s| s[:setting] == :test_setting }[:setting]).to eq(:test_setting)
+      end
+    end
+  end
 end

From ae6549a6ea78aee536c5096e10c10037ef69ff60 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 17 Oct 2022 12:08:15 +0800
Subject: [PATCH 168/332] FEATURE: Add sidebar link for admin to configure
 default categories (#18595)

Displays a sidebar section link to admin users when
`default_sidebar_categories` site setting has not been configured for the
site.

Internal Ref: /t/73500
---
 .../sidebar/user/categories-section.hbs       | 11 +++++++++
 .../sidebar/user/categories-section.js        |  6 ++++-
 .../sidebar-user-categories-section-test.js   | 23 ++++++++++++++++++-
 config/locales/client.en.yml                  |  1 +
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 4b09f94ee7..72708bf5f4 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -31,5 +31,16 @@
     {{/if}}
 
     <Sidebar::Common::AllCategoriesSectionLink />
+
+    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarCategories))}}
+      <Sidebar::SectionLink
+        @linkName="configure-default-sidebar-categories"
+        @content={{i18n "sidebar.sections.categories.configure_defaults"}}
+        @prefixType="icon"
+        @prefixValue="wrench"
+        @route="adminSiteSettingsCategory"
+        @model="sidebar"
+        @query={{hash filter="default_sidebar_categories"}} />
+    {{/if}}
   </Sidebar::Section>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
index a10320c114..f20fc093b1 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
@@ -49,13 +49,17 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
    * If a site has default sidebar categories configured, always show categories section for the user.
    */
   get shouldDisplay() {
-    if (this.siteSettings.default_sidebar_categories.length > 0) {
+    if (this.hasDefaultSidebarCategories) {
       return true;
     } else {
       return this.categories.length > 0;
     }
   }
 
+  get hasDefaultSidebarCategories() {
+    return this.siteSettings.default_sidebar_categories.length > 0;
+  }
+
   @action
   editTracked() {
     this.router.transitionTo("preferences.sidebar", this.currentUser);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 20a402d535..e1c07c679e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -25,7 +25,7 @@ acceptance(
       enable_sidebar: true,
     });
 
-    needs.user();
+    needs.user({ admin: false });
 
     test("uncategorized category is not shown", async function (assert) {
       const categories = Site.current().categories;
@@ -61,6 +61,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
   needs.user({
     sidebar_category_ids: [],
     sidebar_tags: [],
+    admin: false,
   });
 
   needs.settings({
@@ -544,4 +545,24 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
         initialCallbackCount
     );
   });
+
+  test("section link to admin site settings page when default sidebar categories have not been configured", async function (assert) {
+    setupUserSidebarCategories();
+    updateCurrentUser({ admin: true });
+
+    await visit("/");
+
+    assert.ok(
+      exists(".sidebar-section-link-configure-default-sidebar-categories"),
+      "section link to configure default sidebar categories is shown"
+    );
+
+    await click(".sidebar-section-link-configure-default-sidebar-categories");
+
+    assert.strictEqual(
+      currentURL(),
+      "/admin/site_settings/category/all_results?filter=default_sidebar_categories",
+      "it links to the admin site settings page correctly"
+    );
+  });
 });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3faf8f2d7e..8b5311771f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4194,6 +4194,7 @@ en:
           click_to_get_started: "Click here to get started."
           header_link_text: "Categories"
           header_action_title: "edit your sidebar categories"
+          configure_defaults: "Configure defaults"
         community:
           header_link_text: "Community"
           header_action_title: "create a new topic"

From fff575ffd21af59b8e474e5157e13adc016dbc67 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 17 Oct 2022 12:08:32 +0800
Subject: [PATCH 169/332] FEATURE: Add sidebar link for admin to configure
 default tags (#18593)

Displays a sidebar section link to admin users when
`default_sidebar_tags` site setting has not been configured for the
site.

Internal Ref: /t/73500
---
 .../components/sidebar/user/tags-section.hbs  | 11 ++++++++++
 .../components/sidebar/user/tags-section.js   |  6 +++++-
 .../sidebar-user-tags-section-test.js         | 20 +++++++++++++++++++
 config/locales/client.en.yml                  |  4 +++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
index 248a672f79..0086cdd58e 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
@@ -27,5 +27,16 @@
     {{/if}}
 
     <Sidebar::Common::AllTagsSectionLink />
+
+    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarTags))}}
+      <Sidebar::SectionLink
+        @linkName="configure-default-sidebar-tags"
+        @content={{i18n "sidebar.sections.tags.configure_defaults"}}
+        @prefixType="icon"
+        @prefixValue="wrench"
+        @route="adminSiteSettingsCategory"
+        @model="sidebar"
+        @query={{hash filter="default_sidebar_tags"}} />
+    {{/if}}
   </Sidebar::Section>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index 94e8a64b15..fcb60d9de5 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -71,13 +71,17 @@ export default class SidebarUserTagsSection extends Component {
    * If a site has default sidebar tags configured, always display the tags section.
    */
   get shouldDisplay() {
-    if (this.siteSettings.default_sidebar_tags.length > 0) {
+    if (this.hasDefaultSidebarTags) {
       return true;
     } else {
       return this.currentUser.sidebarTags.length > 0;
     }
   }
 
+  get hasDefaultSidebarTags() {
+    return this.siteSettings.default_sidebar_tags.length > 0;
+  }
+
   @action
   editTracked() {
     this.router.transitionTo("preferences.sidebar", this.currentUser);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index 707b11f80a..f3041590d8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -59,6 +59,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
       },
     ],
     display_sidebar_tags: true,
+    admin: false,
   });
 
   needs.pretender((server, helper) => {
@@ -423,4 +424,23 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
         initialCallbackCount
     );
   });
+
+  test("section link to admin site settings page when default sidebar tags have not been configured", async function (assert) {
+    updateCurrentUser({ admin: true });
+
+    await visit("/");
+
+    assert.ok(
+      exists(".sidebar-section-link-configure-default-sidebar-tags"),
+      "section link to configure default sidebar tags is shown"
+    );
+
+    await click(".sidebar-section-link-configure-default-sidebar-tags");
+
+    assert.strictEqual(
+      currentURL(),
+      "/admin/site_settings/category/all_results?filter=default_sidebar_tags",
+      "it links to the admin site settings page correctly"
+    );
+  });
 });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8b5311771f..8b97e26c1d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1177,7 +1177,7 @@ en:
       enable_quoting: "Enable quote reply for highlighted text"
       enable_defer: "Enable defer to mark topics unread"
       experimental_sidebar:
-        enable: "Enable experimental sidebar"
+        enable: "Enable sidebar"
         options: "Options"
         categories_section: "Categories Section"
         categories_section_instruction: "Selected categories will be displayed under Sidebar's categories section."
@@ -4189,6 +4189,7 @@ en:
           click_to_get_started: "Click here to get started."
           header_link_text: "Tags"
           header_action_title: "edit your sidebar tags"
+          configure_defaults: "Configure defaults"
         categories:
           none: "You have not added any categories."
           click_to_get_started: "Click here to get started."
@@ -5666,6 +5667,7 @@ en:
           search: "Search"
           groups: "Groups"
           dashboard: "Dashboard"
+          sidebar: "Sidebar"
         secret_list:
           invalid_input: "Input fields cannot be empty or contain vertical bar character."
         default_categories:

From 7e372b3a159aed6be414486ec3ef0e259ea66cb5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 17 Oct 2022 09:33:52 +0100
Subject: [PATCH 170/332] DEV: Restrict resolver lookups to known namespaces
 (#18599)

Ember's default resolver only looks for components/services/etc. which are namespaced under the app's `modulePrefix` (`discourse`, in our case). To use addon components/services/etc., the addon must re-export them in its `app/` directory.

In order to support plugins, our custom resolver does a 'suffix match'. This has an unintended side-effect of matching things which are not part of the discourse app or themes/plugins. We've come to rely on this for a few in-repo addons like `select-kit`, `admin` and `wizard`.

This unrestricted 'suffix matching' can cause some very unexpected behaviour. For example, the ember-inspector browser extension has a module called `ember_debug/service/session`. When looking up `service:session`, our resolver was choosing that third-party service over our own Session service. This means Discourse fails to boot when the Ember Inspector is open.

This commit restricts the 'suffix matching' to a known set of namespaces. This brings us one step closer to the default Ember Resolver implementation, and reduces the chance of unexpected behaviour like the ember-inspector issue.

This commit also updates the `dialog-holder` addon to export its service under the app directory, so that we don't need to account for it in the resolver. We may want to consider doing the same for things like `select-kit` and `truth-helpers`, but is beyond the scope of this commit.
---
 .../javascripts/discourse-common/addon/resolver.js  | 13 ++++++++++++-
 .../lib/dialog-holder/app/services/dialog.js        |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js

diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index 462bec5212..7fc67738b0 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -119,8 +119,19 @@ export function clearResolverOptions() {
 function lookupModuleBySuffix(suffix) {
   if (!moduleSuffixTrie) {
     moduleSuffixTrie = new SuffixTrie("/");
+    const searchPaths = [
+      "discourse/", // Includes themes/plugins
+      "discourse-common/",
+      "select-kit/",
+      "admin/",
+      "wizard/",
+      "truth-helpers/",
+    ];
     Object.keys(requirejs.entries).forEach((name) => {
-      if (!name.includes("/templates/")) {
+      if (
+        searchPaths.some((s) => name.startsWith(s)) &&
+        !name.includes("/templates/")
+      ) {
         moduleSuffixTrie.add(name);
       }
     });
diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js b/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js
new file mode 100644
index 0000000000..cf0c5483ac
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js
@@ -0,0 +1 @@
+export { default } from "dialog-holder/services/dialog";

From f5419521f058c7e48e732acfc10c060d9472e6e6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 17 Oct 2022 09:38:20 +0100
Subject: [PATCH 171/332] DEV: Support colocation of component templates in
 plugins (#18598)

This allows plugins to colocate component JS and HBS under `/plugins/{name}/assets/javascripts/discourse/components`.

`discourse-presence` is updated to use this new pattern, which also serves as an integration test for this part of the build pipeline.
---
 .../colocated-template-compiler.js            | 19 +++++++++++++++++++
 .../javascripts/discourse-plugins/index.js    |  3 +++
 .../components/composer-presence-display.hbs  |  0
 .../components/topic-presence-display.hbs     |  0
 .../before-composer-controls/presence.hbs     |  0
 .../topic-above-footer-buttons/presence.hbs   |  0
 6 files changed, 22 insertions(+)
 create mode 100644 app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
 rename plugins/discourse-presence/assets/javascripts/discourse/{templates => }/components/composer-presence-display.hbs (100%)
 rename plugins/discourse-presence/assets/javascripts/discourse/{templates => }/components/topic-presence-display.hbs (100%)
 rename plugins/discourse-presence/assets/javascripts/discourse/{templates => }/connectors/before-composer-controls/presence.hbs (100%)
 rename plugins/discourse-presence/assets/javascripts/discourse/{templates => }/connectors/topic-above-footer-buttons/presence.hbs (100%)

diff --git a/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js b/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
new file mode 100644
index 0000000000..2cc0759cf3
--- /dev/null
+++ b/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
@@ -0,0 +1,19 @@
+const ColocatedTemplateProcessor = require("ember-cli-htmlbars/lib/colocated-broccoli-plugin");
+
+module.exports = class DiscoursePluginColocatedTemplateProcessor extends (
+  ColocatedTemplateProcessor
+) {
+  detectRootName() {
+    const entries = this.currentEntries().filter((e) => !e.isDirectory());
+
+    const path = entries[0]?.relativePath;
+
+    const match = path?.match(
+      /^discourse\/plugins\/(?<name>[^/]+)\/discourse\//
+    );
+
+    if (match) {
+      return `discourse/plugins/${match.groups.name}/discourse`;
+    }
+  }
+};
diff --git a/app/assets/javascripts/discourse-plugins/index.js b/app/assets/javascripts/discourse-plugins/index.js
index 0f3612cbfe..996f6f08d9 100644
--- a/app/assets/javascripts/discourse-plugins/index.js
+++ b/app/assets/javascripts/discourse-plugins/index.js
@@ -7,6 +7,7 @@ const mergeTrees = require("broccoli-merge-trees");
 const fs = require("fs");
 const concat = require("broccoli-concat");
 const RawHandlebarsCompiler = require("discourse-hbr/raw-handlebars-compiler");
+const DiscoursePluginColocatedTemplateProcessor = require("./colocated-template-compiler");
 
 function fixLegacyExtensions(tree) {
   return new Funnel(tree, {
@@ -169,6 +170,8 @@ module.exports = {
     tree = namespaceModules(tree, pluginName);
 
     tree = RawHandlebarsCompiler(tree);
+
+    tree = new DiscoursePluginColocatedTemplateProcessor(tree);
     tree = this.compileTemplates(tree);
 
     tree = this.processedAddonJsFiles(tree);
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs
similarity index 100%
rename from plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
rename to plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs
similarity index 100%
rename from plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
rename to plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/connectors/before-composer-controls/presence.hbs
similarity index 100%
rename from plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs
rename to plugins/discourse-presence/assets/javascripts/discourse/connectors/before-composer-controls/presence.hbs
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/connectors/topic-above-footer-buttons/presence.hbs
similarity index 100%
rename from plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
rename to plugins/discourse-presence/assets/javascripts/discourse/connectors/topic-above-footer-buttons/presence.hbs

From 4b4dbbf58066cb065e2f99e46d0fbade3dcc23d9 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 17 Oct 2022 07:07:46 -0700
Subject: [PATCH 172/332] A11Y: Improve accessibility in WHCM themes (#18606)

---
 app/assets/stylesheets/common.scss            |  1 +
 .../stylesheets/common/base/search.scss       |  1 +
 .../common/components/buttons.scss            | 11 ++++++++++
 app/assets/stylesheets/common/whcm.scss       | 21 +++++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 app/assets/stylesheets/common/whcm.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index df03d36c6b..f7ea5d544e 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -4,6 +4,7 @@
 @import "vendor/pikaday";
 @import "vendor/tippy";
 @import "vendor/svg-arrow";
+@import "common/whcm";
 @import "common/foundation/helpers";
 @import "common/foundation/base";
 @import "common/select-kit/_index";
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index ac8b7a9688..4e8657c3f9 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -163,6 +163,7 @@
         padding-top: 0.25em;
         padding-bottom: 0.25em;
         &:focus-visible {
+          outline: 2px solid transparent;
           background-color: var(--tertiary-very-low);
         }
       }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 3dfb2f2d7f..aa341987d7 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -27,6 +27,10 @@
     color: $icon-color;
     margin-right: 0.45em;
     transition: color 0.25s;
+    // For Windows High Contrast (see whcm.scss for more)
+    @media (forced-colors: active) {
+      color: ButtonText;
+    }
   }
   .d-button-label + .d-icon {
     margin-left: 0.45em;
@@ -42,6 +46,10 @@
     color: $hover-text-color;
     .d-icon {
       color: $hover-icon-color;
+      // For Windows High Contrast (see whcm.scss for more)
+      @media (forced-colors: active) {
+        color: Highlight;
+      }
     }
   }
   &:focus {
@@ -50,6 +58,9 @@
     color: $hover-text-color;
     .d-icon {
       color: $hover-icon-color;
+      @media (forced-colors: active) {
+        color: Highlight;
+      }
     }
   }
   &[href] {
diff --git a/app/assets/stylesheets/common/whcm.scss b/app/assets/stylesheets/common/whcm.scss
new file mode 100644
index 0000000000..19ef0644cb
--- /dev/null
+++ b/app/assets/stylesheets/common/whcm.scss
@@ -0,0 +1,21 @@
+// Overrides for Windows High Contrast Mode
+
+/*
+  Some @media (forced-colors: active) {} styles
+  have also been used inside mixins in:
+  - common/components/buttons.scss
+
+  See file above for overrides.
+*/
+
+// Select Kit
+.select-kit {
+  .select-kit-row {
+    &:hover,
+    &:focus {
+      @media (forced-colors: active) {
+        outline: 2px auto transparent;
+      }
+    }
+  }
+}

From 731c625042876d3d78ae60dcdaed346899a5823a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 17 Oct 2022 15:10:17 +0100
Subject: [PATCH 173/332] DEV: Ensure getter can always return without error
 (#18621)

Normally, arguments passed to components are lazily evaluated. `get prefixElementColors` will only be evaluated for `@prefixType="span"`. However, when using the Ember Inspector in development, arguments are eagerly evaluated and their values displayed in the inspector. Therefore we need to make sure that getters can always be evaluated without exceptions being thrown.
---
 .../discourse/app/components/sidebar/section-link.js          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index 8dd0574aa9..e68e31c0d0 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -52,6 +52,10 @@ export default class SectionLink extends Component {
   }
 
   get prefixElementColors() {
+    if (!this.args.prefixElementColors) {
+      return;
+    }
+
     const prefixElementColors = this.args.prefixElementColors.filter((color) =>
       color?.slice(0, 6)
     );

From 190dc4a94a04caec6fd6b52bb115399944bb2c6a Mon Sep 17 00:00:00 2001
From: emmanuel-ferdman <35470921+emmanuel-ferdman@users.noreply.github.com>
Date: Mon, 17 Oct 2022 20:27:22 +0300
Subject: [PATCH 174/332] FIX: adjust the users per trust level cells in RTL
 mode (#18605)

---
 app/assets/stylesheets/common/admin/dashboard.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index fd8c9f5601..ad5a1ce4c9 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -440,6 +440,11 @@
         margin-left: 5px;
       }
     }
+
+    .value {
+      border-radius: 9px 0 0 9px;
+      padding: 0 5px 0 8px;
+    }
   }
 }
 

From 1d91b222dae6d0709d187f40d839320389675a5d Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 17 Oct 2022 13:04:34 -0500
Subject: [PATCH 175/332] UX: Welcome CTA edits (#18582)

---
 .../app/controllers/discovery/topics.js       | 13 ++++-
 .../components/welcome-topic-banner.hbs       |  2 +-
 .../acceptance/welcome-topic-banner-test.js   | 55 ++++++++++++++++++-
 .../stylesheets/desktop/topic-list.scss       |  7 ++-
 4 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index 3e90fd42a8..c1f500a80b 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -24,10 +24,17 @@ const controllerOpts = {
   showTopicPostBadges: not("new"),
   redirectedReason: alias("currentUser.redirected_to_top.reason"),
 
-  @discourseComputed("model.filter", "site.show_welcome_topic_banner")
-  showEditWelcomeTopicBanner(filter, showWelcomeTopicBanner) {
+  @discourseComputed(
+    "model.filter",
+    "site.show_welcome_topic_banner",
+    "model.listParams.f"
+  )
+  showEditWelcomeTopicBanner(filter, showWelcomeTopicBanner, hasListParams) {
     return (
-      this.currentUser?.staff && filter === "latest" && showWelcomeTopicBanner
+      this.currentUser?.staff &&
+      filter === "latest" &&
+      showWelcomeTopicBanner &&
+      !hasListParams
     );
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
index 2100624718..be51584839 100644
--- a/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
@@ -3,5 +3,5 @@
     <h1 class="welcome-cta__title">{{i18n "welcome_topic_banner.title"}}</h1>
     <p class="welcome-cta__description">{{i18n "welcome_topic_banner.description"}}</p>
   </div>
-  <DButton @class="btn-primary welcome-cta__button" @action={{action "editWelcomeTopic"}} @label="welcome_topic_banner.button_title" />
+  <DButton @class="btn-primary welcome-cta__button" @action={{action "editWelcomeTopic"}} @label="welcome_topic_banner.button_title" @icon="pencil-alt" />
 </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js b/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js
index 273b85ecf0..b09dee87c3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js
@@ -1,17 +1,66 @@
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
+import Site from "discourse/models/site";
 
 acceptance("Welcome Topic Banner", function (needs) {
-  needs.user();
+  needs.user({ admin: true });
   needs.site({ show_welcome_topic_banner: true });
 
-  test("Navigation", async function (assert) {
-    await visit("/");
+  test("Is shown on latest", async function (assert) {
+    await visit("/latest");
     assert.ok(exists(".welcome-cta"), "has the welcome topic banner");
     assert.ok(
       exists("button.welcome-cta__button"),
       "has the welcome topic edit button"
     );
   });
+
+  test("Does not show if edited", async function (assert) {
+    const site = Site.current();
+    site.set("show_welcome_topic_banner", false);
+
+    await visit("/latest");
+    assert.ok(!exists(".welcome-cta"), "has the welcome topic banner");
+  });
+
+  test("Does not show on latest with query param tracked present", async function (assert) {
+    await visit("/latest?f=tracked");
+    assert.ok(
+      !exists(".welcome-cta"),
+      "does not have the welcome topic banner"
+    );
+  });
+
+  test("Does not show on latest with query param watched present", async function (assert) {
+    await visit("/latest?f=watched");
+    assert.ok(
+      !exists(".welcome-cta"),
+      "does not have the welcome topic banner"
+    );
+  });
+
+  test("Does not show on /categories page", async function (assert) {
+    await visit("/categories");
+    assert.ok(
+      !exists(".welcome-cta"),
+      "does not have the welcome topic banner"
+    );
+  });
+
+  test("Does not show on /top page", async function (assert) {
+    await visit("/top");
+    assert.ok(
+      !exists(".welcome-cta"),
+      "does not have the welcome topic banner"
+    );
+  });
+
+  test("Does not show on /unseen page", async function (assert) {
+    await visit("/unseen");
+    assert.ok(
+      !exists(".welcome-cta"),
+      "does not have the welcome topic banner"
+    );
+  });
 });
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index efdea3f56b..e91f197542 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -262,14 +262,15 @@
 
 .welcome-cta {
   background-color: var(--secondary);
-  border: 1px solid var(--primary-low-mid);
-  box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.12);
+  border: 1px solid var(--primary-low);
+  box-shadow: shadow("menu-panel");
+  border-radius: 4px;
   padding: 12px 20px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   position: absolute;
-  top: 44px;
+  top: 48px;
   width: calc(100% - 40px);
   z-index: z("usercard");
   &__content {

From 3a204f72d3ee82fa8fa253dc513bdd310de21117 Mon Sep 17 00:00:00 2001
From: Pixlz <91509874+darkpixlz@users.noreply.github.com>
Date: Mon, 17 Oct 2022 14:09:49 -0400
Subject: [PATCH 176/332] UX: Prevent reply to name from being longer than
 400px (#18623)

---
 app/assets/stylesheets/common/base/topic-post.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index e228dd2dd7..9aebb72bd7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1349,6 +1349,8 @@ a.mention-group {
   display: flex;
   align-items: center;
   margin-right: 2em;
+  max-width: 400px;
+  overflow: hidden;
 
   img {
     margin: 0 0.25em;

From 1b22ff461ba443fba46c9e13bc7cf16867bef21b Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 17 Oct 2022 11:40:03 -0700
Subject: [PATCH 177/332] FIX: Prevent layout shift while traversing dropdown
 (#18624)

---
 .../select-kit/addon/components/select-kit/select-kit-filter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
index a59224bb6f..d8782f9ec9 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
@@ -83,11 +83,13 @@ export default Component.extend(UtilsMixin, {
 
     if (event.key === "ArrowUp") {
       this.selectKit.highlightLast();
+      event.preventDefault();
       return false;
     }
 
     if (event.key === "ArrowDown") {
       this.selectKit.highlightFirst();
+      event.preventDefault();
       return false;
     }
 

From de9ed8792a93cd7c602d57b0d6df2bb816b15dd1 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 17 Oct 2022 14:08:59 -0700
Subject: [PATCH 178/332] A11Y: Add `href` to frequent poster avatars (#18627)

---
 app/assets/javascripts/discourse/app/widgets/topic-map.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js
index 69439af54d..d408931ded 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-map.js
@@ -5,6 +5,7 @@ import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { replaceEmoji } from "discourse/widgets/emoji";
 import autoGroupFlairForUser from "discourse/lib/avatar-flair";
+import { userPath } from "discourse/lib/url";
 
 const LINKS_SHOWN = 5;
 
@@ -87,12 +88,15 @@ createWidget("topic-participant", {
         linkContents.push(this.attach("avatar-flair", autoFlairAttrs));
       }
     }
-
     return h(
       "a.poster.trigger-user-card",
       {
         className: state.toggled ? "toggled" : null,
-        attributes: { title: attrs.username, "data-user-card": attrs.username },
+        attributes: {
+          title: attrs.username,
+          "data-user-card": attrs.username,
+          href: userPath(attrs.username),
+        },
       },
       linkContents
     );

From 868ab26fb3fd9be83c7925d96b500896a0065835 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:44:30 -0500
Subject: [PATCH 179/332] UX: Simplify bootstrap mode visuals (#18626)

---
 .../discourse/app/components/d-navigation.js  |  5 +++++
 .../components/bootstrap-mode-notice.hbs      | 10 +---------
 .../app/templates/components/d-navigation.hbs | 13 ++++++++++++
 .../acceptance/bootstrap-mode-notice-test.js  | 20 +------------------
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index 2153fc5f9c..34c4c75321 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -5,6 +5,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { inject as service } from "@ember/service";
+import showModal from "discourse/lib/show-modal";
 
 export default Component.extend(FilterModeMixin, {
   router: service(),
@@ -162,5 +163,9 @@ export default Component.extend(FilterModeMixin, {
         this.createTopic();
       }
     },
+
+    inviteUsers() {
+      showModal("create-invite");
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
index aa9fb8b0b4..66b0a9e8b7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
@@ -1,13 +1,5 @@
 <div class="row bootstrap-mode-notice">
   <div class="alert alert-info alert-bootstrap-mode">
-    <div class="col-text">
-      {{this.message}}
-    </div>
-    <div class="col-button">
-      <div class="alert--button"><DButton @icon="user-plus" @action={{this.inviteUsers}} @class="btn-primary bootstrap-invite-button" @label="bootstrap_invite_button_title" /></div>
-      {{#if this.site.wizard_required}}
-        <div class="alert--link"><a class="bootstrap-wizard-link" href="/wizard">{{i18n "bootstrap_wizard_link_title"}}</a></div>
-      {{/if}}
-    </div>
+    {{this.message}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 2e793cfaa8..d4efd2c880 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -39,6 +39,19 @@
       category=this.category
       tag=this.tag}} />
 
+  {{#if (and (or this.site.siteSettings.invite_only this.site.siteSettings.bootstrap_mode_enabled) this.currentUser.admin)}}
+    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn-primary" @title="bootstrap_invite_button_title" />
+  {{/if}}
+
+  {{#if (and this.site.siteSettings.wizard_required this.currentUser.admin)}}
+    {{#unless this.site.mobileView}}
+      <LinkTo @route="wizard.index" class="btn-primary bootstrap-wizard-link">
+        {{d-icon "pencil-alt"}}
+        {{i18n "bootstrap_wizard_link_title"}}
+      </LinkTo>
+    {{/unless}}
+  {{/if}}
+
   <CreateTopicButton @canCreateTopic={{this.canCreateTopic}} @action={{action "clickCreateTopicButton"}} @disabled={{this.createTopicButtonDisabled}} @label={{this.createTopicLabel}} @btnClass={{this.createTopicClass}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} />
 
   <PluginOutlet @name="after-create-topic-button" @connectorTagName="div" @tagName="" @args={{hash
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
index 9d8812ccf3..036b12bcca 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
@@ -1,6 +1,6 @@
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, currentURL, settled, visit } from "@ember/test-helpers";
+import { settled, visit } from "@ember/test-helpers";
 import { set } from "@ember/object";
 
 acceptance("Bootstrap Mode Notice", function (needs) {
@@ -17,24 +17,6 @@ acceptance("Bootstrap Mode Notice", function (needs) {
       exists(".bootstrap-mode-notice"),
       "has the bootstrap mode notice"
     );
-    assert.ok(
-      exists(".bootstrap-invite-button"),
-      "bootstrap notice has invite button"
-    );
-    assert.ok(
-      exists(".bootstrap-wizard-link"),
-      "bootstrap notice has wizard link"
-    );
-
-    await click(".bootstrap-invite-button");
-    assert.ok(exists(".create-invite-modal"), "opens create invite modal");
-
-    await click(".bootstrap-wizard-link");
-    assert.strictEqual(
-      currentURL(),
-      "/wizard/steps/hello-world",
-      "it transitions to the wizard page"
-    );
 
     await visit("/");
     set(this.siteSettings, "bootstrap_mode_enabled", false);

From 124ee4b7bb839b4294962e128b0dccf2cdbe5cd9 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 17 Oct 2022 17:26:34 -0600
Subject: [PATCH 180/332] Revert "FEATURE: Hide Privacy Policy and TOS topics
 (#18533)" (#18633)

This reverts commit 49abcf965bfc9fc8728a3919dbd820c5bf59617a.
---
 lib/topic_query.rb                    |  3 ---
 spec/requests/list_controller_spec.rb | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index cc66f51178..ec75d18206 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -438,9 +438,6 @@ class TopicQuery
 
     topics = topics.to_a
 
-    # These don't need to be shown in the topic list
-    topics = topics.reject { |t| [SiteSetting.privacy_topic_id, SiteSetting.tos_topic_id].include?(t[:id]) }
-
     if options[:preload_posters]
       user_ids = []
       topics.each do |ft|
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 30e948f88b..f105b1e8b0 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -79,19 +79,6 @@ RSpec.describe ListController do
       expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
 
-    it 'filters out privacy policy and tos topics' do
-      tos_topic = create_topic
-      SiteSetting.tos_topic_id = tos_topic.id
-
-      pp_topic = create_topic
-      SiteSetting.privacy_topic_id = pp_topic.id
-
-      get "/latest.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["topic_list"]["topics"].length).to eq(1)
-    end
-
     it "shows correct title if topic list is set for homepage" do
       get "/latest"
 

From 570bb68579e67b063384ca8f9612cc2aca2c1f91 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 17 Oct 2022 18:07:53 -0600
Subject: [PATCH 181/332] FIX: Reset general_category_id if the general
 category was deleted (#18634)

On sites that were seeded with a general category id and that category
was deleted prior to the fix in efb116d2bd4d1e02df9ddf79316112e0555b4c1e
this migration will reset the SiteSetting.general_category_id back to
the default because there is no longer a corresponding category for it.

This is to fix a composer bug that occurs if there is a
SiteSetting.general_category_id value present that doesn't match an
existing category.
---
 .../20221017223309_fix_general_category_id.rb | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 db/migrate/20221017223309_fix_general_category_id.rb

diff --git a/db/migrate/20221017223309_fix_general_category_id.rb b/db/migrate/20221017223309_fix_general_category_id.rb
new file mode 100644
index 0000000000..f51f8f0a49
--- /dev/null
+++ b/db/migrate/20221017223309_fix_general_category_id.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+## If the *new* seeded General category was deleted before
+# commit efb116d2bd4d1e02df9ddf79316112e0555b4c1e the site will need this migration
+# to reset the general_category_id setting.
+
+class FixGeneralCategoryId < ActiveRecord::Migration[7.0]
+  def up
+    general_category_id = DB.query_single("SELECT value FROM site_settings WHERE name = 'general_category_id'")
+    return if general_category_id.blank? || general_category_id[0].to_i < 0
+    matching_category_id = DB.query_single("SELECT id FROM categories WHERE id = #{general_category_id[0]}")
+
+    # If the general_category_id has been set to something other than the default and there isn't a matching
+    # category to go with it we should set it back to the default.
+    if general_category_id[0].to_i > 0 && matching_category_id.blank?
+      execute "UPDATE site_settings SET value = '-1', updated_at = now() WHERE name = 'general_category_id';"
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From 0fe9095bad30ee9a4a15d60b95da77f291e6acaa Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 17 Oct 2022 20:01:16 -0500
Subject: [PATCH 182/332] UX: Change button to grey (#18635)

---
 .../discourse/app/templates/components/d-navigation.hbs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index d4efd2c880..d329f60491 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -40,7 +40,7 @@
       tag=this.tag}} />
 
   {{#if (and (or this.site.siteSettings.invite_only this.site.siteSettings.bootstrap_mode_enabled) this.currentUser.admin)}}
-    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn-primary" @title="bootstrap_invite_button_title" />
+    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn" @title="bootstrap_invite_button_title" />
   {{/if}}
 
   {{#if (and this.site.siteSettings.wizard_required this.currentUser.admin)}}

From 7881a6bd2f5c270767c2342a7807be12b9fb33d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:33:39 +0800
Subject: [PATCH 183/332] Build(deps): Bump qunit from 2.19.1 to 2.19.2 in
 /app/assets/javascripts (#18631)

Bumps [qunit](https://github.com/qunitjs/qunit) from 2.19.1 to 2.19.2.
- [Release notes](https://github.com/qunitjs/qunit/releases)
- [Changelog](https://github.com/qunitjs/qunit/blob/main/History.md)
- [Commits](https://github.com/qunitjs/qunit/compare/2.19.1...2.19.2)

---
updated-dependencies:
- dependency-name: qunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index fb8917ea83..8a79bc3d94 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -80,7 +80,7 @@
     "node-fetch": "^2.6.6",
     "pretender": "^3.4.7",
     "pretty-text": "^1.0.0",
-    "qunit": "^2.19.1",
+    "qunit": "^2.19.2",
     "qunit-dom": "^2.0.0",
     "sass": "^1.55.0",
     "select-kit": "^1.0.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index dc0f7c22b3..107958369f 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -8995,10 +8995,10 @@ qunit-dom@^2.0.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
-qunit@^2.19.1:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.1.tgz#eb1afd188da9e47f07c13aa70461a1d9c4505490"
-  integrity sha512-gSGuw0vErE/rNjnlBW/JmE7NNubBlGrDPQvsug32ejYhcVFuZec9yoU0+C30+UgeCGwq6Ap89K65dMGo+kDGZQ==
+qunit@^2.19.2:
+  version "2.19.2"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.2.tgz#0b2388fd14ea8b592792b538bf31cbd20b72bfd3"
+  integrity sha512-D575YwUeTFvYu9OrCitmnZ24QkcuwwLj3vtMRLHGUvme4oVljna4Qttm19BBDC4w/7wAZr2/QvbvWN6I4inJYg==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"

From b8fcf1932e49012a5d8b9dbe0f086596d2afdf68 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 17 Oct 2022 18:34:02 -0700
Subject: [PATCH 184/332] A11Y: Bookmarks modal (#18630)

* A11Y: Add label to delete button

* A11Y: Add title attribute to options button
---
 .../discourse/app/templates/components/bookmark.hbs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
index 887350ee2f..ec7bbac64d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
@@ -9,7 +9,7 @@
 
   <div class="control-group bookmark-name-wrap">
     <Input id="bookmark-name" @value={{this.model.name}} name="bookmark-name" class="bookmark-name" @enter={{action "saveAndClose"}} placeholder={{i18n "post.bookmarks.name_placeholder"}} maxlength="100" />
-    <DButton @icon="cog" @action={{action "toggleShowOptions"}} @class="bookmark-options-button" @ariaLabel="post.bookmarks.options" />
+    <DButton @icon="cog" @action={{action "toggleShowOptions"}} @class="bookmark-options-button" @ariaLabel="post.bookmarks.options" @title="post.bookmarks.options" />
   </div>
 
   {{#if this.showOptions}}
@@ -42,7 +42,7 @@
     <DButton @id="save-bookmark" @label="bookmarks.save" @class="btn-primary" @action={{action "saveAndClose"}} />
     <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
     {{#if this.showDelete}}
-      <DButton @id="delete-bookmark" @icon="trash-alt" @class="delete-bookmark btn-danger" @action={{action "delete"}} />
+      <DButton @id="delete-bookmark" @icon="trash-alt" @class="delete-bookmark btn-danger" @action={{action "delete"}} @ariaLabel="post.bookmarks.actions.delete_bookmark.name" @title="post.bookmarks.actions.delete_bookmark.name" />
     {{/if}}
   </div>
 </ConditionalLoadingSpinner>

From dd6d26847f223f2b7f36042c931e34d11f26016f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:34:22 +0800
Subject: [PATCH 185/332] Build(deps): Bump rubocop-ast from 1.21.0 to 1.22.0
 (#18628)

Bumps [rubocop-ast](https://github.com/rubocop/rubocop-ast) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/rubocop/rubocop-ast/releases)
- [Changelog](https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-ast/compare/v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: rubocop-ast
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 6a78e19886..1529a77ae2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -415,7 +415,7 @@ GEM
       rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.22.0)
       parser (>= 3.1.1.0)
     rubocop-discourse (3.0)
       rubocop (>= 1.1.0)

From 4907b7fa1dd9e84b048f07ccc9d1059fbb406d6d Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 17 Oct 2022 18:36:18 -0700
Subject: [PATCH 186/332] DEV: Listen for escape key on hamburger & user menu
 (#18629)

---
 .../discourse/app/widgets/hamburger-menu.js          |  8 ++++++++
 .../javascripts/discourse/app/widgets/user-menu.js   |  8 ++++++++
 .../tests/acceptance/hamburger-menu-test.js          | 12 +++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index 14b2848ebe..2edd4b23a5 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -400,4 +400,12 @@ export default createWidget("hamburger-menu", {
       this.sendWidgetAction("toggleHamburger");
     }
   },
+
+  keyDown(e) {
+    if (e.key === "Escape") {
+      this.sendWidgetAction("toggleHamburger");
+      e.preventDefault();
+      return false;
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
index 49e589e767..89aaa688aa 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js
@@ -313,6 +313,14 @@ export default createWidget("user-menu", {
     }
   },
 
+  keyDown(e) {
+    if (e.key === "Escape") {
+      this.sendWidgetAction("toggleUserMenu");
+      e.preventDefault();
+      return false;
+    }
+  },
+
   quickAccess(type) {
     if (this.state.currentQuickAccess !== type) {
       this.state.currentQuickAccess = type;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
index 4d9fe1b5df..364118c49e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
@@ -1,9 +1,10 @@
 import {
   acceptance,
+  exists,
   query,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
+import { click, triggerKeyEvent, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance(
@@ -26,3 +27,12 @@ acceptance(
     });
   }
 );
+
+acceptance("Hamburger Menu accessibility", function () {
+  test("Escape key closes hamburger menu", async function (assert) {
+    await visit("/");
+    await click("#toggle-hamburger-menu");
+    await triggerKeyEvent(".hamburger-panel", "keydown", "Escape");
+    assert.ok(!exists(".hamburger-panel"), "Esc closes the hamburger panel");
+  });
+});

From a6d5b82886e75cf2ff307d6777c2d29cbf37159d Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:18:11 -0500
Subject: [PATCH 187/332] Revert "UX: Change button to grey (#18635)" (#18637)

This reverts commit 0fe9095bad30ee9a4a15d60b95da77f291e6acaa.
---
 .../discourse/app/templates/components/d-navigation.hbs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index d329f60491..d4efd2c880 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -40,7 +40,7 @@
       tag=this.tag}} />
 
   {{#if (and (or this.site.siteSettings.invite_only this.site.siteSettings.bootstrap_mode_enabled) this.currentUser.admin)}}
-    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn" @title="bootstrap_invite_button_title" />
+    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn-primary" @title="bootstrap_invite_button_title" />
   {{/if}}
 
   {{#if (and this.site.siteSettings.wizard_required this.currentUser.admin)}}

From daa8aedccfe71c58e6efb45bbad69c93a258910a Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:19:15 -0500
Subject: [PATCH 188/332] Revert "UX: Simplify bootstrap mode visuals (#18626)"
 (#18638)

This reverts commit 868ab26fb3fd9be83c7925d96b500896a0065835.
---
 .../discourse/app/components/d-navigation.js  |  5 -----
 .../components/bootstrap-mode-notice.hbs      | 10 +++++++++-
 .../app/templates/components/d-navigation.hbs | 13 ------------
 .../acceptance/bootstrap-mode-notice-test.js  | 20 ++++++++++++++++++-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index 34c4c75321..2153fc5f9c 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -5,7 +5,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { inject as service } from "@ember/service";
-import showModal from "discourse/lib/show-modal";
 
 export default Component.extend(FilterModeMixin, {
   router: service(),
@@ -163,9 +162,5 @@ export default Component.extend(FilterModeMixin, {
         this.createTopic();
       }
     },
-
-    inviteUsers() {
-      showModal("create-invite");
-    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
index 66b0a9e8b7..aa9fb8b0b4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
@@ -1,5 +1,13 @@
 <div class="row bootstrap-mode-notice">
   <div class="alert alert-info alert-bootstrap-mode">
-    {{this.message}}
+    <div class="col-text">
+      {{this.message}}
+    </div>
+    <div class="col-button">
+      <div class="alert--button"><DButton @icon="user-plus" @action={{this.inviteUsers}} @class="btn-primary bootstrap-invite-button" @label="bootstrap_invite_button_title" /></div>
+      {{#if this.site.wizard_required}}
+        <div class="alert--link"><a class="bootstrap-wizard-link" href="/wizard">{{i18n "bootstrap_wizard_link_title"}}</a></div>
+      {{/if}}
+    </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index d4efd2c880..2e793cfaa8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -39,19 +39,6 @@
       category=this.category
       tag=this.tag}} />
 
-  {{#if (and (or this.site.siteSettings.invite_only this.site.siteSettings.bootstrap_mode_enabled) this.currentUser.admin)}}
-    <DButton @icon="user-plus" @action={{action "inviteUsers"}} @class="btn-primary" @title="bootstrap_invite_button_title" />
-  {{/if}}
-
-  {{#if (and this.site.siteSettings.wizard_required this.currentUser.admin)}}
-    {{#unless this.site.mobileView}}
-      <LinkTo @route="wizard.index" class="btn-primary bootstrap-wizard-link">
-        {{d-icon "pencil-alt"}}
-        {{i18n "bootstrap_wizard_link_title"}}
-      </LinkTo>
-    {{/unless}}
-  {{/if}}
-
   <CreateTopicButton @canCreateTopic={{this.canCreateTopic}} @action={{action "clickCreateTopicButton"}} @disabled={{this.createTopicButtonDisabled}} @label={{this.createTopicLabel}} @btnClass={{this.createTopicClass}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} />
 
   <PluginOutlet @name="after-create-topic-button" @connectorTagName="div" @tagName="" @args={{hash
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
index 036b12bcca..9d8812ccf3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
@@ -1,6 +1,6 @@
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { settled, visit } from "@ember/test-helpers";
+import { click, currentURL, settled, visit } from "@ember/test-helpers";
 import { set } from "@ember/object";
 
 acceptance("Bootstrap Mode Notice", function (needs) {
@@ -17,6 +17,24 @@ acceptance("Bootstrap Mode Notice", function (needs) {
       exists(".bootstrap-mode-notice"),
       "has the bootstrap mode notice"
     );
+    assert.ok(
+      exists(".bootstrap-invite-button"),
+      "bootstrap notice has invite button"
+    );
+    assert.ok(
+      exists(".bootstrap-wizard-link"),
+      "bootstrap notice has wizard link"
+    );
+
+    await click(".bootstrap-invite-button");
+    assert.ok(exists(".create-invite-modal"), "opens create invite modal");
+
+    await click(".bootstrap-wizard-link");
+    assert.strictEqual(
+      currentURL(),
+      "/wizard/steps/hello-world",
+      "it transitions to the wizard page"
+    );
 
     await visit("/");
     set(this.siteSettings, "bootstrap_mode_enabled", false);

From 243efa89318d0de1b67aba9087c58c252a1d540a Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 18 Oct 2022 13:21:52 +1100
Subject: [PATCH 189/332] FEATURE: allow user to set preferred sidebar list
 destination (#18594)

User can choose between latest or new/unread and that preference will affect behavior of sidebar links.
---
 .../sidebar/common/categories-section.js      |   1 +
 .../app/controllers/preferences/sidebar.js    |  20 +++
 .../everything-section-link.js                |   9 ++
 .../category-section-link.js                  |  12 +-
 .../javascripts/discourse/app/models/user.js  |  13 +-
 .../app/routes/preferences-sidebar.js         |   1 +
 .../app/templates/preferences/sidebar.hbs     |   9 ++
 .../sidebar-user-categories-section-test.js   | 119 ++++++++++++++++++
 .../sidebar-user-community-section-test.js    | 115 +++++++++++++++++
 .../user-preferences-sidebar-test.js          |   3 +
 app/models/user_option.rb                     |   2 +
 app/serializers/user_option_serializer.rb     |   7 +-
 app/services/user_updater.rb                  |   3 +-
 config/locales/client.en.yml                  |   4 +
 config/site_settings.yml                      |   7 ++
 ...sidebar_list_destination_to_user_option.rb |   7 ++
 .../api/schemas/json/user_get_response.json   |   3 +
 spec/serializers/user_serializer_spec.rb      |   9 ++
 18 files changed, 340 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20221013045158_add_sidebar_list_destination_to_user_option.rb

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
index 9a9cd4e081..b51c37c47b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
@@ -20,6 +20,7 @@ export default class SidebarCommonCategoriesSection extends Component {
           new CategorySectionLink({
             category,
             topicTrackingState: this.topicTrackingState,
+            currentUser: this.currentUser,
           })
         );
 
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js b/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
index 2b712f0290..b4c1067d8f 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
@@ -1,14 +1,29 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
 
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
+export const DEFAULT_LIST_DESTINATION = "default";
+export const UNREAD_LIST_DESTINATION = "unread_new";
+
 export default class extends Controller {
   @tracked saved = false;
   @tracked selectedSidebarCategories = [];
   @tracked selectedSidebarTagNames = [];
 
+  sidebarListDestinations = [
+    {
+      name: I18n.t("user.experimental_sidebar.list_destination_default"),
+      value: DEFAULT_LIST_DESTINATION,
+    },
+    {
+      name: I18n.t("user.experimental_sidebar.list_destination_unread_new"),
+      value: UNREAD_LIST_DESTINATION,
+    },
+  ];
+
   @action
   save() {
     const initialSidebarCategoryIds = this.model.sidebarCategoryIds;
@@ -20,6 +35,11 @@ export default class extends Controller {
 
     this.model.set("sidebar_tag_names", this.selectedSidebarTagNames);
 
+    this.model.set(
+      "user_option.sidebar_list_destination",
+      this.newSidebarListDestination
+    );
+
     this.model
       .save()
       .then((result) => {
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
index 39873ea966..197c2f9669 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
@@ -2,6 +2,7 @@ import I18n from "I18n";
 
 import { tracked } from "@glimmer/tracking";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
+import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class EverythingSectionLink extends BaseSectionLink {
   @tracked totalUnread = 0;
@@ -63,6 +64,14 @@ export default class EverythingSectionLink extends BaseSectionLink {
   }
 
   get route() {
+    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+      if (this.totalUnread > 0) {
+        return "discovery.unread";
+      }
+      if (this.totalNew > 0) {
+        return "discovery.new";
+      }
+    }
     return "discovery.latest";
   }
 
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 4cdd34bc94..5057dc399a 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -4,14 +4,16 @@ import { tracked } from "@glimmer/tracking";
 
 import { bind } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
+import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class CategorySectionLink {
   @tracked totalUnread = 0;
   @tracked totalNew = 0;
 
-  constructor({ category, topicTrackingState }) {
+  constructor({ category, topicTrackingState, currentUser }) {
     this.category = category;
     this.topicTrackingState = topicTrackingState;
+    this.currentUser = currentUser;
     this.refreshCounts();
   }
 
@@ -79,6 +81,14 @@ export default class CategorySectionLink {
   }
 
   get route() {
+    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+      if (this.totalUnread > 0) {
+        return "discovery.unreadCategory";
+      }
+      if (this.totalNew > 0) {
+        return "discovery.newCategory";
+      }
+    }
     return "discovery.category";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 70e1abd31f..d80c75fc1f 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -1,7 +1,15 @@
 import EmberObject, { computed, get, getProperties } from "@ember/object";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";
-import { alias, equal, filterBy, gt, mapBy, or } from "@ember/object/computed";
+import {
+  alias,
+  equal,
+  filterBy,
+  gt,
+  mapBy,
+  or,
+  readOnly,
+} from "@ember/object/computed";
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import { A } from "@ember/array";
 import Badge from "discourse/models/badge";
@@ -109,6 +117,7 @@ let userOptionFields = [
   "seen_popups",
   "default_calendar",
   "bookmark_auto_delete_preference",
+  "sidebar_list_destination",
 ];
 
 export function addSaveableUserOptionField(fieldName) {
@@ -341,6 +350,8 @@ const User = RestModel.extend({
     );
   },
 
+  sidebarListDestination: readOnly("user_option.sidebar_list_destination"),
+
   changeUsername(new_username) {
     return ajax(userPath(`${this.username_lower}/preferences/username`), {
       type: "PUT",
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js b/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js
index 26e50bf84b..7dbfb121eb 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js
@@ -12,6 +12,7 @@ export default RestrictedUserRoute.extend({
     if (this.siteSettings.tagging_enabled) {
       props.selectedSidebarTagNames = user.sidebarTagNames;
     }
+    props.newSidebarListDestination = user.sidebarListDestination;
 
     controller.setProperties(props);
   },
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
index 61a6286787..70270db400 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
@@ -35,4 +35,13 @@
   </div>
 {{/if}}
 
+<div class="control-group preferences-sidebar-navigation">
+  <legend class="control-label">{{i18n "user.experimental_sidebar.navigation_section"}}</legend>
+
+  <div class="controls controls-dropdown">
+    <label>{{i18n "user.experimental_sidebar.list_destination_instruction"}}</label>
+    <ComboBox @valueProperty="value" @content={{this.sidebarListDestinations}} @value={{this.newSidebarListDestination}} @onChange={{action (mut this.newSidebarListDestination)}} />
+  </div>
+</div>
+
 <SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index e1c07c679e..d47e21dca7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -15,6 +15,7 @@ import Site from "discourse/models/site";
 import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
 import categoryFixture from "discourse/tests/fixtures/category-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 acceptance(
   "Sidebar - Logged on user - Categories Section - allow_uncategorized_topics disabled",
@@ -292,6 +293,124 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
   });
 
+  test("clicking section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+    const { category1 } = setupUserSidebarCategories();
+
+    await visit("/");
+
+    await click(`.sidebar-section-link-${category1.slug}`);
+
+    assert.strictEqual(
+      currentURL(),
+      `/c/${category1.slug}/${category1.id}`,
+      "it should transition to the category1 default view page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-categories .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-${category1.slug}.active`),
+      "the category1 section link is marked as active"
+    );
+  });
+
+  test("clicking section links - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+    const { category1 } = setupUserSidebarCategories();
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: category1.id,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    await visit("/");
+
+    await click(`.sidebar-section-link-${category1.slug}`);
+
+    assert.strictEqual(
+      currentURL(),
+      `/c/${category1.slug}/${category1.id}/l/new`,
+      "it should transition to the category1 new page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-categories .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-${category1.slug}.active`),
+      "the category1 section link is marked as active"
+    );
+  });
+
+  test("clicking section links - sidebar_list_destination set to unread/new with new and unread topics", async function (assert) {
+    const { category1 } = setupUserSidebarCategories();
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: category1.id,
+      created_in_new_period: true,
+    });
+    topicTrackingState.states.set("t113", {
+      last_read_post_number: 1,
+      highest_post_number: 2,
+      id: 113,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: category1.id,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    await visit("/");
+
+    await click(`.sidebar-section-link-${category1.slug}`);
+
+    assert.strictEqual(
+      currentURL(),
+      `/c/${category1.slug}/${category1.id}/l/unread`,
+      "it should transition to the category1 unread page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-categories .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-${category1.slug}.active`),
+      "the category1 section link is marked as active"
+    );
+  });
+
   test("category section link for category with 3-digit hex code for color", async function (assert) {
     const { category1 } = setupUserSidebarCategories();
     category1.set("color", "888");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index 4230f0ed93..c8fda4f215 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -160,6 +160,121 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
   });
 
+  test("clicking on everything link - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-everything");
+    assert.strictEqual(
+      currentURL(),
+      "/latest",
+      "it should transition to the latest page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(
+        ".sidebar-section-community .sidebar-section-link-everything.active"
+      ),
+      "the everything link is marked as active"
+    );
+  });
+
+  test("clicking on everything link - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 2,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-everything");
+
+    assert.strictEqual(
+      currentURL(),
+      "/new",
+      "it should transition to the new page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(
+        ".sidebar-section-community .sidebar-section-link-everything.active"
+      ),
+      "the everything link is marked as active"
+    );
+  });
+
+  test("clicking on everything link - sidebar_list_destination set to unread/new with new and unread topics", async function (assert) {
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 2,
+      created_in_new_period: true,
+    });
+    topicTrackingState.states.set("t113", {
+      last_read_post_number: 1,
+      highest_post_number: 2,
+      id: 113,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 2,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-everything");
+
+    assert.strictEqual(
+      currentURL(),
+      "/unread",
+      "it should transition to the unread page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(
+        ".sidebar-section-community .sidebar-section-link-everything.active"
+      ),
+      "the everything link is marked as active"
+    );
+  });
+
   test("clicking on tracked link", async function (assert) {
     await visit("/t/280");
     await click(".sidebar-section-community .sidebar-section-link-tracked");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
index 023a119a26..a78df47e32 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
@@ -46,6 +46,9 @@ acceptance("User Preferences - Sidebar", function (needs) {
               { name: "monkey", pm_only: false },
               { name: "gazelle", pm_only: false },
             ],
+            user_option: {
+              sidebar_list_destination: "unread_new",
+            },
           },
         });
       }
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index ac724dbfe6..8add4161d9 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -14,6 +14,7 @@ class UserOption < ActiveRecord::Base
   scope :human_users, -> { where('user_id > 0') }
 
   enum default_calendar: { none_selected: 0, ics: 1, google: 2 }, _scopes: false
+  enum sidebar_list_destination: { none_selected: 0, default: 0, unread_new: 1 }, _prefix: "sidebar_list"
 
   def self.ensure_consistency!
     sql = <<~SQL
@@ -269,6 +270,7 @@ end
 #  bookmark_auto_delete_preference  :integer          default(3), not null
 #  enable_experimental_sidebar      :boolean          default(FALSE)
 #  seen_popups                      :integer          is an Array
+#  sidebar_list_destination         :integer          default("none_selected"), not null
 #
 # Indexes
 #
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 19e7c794b0..582e00b7f2 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -34,7 +34,8 @@ class UserOptionSerializer < ApplicationSerializer
              :timezone,
              :skip_new_user_tips,
              :default_calendar,
-             :oldest_search_log_date
+             :oldest_search_log_date,
+             :sidebar_list_destination
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
@@ -51,4 +52,8 @@ class UserOptionSerializer < ApplicationSerializer
   def theme_ids
     object.theme_ids.presence || [SiteSetting.default_theme_id]
   end
+
+  def sidebar_list_destination
+    object.sidebar_list_none_selected? ? SiteSetting.default_sidebar_list_destination : object.sidebar_list_destination
+  end
 end
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 31feebbf91..ad7271c067 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -48,7 +48,8 @@ class UserUpdater
     :timezone,
     :skip_new_user_tips,
     :seen_popups,
-    :default_calendar
+    :default_calendar,
+    :sidebar_list_destination
   ]
 
   NOTIFICATION_SCHEDULE_ATTRS = -> {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8b97e26c1d..7bcc8992dd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1183,6 +1183,10 @@ en:
         categories_section_instruction: "Selected categories will be displayed under Sidebar's categories section."
         tags_section: "Tags Section"
         tags_section_instruction: "Selected tags will be displayed under Sidebar's tags section."
+        navigation_section: "Navigation"
+        list_destination_instruction: "When I click a topic list link in the sidebar with new or unread topics, take me to"
+        list_destination_default: "Default"
+        list_destination_unread_new: "New/Unread"
       change: "change"
       featured_topic: "Featured Topic"
       moderator: "%{user} is a moderator"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0ea994e947..e7bca7d67d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2056,6 +2056,13 @@ sidebar:
     type: tag_list
     default: ""
     client: true
+  default_sidebar_list_destination:
+    hidden: true
+    default: "default"
+    type: "list"
+    choices:
+      - "default"
+      - "unread_new"
 
 embedding:
   embed_by_username:
diff --git a/db/migrate/20221013045158_add_sidebar_list_destination_to_user_option.rb b/db/migrate/20221013045158_add_sidebar_list_destination_to_user_option.rb
new file mode 100644
index 0000000000..8e6a64ede1
--- /dev/null
+++ b/db/migrate/20221013045158_add_sidebar_list_destination_to_user_option.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSidebarListDestinationToUserOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options, :sidebar_list_destination, :integer, default: 0, null: false
+  end
+end
diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json
index 3ccc50d8df..d669aa5cb4 100644
--- a/spec/requests/api/schemas/json/user_get_response.json
+++ b/spec/requests/api/schemas/json/user_get_response.json
@@ -767,6 +767,9 @@
             },
             "oldest_search_log_date": {
               "type": ["string", "null"]
+            },
+            "sidebar_list_destination": {
+              "type": "string"
             }
           },
           "required": [
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index b5abe360d2..dc82b84251 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -426,4 +426,13 @@ RSpec.describe UserSerializer do
   end
 
   include_examples "#display_sidebar_tags", UserSerializer
+
+  describe "#sidebar_list_destination" do
+    it "returns choosen value or default" do
+      expect(serializer.as_json[:user_option][:sidebar_list_destination]).to eq(SiteSetting.default_sidebar_list_destination)
+
+      user.user_option.update!(sidebar_list_destination: "unread_new")
+      expect(serializer.as_json[:user_option][:sidebar_list_destination]).to eq("unread_new")
+    end
+  end
 end

From 9879cb0e68f491983dacb3be799dbf8cf25af1f3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 18 Oct 2022 16:30:48 +1000
Subject: [PATCH 190/332] FIX: Clarify security key copy (#18636)

In user preferences, we want to make it more obvious
that a security key is a physical device, and also
you can use your phone.
---
 .../controllers/second-factor-add-security-key.js  | 14 +++++++++++++-
 config/locales/client.en.yml                       | 14 ++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
index 4b4fec9fb4..9bda6f81c1 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
@@ -13,11 +13,23 @@ export default Controller.extend(ModalFunctionality, {
   errorMessage: null,
 
   onShow() {
+    let securityKeyName;
+    if (this.capabilities.isIOS && !this.capabilities.isIpadOS) {
+      securityKeyName = I18n.t(
+        "user.second_factor.security_key.iphone_default_name"
+      );
+    } else if (this.capabilities.isAndroid) {
+      securityKeyName = I18n.t(
+        "user.second_factor.security_key.android_default_name"
+      );
+    } else {
+      securityKeyName = I18n.t("user.second_factor.security_key.default_name");
+    }
     // clear properties every time because the controller is a singleton
     this.setProperties({
       errorMessage: null,
       loading: true,
-      securityKeyName: I18n.t("user.second_factor.security_key.default_name"),
+      securityKeyName,
       webauthnUnsupported: !isWebauthnSupported(),
     });
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7bcc8992dd..bb55ec4f1d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1393,7 +1393,7 @@ en:
         edit_title: "Edit Authenticator"
         edit_description: "Authenticator Name"
         enable_security_key_description: |
-          When you have your <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardware security key</a> prepared, press the Register button below.
+          When you have your <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardware security key</a> or compatible mobile device prepared, press the Register button below.
         totp:
           title: "Token-Based Authenticators"
           add: "Add Authenticator"
@@ -1401,14 +1401,16 @@ en:
           name_and_code_required_error: "You must provide a name and the code from your authenticator app."
         security_key:
           register: "Register"
-          title: "Security Keys"
-          add: "Add Security Key"
+          title: "Physical Security Keys"
+          add: "Add Physical Security Key"
           default_name: "Main Security Key"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "The security key registration process either timed out or was cancelled."
           already_added_error: "You have already registered this security key. You don’t have to register it again."
-          edit: "Edit Security Key"
+          edit: "Edit Physical Security Key"
           save: "Save"
-          edit_description: "Security Key Name"
+          edit_description: "Physical Security Key Name"
           name_required_error: "You must provide a name for your security key."
 
       change_about:
@@ -2008,7 +2010,7 @@ en:
       second_factor_backup_title: "Two-Factor Backup"
       second_factor_backup_description: "Please enter one of your backup codes:"
       second_factor: "Log in using Authenticator app"
-      security_key_description: "When you have your physical security key prepared press the Authenticate with Security Key button below."
+      security_key_description: "When you have your physical security key or compatible mobile device prepared press the Authenticate with Security Key button below."
       security_key_alternative: "Try another way"
       security_key_authenticate: "Authenticate with Security Key"
       security_key_not_allowed_error: "The security key authentication process either timed out or was cancelled."

From 65a5c84a9282ffe93796603dd58aa8c32134aaac Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 17 Oct 2022 15:04:04 +0100
Subject: [PATCH 191/332] DEV: perform theme extra_js compilation all together

Previously, compiling theme 'extra_js' was done with a number of steps. Each theme_field would be compiled into its own value_baked column, and then the JavascriptCache content would be built by concatenating all of those compiled values.

This commit streamlines things by removing the value_baked step. The raw value of all extra_js theme_fields are passed directly to the ThemeJavascriptCompiler, and then the result is stored in the JavascriptCache.

In itself, this commit should not cause any behavior change. It is designed to open the door to more advanced compilation features which have interdependencies between different source files (e.g. template colocation, sourcemaps).
---
 app/models/theme.rb                        | 19 +++++++-----
 app/models/theme_field.rb                  | 28 ++---------------
 config/locales/server.en.yml               |  2 --
 lib/theme_javascript_compiler.rb           | 35 +++++++++++++++++++++-
 spec/lib/theme_javascript_compiler_spec.rb | 17 ++++++++++-
 spec/models/theme_field_spec.rb            | 15 ++++------
 6 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/app/models/theme.rb b/app/models/theme.rb
index fa98138643..7d41ce11ba 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -118,12 +118,12 @@ class Theme < ActiveRecord::Base
     all_extra_js = theme_fields
       .where(target_id: Theme.targets[:extra_js])
       .order(:name, :id)
-      .pluck(:value_baked)
-      .join("\n")
+      .pluck(:name, :value)
+      .to_h
 
     if all_extra_js.present?
       js_compiler = ThemeJavascriptCompiler.new(id, name)
-      js_compiler.append_raw_script(all_extra_js)
+      js_compiler.append_tree(all_extra_js)
       settings_hash = build_settings_hash
       js_compiler.prepend_settings(settings_hash) if settings_hash.present?
       javascript_cache || build_javascript_cache
@@ -707,14 +707,17 @@ class Theme < ActiveRecord::Base
   end
 
   def baked_js_tests_with_digest
-    content = theme_fields
+    tests_tree = theme_fields
       .where(target_id: Theme.targets[:tests_js])
       .order(name: :asc)
-      .each(&:ensure_baked!)
-      .map(&:value_baked)
-      .join("\n")
+      .pluck(:name, :value)
+      .to_h
 
-    return [nil, nil] if content.blank?
+    return [nil, nil] if tests_tree.blank?
+
+    compiler = ThemeJavascriptCompiler.new(id, name)
+    compiler.append_tree(tests_tree, for_tests: true)
+    content = compiler.content
 
     content = <<~JS + content
       (function() {
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index a0b80685f6..90d9aa9db8 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -153,30 +153,6 @@ class ThemeField < ActiveRecord::Base
     [doc.to_s, errors&.join("\n")]
   end
 
-  def process_extra_js(content)
-    errors = []
-
-    js_compiler = ThemeJavascriptCompiler.new(theme_id, theme.name)
-    filename, extension = name.split(".", 2)
-    filename = "test/#{filename}" if js_tests_field?
-    begin
-      case extension
-      when "js.es6", "js"
-        js_compiler.append_module(content, filename, include_variables: true)
-      when "hbs"
-        js_compiler.append_ember_template(filename, content)
-      when "hbr", "raw.hbs"
-        js_compiler.append_raw_template(filename.sub("discourse/templates/", ""), content)
-      else
-        raise ThemeJavascriptCompiler::CompileError.new(I18n.t("themes.compile_error.unrecognized_extension", extension: extension))
-      end
-    rescue ThemeJavascriptCompiler::CompileError => ex
-      errors << ex.message
-    end
-
-    [js_compiler.content, errors&.join("\n")]
-  end
-
   def validate_svg_sprite_xml
     upload = Upload.find(self.upload_id) rescue nil
 
@@ -377,8 +353,8 @@ class ThemeField < ActiveRecord::Base
       self.compiler_version = Theme.compiler_version
       DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
     elsif extra_js_field? || js_tests_field?
-      self.value_baked, self.error = process_extra_js(self.value)
-      self.error = nil unless self.error.present?
+      self.error = nil
+      self.value_baked = "baked"
       self.compiler_version = Theme.compiler_version
     elsif basic_scss_field?
       ensure_scss_compiles!
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index da54a8fc6d..0d1f8ce17c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -68,8 +68,6 @@ en:
     bad_color_scheme: "Can not update theme, invalid color palette"
     other_error: "Something went wrong updating theme"
     ember_selector_error: "Sorry – using #ember or .ember-view CSS selectors is not permitted, because these names are dynamically generated at runtime and will change over time, eventually resulting in broken CSS. Try a different selector."
-    compile_error:
-      unrecognized_extension: "Unrecognized file extension: %{extension}"
     import_error:
       generic: An error occurred while importing that theme
       upload: "Error creating upload asset: %{name}. %{errors}"
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 51a69d373e..1713009491 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -25,6 +25,38 @@ class ThemeJavascriptCompiler
     JS
   end
 
+  def append_tree(tree, for_tests: false)
+    root_name = "discourse"
+
+    # Replace legacy extensions
+    tree.transform_keys! do |filename|
+      if filename.ends_with? ".js.es6"
+        filename.sub(/\.js\.es6\z/, ".js")
+      elsif filename.ends_with? ".raw.hbs"
+        filename.sub(/\.raw\.hbs\z/, ".hbr")
+      else
+        filename
+      end
+    end
+
+    # Transpile and write to output
+    tree.each_pair do |filename, content|
+      module_name, extension = filename.split(".", 2)
+      module_name = "test/#{module_name}" if for_tests
+      if extension == "js"
+        append_module(content, module_name)
+      elsif extension == "hbs"
+        append_ember_template(module_name, content)
+      elsif extension == "hbr"
+        append_raw_template(module_name.sub("discourse/templates/", ""), content)
+      else
+        append_js_error("unknown file extension '#{extension}' (#{filename})")
+      end
+    rescue CompileError => e
+      append_js_error "#{e.message} (#{filename})"
+    end
+  end
+
   def append_ember_template(name, hbs_template)
     name = "/#{name}" if !name.start_with?("/")
     module_name = "discourse/theme-#{@theme_id}#{name}"
@@ -93,7 +125,8 @@ class ThemeJavascriptCompiler
   end
 
   def append_js_error(message)
-    @content << "console.error('Theme Transpilation Error:', #{message.inspect});"
+    message = "[THEME #{@theme_id} '#{@theme_name}'] Compile error: #{message}"
+    append_raw_script "console.error(#{message.to_json});"
   end
 
   private
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 89593543a7..68b506135b 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -2,7 +2,6 @@
 
 RSpec.describe ThemeJavascriptCompiler do
   let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') }
-  let(:theme_id) { 22 }
 
   describe "#append_raw_template" do
     it 'uses the correct template paths' do
@@ -72,4 +71,20 @@ RSpec.describe ThemeJavascriptCompiler do
       end.to raise_error(ThemeJavascriptCompiler::CompileError, /Parse error on line 1/)
     end
   end
+
+  describe "#append_tree" do
+    it "can handle multiple modules" do
+      compiler.append_tree(
+        {
+          "discourse/components/mycomponent.js" => <<~JS,
+            import Component from "@glimmer/component";
+            export default class MyComponent extends Component {}
+          JS
+          "discourse/templates/components/mycomponent.hbs" => "{{my-component-template}}"
+        }
+      )
+      expect(compiler.content).to include('define("discourse/theme-1/components/mycomponent"')
+      expect(compiler.content).to include('define("discourse/theme-1/discourse/templates/components/mycomponent"')
+    end
+  end
 end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 58154c825b..931bc45bf7 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -111,7 +111,7 @@ HTML
     field.ensure_baked!
     expect(field.error).not_to eq(nil)
     expect(field.value_baked).to include("<script defer=\"\" src=\"#{field.javascript_cache.url}\" data-theme-id=\"1\"></script>")
-    expect(field.javascript_cache.content).to include("Theme Transpilation Error:")
+    expect(field.javascript_cache.content).to include("[THEME 1 'Default'] Compile error")
 
     field.update!(value: '')
     field.ensure_baked!
@@ -183,15 +183,9 @@ HTML
     theme.save!
 
     js_field.reload
-    expect(js_field.value_baked).to include("if ('define' in window) {")
-    expect(js_field.value_baked).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery\"")
-    expect(js_field.value_baked).to include("console.log('hello from .js.es6');")
-
-    expect(hbs_field.reload.value_baked).to include("define(\"discourse/theme-#{theme.id}/discourse/templates/discovery\", [\"exports\", \"@ember/template-factory\"]")
-    expect(raw_hbs_field.reload.value_baked).to include('addRawTemplate("discovery"')
-    expect(hbr_field.reload.value_baked).to include('addRawTemplate("other_discovery"')
-    expect(unknown_field.reload.value_baked).to eq("")
-    expect(unknown_field.reload.error).to eq(I18n.t("themes.compile_error.unrecognized_extension", extension: "blah"))
+    expect(js_field.value_baked).to eq("baked")
+    expect(js_field.value_baked).to eq("baked")
+    expect(js_field.value_baked).to eq("baked")
 
     # All together
     expect(theme.javascript_cache.content).to include("define(\"discourse/theme-#{theme.id}/discourse/templates/discovery\", [\"exports\", \"@ember/template-factory\"]")
@@ -199,6 +193,7 @@ HTML
     expect(theme.javascript_cache.content).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery\"")
     expect(theme.javascript_cache.content).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery-2\"")
     expect(theme.javascript_cache.content).to include("const settings =")
+    expect(theme.javascript_cache.content).to include("[THEME #{theme.id} '#{theme.name}'] Compile error: unknown file extension 'blah' (discourse/controllers/discovery.blah)")
   end
 
   def create_upload_theme_field!(name)

From cb87067c77b70e5f33ff79fe9910bf166a23e978 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 17 Oct 2022 14:47:16 +0100
Subject: [PATCH 192/332] DEV: Introduce support for template colocation in
 themes

---
 .../javascripts/discourse-js-processor.js     |  2 +
 app/models/theme.rb                           |  2 +-
 lib/discourse_js_processor.rb                 |  1 +
 lib/theme_javascript_compiler.rb              | 40 +++++++++++++++++++
 spec/lib/theme_javascript_compiler_spec.rb    | 39 ++++++++++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-js-processor.js b/app/assets/javascripts/discourse-js-processor.js
index 5deb20f011..7050fe2ac7 100644
--- a/app/assets/javascripts/discourse-js-processor.js
+++ b/app/assets/javascripts/discourse-js-processor.js
@@ -4,6 +4,7 @@
 
 const makeEmberTemplateCompilerPlugin =
   require("babel-plugin-ember-template-compilation").default;
+const colocatedBabelPlugin = require("colocated-babel-plugin").default;
 const precompile = require("ember-template-compiler").precompile;
 const Handlebars = require("handlebars").default;
 
@@ -50,6 +51,7 @@ function buildTemplateCompilerBabelPlugins({ themeId }) {
   }
 
   return [
+    colocatedBabelPlugin,
     require("widget-hbs-compiler").WidgetHbsCompiler,
     [
       makeEmberTemplateCompilerPlugin(() => compileFunction),
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 7d41ce11ba..1f9f23e548 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,7 +6,7 @@ require 'json_schemer'
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 63
+  BASE_COMPILER_VERSION = 64
 
   attr_accessor :child_components
 
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4e999640c3..2dbf1f91c9 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -157,6 +157,7 @@ class DiscourseJsProcessor
       load_file_in_context(ctx, "node_modules/babel-plugin-ember-template-compilation/src/plugin.js", wrap_in_module: "babel-plugin-ember-template-compilation/index")
       load_file_in_context(ctx, "node_modules/babel-plugin-ember-template-compilation/src/expression-parser.js", wrap_in_module: "babel-plugin-ember-template-compilation/expression-parser")
       load_file_in_context(ctx, "node_modules/babel-import-util/src/index.js", wrap_in_module: "babel-import-util")
+      load_file_in_context(ctx, "node_modules/ember-cli-htmlbars/lib/colocated-babel-plugin.js", wrap_in_module: "colocated-babel-plugin")
 
       # Widget HBS compiler
       widget_hbs_compiler_source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 1713009491..998963ef55 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -39,6 +39,46 @@ class ThemeJavascriptCompiler
       end
     end
 
+    # Handle colocated components
+    tree.dup.each_pair do |filename, content|
+      is_component_template = filename.end_with?(".hbs") && filename.start_with?("#{root_name}/components/")
+      next if !is_component_template
+      template_contents = content
+
+      hbs_invocation_options = {
+        moduleName: filename,
+        parseOptions: {
+          srcName: filename
+        }
+      }
+      hbs_invocation = "hbs(#{template_contents.to_json}, #{hbs_invocation_options.to_json})"
+
+      prefix = <<~JS
+        import { hbs } from 'ember-cli-htmlbars';
+        const __COLOCATED_TEMPLATE__ = #{hbs_invocation};
+      JS
+
+      js_filename = filename.sub(/\.hbs\z/, ".js")
+      js_contents = tree[js_filename] # May be nil for template-only component
+      if js_contents && !js_contents.include?("export default")
+        message = "#{filename} does not contain a `default export`. Did you forget to export the component class?"
+        js_contents += "throw new Error(#{message.to_json});"
+      end
+
+      if js_contents.nil?
+        # No backing class, use template-only
+        js_contents = <<~JS
+          import templateOnly from '@ember/component/template-only';
+          export default templateOnly();
+        JS
+      end
+
+      js_contents = prefix + js_contents
+
+      tree[js_filename] = js_contents
+      tree.delete(filename)
+    end
+
     # Transpile and write to output
     tree.each_pair do |filename, content|
       module_name, extension = filename.split(".", 2)
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 68b506135b..46fa810ee5 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -86,5 +86,44 @@ RSpec.describe ThemeJavascriptCompiler do
       expect(compiler.content).to include('define("discourse/theme-1/components/mycomponent"')
       expect(compiler.content).to include('define("discourse/theme-1/discourse/templates/components/mycomponent"')
     end
+
+    it "handles colocated components" do
+      compiler.append_tree(
+        {
+          "discourse/components/mycomponent.js" => <<~JS,
+            import Component from "@glimmer/component";
+            export default class MyComponent extends Component {}
+          JS
+          "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
+        }
+      )
+      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.content).to include("setComponentTemplate")
+    end
+
+    it "prints error when default export missing" do
+      compiler.append_tree(
+        {
+          "discourse/components/mycomponent.js" => <<~JS,
+            import Component from "@glimmer/component";
+            class MyComponent extends Component {}
+          JS
+          "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
+        }
+      )
+      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.content).to include("throw new Error")
+    end
+
+    it "handles template-only components" do
+      compiler.append_tree(
+        {
+          "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
+        }
+      )
+      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.content).to include("setComponentTemplate")
+      expect(compiler.content).to include("@ember/component/template-only")
+    end
   end
 end

From b6297f5dd48f4fa19d5c15542c5625cf0691df7d Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 18 Oct 2022 14:34:33 +0200
Subject: [PATCH 193/332] DEV: Remove the router testing hack (#18640)

Doesn't seem to be needed anymore (and it doesn't work anymore with some stuff I'm updating)
---
 .../discourse/tests/helpers/qunit-helpers.js          | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 4de353d143..b9b348770f 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -11,7 +11,7 @@ import {
   mergeSettings,
 } from "discourse/tests/helpers/site-settings";
 import { forceMobile, resetMobile } from "discourse/lib/mobile";
-import { getApplication, getContext, settled } from "@ember/test-helpers";
+import { getApplication, settled } from "@ember/test-helpers";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { run } from "@ember/runloop";
 import { setupApplicationTest } from "ember-qunit";
@@ -381,15 +381,6 @@ export function acceptance(name, optionsOrCallback) {
       callback(needs);
 
       setupApplicationTest(hooks);
-
-      hooks.beforeEach(function () {
-        // This hack seems necessary to allow `DiscourseURL` to use the testing router
-        let ctx = getContext();
-        this.container.registry.unregister("router:main");
-        this.container.registry.register("router:main", ctx.owner.router, {
-          instantiate: false,
-        });
-      });
     });
   } else {
     // Old way

From 43c2841a690f3327bcb05281fbec52456f36d142 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 18 Oct 2022 14:34:44 +0200
Subject: [PATCH 194/332] DEV: Switch back to mainline `licensed` gem (#18641)

The bundler issue has been fixed
---
 .github/workflows/licenses.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml
index adefc3998c..18fa2b2f0e 100644
--- a/.github/workflows/licenses.yml
+++ b/.github/workflows/licenses.yml
@@ -48,10 +48,7 @@ jobs:
 
       - name: Setup licensed
         run: |
-          # gem install licensed
-          # Workaround for https://github.com/github/licensed/issues/521
-          gem install specific_install
-          gem specific_install https://github.com/CvX/licensed.git -b bundler-compat
+          gem install licensed
 
       - name: Get yarn cache directory
         id: yarn-cache-dir

From f7fdaa97d17416cd5d7a37f2957d32e15e0165d4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 18 Oct 2022 14:53:06 +0100
Subject: [PATCH 195/332] DEV: Replace mini-loader with Ember's `loader.js`
 library (#18643)

We already have this as a dependency, so it makes sense to use it rather than using our own not-quite-spec-compliant implementation
---
 app/assets/javascripts/mini-loader.js | 233 --------------------------
 lib/discourse_js_processor.rb         |   2 +-
 lib/freedom_patches/raw_handlebars.rb |   2 +-
 lib/pretty_text.rb                    |   2 +-
 4 files changed, 3 insertions(+), 236 deletions(-)
 delete mode 100644 app/assets/javascripts/mini-loader.js

diff --git a/app/assets/javascripts/mini-loader.js b/app/assets/javascripts/mini-loader.js
deleted file mode 100644
index cd544945b5..0000000000
--- a/app/assets/javascripts/mini-loader.js
+++ /dev/null
@@ -1,233 +0,0 @@
-// Used by pretty-text in MiniRacer context
-
-let define, requirejs;
-
-(function () {
-  let JS_MODULES = {};
-
-  let registry = {};
-  let seen = {};
-  let FAILED = false;
-
-  let uuid = 0;
-
-  function tryFinally(tryable, finalizer) {
-    try {
-      return tryable();
-    } finally {
-      finalizer();
-    }
-  }
-
-  function unsupportedModule(length) {
-    throw new Error(
-      "an unsupported module was defined, expected `define(name, deps, module)` instead got: `" +
-        length +
-        "` arguments to define`"
-    );
-  }
-
-  let defaultDeps = ["require", "exports", "module"];
-
-  function Module(name, deps, callback, exports) {
-    this.id = uuid++;
-    this.name = name;
-    this.deps = !deps.length && callback.length ? defaultDeps : deps;
-    this.exports = exports || {};
-    this.callback = callback;
-    this.state = undefined;
-    this._require = undefined;
-  }
-
-  Module.prototype.makeRequire = function () {
-    if (this._require) {
-      return this._require;
-    }
-    this._require = (dep) => {
-      return requirejs(resolve(dep, this.name));
-    };
-    this._require.has = (dep) => {
-      const moduleName = resolve(dep, this.name);
-      return require.has(moduleName);
-    };
-    return this._require;
-  };
-
-  define = function (name, deps, callback) {
-    if (arguments.length < 2) {
-      unsupportedModule(arguments.length);
-    }
-
-    if (!Array.isArray(deps)) {
-      callback = deps;
-      deps = [];
-    }
-
-    registry[name] = new Module(name, deps, callback);
-  };
-
-  // we don't support all of AMD
-  // define.amd = {};
-  // we will support petals...
-  define.petal = {};
-
-  function Alias(path) {
-    this.name = path;
-  }
-
-  define.alias = function (path) {
-    return new Alias(path);
-  };
-
-  function reify(mod, name, rseen) {
-    let deps = mod.deps;
-    let length = deps.length;
-    let reified = new Array(length);
-    let dep;
-    // TODO: new Module
-    // TODO: seen refactor
-    let module = {};
-
-    for (let i = 0, l = length; i < l; i++) {
-      dep = deps[i];
-      if (dep === "exports") {
-        module.exports = reified[i] = rseen;
-      } else if (dep === "require") {
-        reified[i] = mod.makeRequire();
-      } else if (dep === "module") {
-        mod.exports = rseen;
-        module = reified[i] = mod;
-      } else {
-        reified[i] = requireFrom(resolve(dep, name), name);
-      }
-    }
-
-    return {
-      deps: reified,
-      module,
-    };
-  }
-
-  function requireFrom(name, origin) {
-    let mod = JS_MODULES[name] || registry[name];
-
-    if (!mod) {
-      name = name + "/index";
-      mod = registry[name];
-    }
-
-    if (!mod) {
-      throw new Error(
-        "Could not find module `" + name + "` imported from `" + origin + "`"
-      );
-    }
-    return requirejs(name);
-  }
-
-  function missingModule(name) {
-    throw new Error("Could not find module " + name);
-  }
-
-  requirejs = require = function (name) {
-    if (JS_MODULES[name]) {
-      return JS_MODULES[name];
-    }
-
-    let mod = registry[name];
-
-    if (mod && mod.callback instanceof Alias) {
-      mod = registry[mod.callback.name];
-    }
-
-    if (!mod) {
-      name = name + "/index";
-      mod = registry[name];
-    }
-
-    if (!mod) {
-      missingModule(name);
-    }
-
-    if (mod.state !== FAILED && seen.hasOwnProperty(name)) {
-      return seen[name];
-    }
-
-    let reified;
-    let module;
-    let loaded = false;
-
-    seen[name] = {}; // placeholder for run-time cycles
-
-    tryFinally(
-      function () {
-        reified = reify(mod, name, seen[name]);
-        module = mod.callback.apply(this, reified.deps);
-        loaded = true;
-      },
-      function () {
-        if (!loaded) {
-          mod.state = FAILED;
-        }
-      }
-    );
-
-    let obj;
-    if (module === undefined && reified.module.exports) {
-      obj = reified.module.exports;
-    } else {
-      obj = seen[name] = module;
-    }
-
-    if (
-      obj !== null &&
-      (typeof obj === "object" || typeof obj === "function") &&
-      obj["default"] === undefined
-    ) {
-      obj["default"] = obj;
-    }
-
-    return (seen[name] = obj);
-  };
-  window.requireModule = requirejs;
-
-  function resolve(child, name) {
-    if (child.charAt(0) !== ".") {
-      return child;
-    }
-
-    let parts = child.split("/");
-    let nameParts = name.split("/");
-    let parentBase = nameParts.slice(0, -1);
-
-    for (let i = 0, l = parts.length; i < l; i++) {
-      let part = parts[i];
-
-      if (part === "..") {
-        if (parentBase.length === 0) {
-          throw new Error("Cannot access parent module of root");
-        }
-        parentBase.pop();
-      } else if (part === ".") {
-        continue;
-      } else {
-        parentBase.push(part);
-      }
-    }
-
-    return parentBase.join("/");
-  }
-
-  requirejs.entries = requirejs._eak_seen = registry;
-  requirejs.clear = function () {
-    requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = {};
-  };
-  require.has = function (moduleName) {
-    return (
-      Boolean(registry[moduleName]) || Boolean(registry[moduleName + "/index"])
-    );
-  };
-
-  globalThis.define = define;
-  globalThis.require = require;
-})();
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 2dbf1f91c9..9f1d9c756b 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -142,7 +142,7 @@ class DiscourseJsProcessor
       JS
 
       # define/require support
-      load_file_in_context(ctx, "mini-loader.js")
+      load_file_in_context(ctx, "node_modules/loader.js/dist/loader/loader.js")
 
       # Babel
       load_file_in_context(ctx, "node_modules/@babel/standalone/babel.js")
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 47eed5c623..de6345a875 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -10,7 +10,7 @@ class Barber::Precompiler
 
   def precompiler
     if !@precompiler
-      loader = File.read("#{Rails.root}/app/assets/javascripts/mini-loader.js")
+      loader = File.read("#{Rails.root}/app/assets/javascripts/node_modules/loader.js/dist/loader/loader.js")
       source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js")
 
       transpiled = DiscourseJsProcessor.transpile(source, "#{Rails.root}/app/assets/javascripts/", "discourse-common/lib/raw-handlebars")
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index a0a558de96..0d4c8ee9b4 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -94,7 +94,7 @@ module PrettyText
     end
 
     root_path = "#{Rails.root}/app/assets/javascripts/"
-    ctx_load(ctx, "#{root_path}/mini-loader.js")
+    ctx_load(ctx, "#{root_path}/node_modules/loader.js/dist/loader/loader.js")
     ctx_load(ctx, "#{root_path}/handlebars-shim.js")
     ctx_load(ctx, "#{root_path}/node_modules/xss/dist/xss.js")
     ctx.load("#{Rails.root}/lib/pretty_text/vendor-shims.js")

From e23b247690e51e2fad81d98662763001648c7fae Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 09:40:29 -0700
Subject: [PATCH 196/332] UX: Fix alt text cancel button in dark mode (#18644)

---
 .../engines/discourse-markdown/image-controls.js          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
index 41519e09ca..7918ee3d79 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
@@ -85,10 +85,10 @@ function buildImageEditAltTextControls(altText) {
   return `
   <span class="alt-text-edit-container" hidden="true">
     <input class="alt-text-input" type="text" value="${altText}" />
-    <button class="alt-text-edit-ok btn-primary">
+    <button class="alt-text-edit-ok btn btn-primary">
         <svg class="fa d-icon d-icon-check svg-icon svg-string"><use href="#check"></use></svg>
     </button>
-    <button class="alt-text-edit-cancel btn-default">
+    <button class="alt-text-edit-cancel btn btn-default">
         <svg class="fa d-icon d-icon-times svg-icon svg-string"><use href="#times"></use></svg>
     </button>
   </span>
@@ -174,10 +174,10 @@ export function setup(helper) {
       "span[hidden=true]",
       "input[type=text]",
       "input[class=alt-text-input]",
-      "button[class=alt-text-edit-ok btn-primary]",
+      "button[class=alt-text-edit-ok btn btn-primary]",
       "svg[class=fa d-icon d-icon-check svg-icon svg-string]",
       "use[href=#check]",
-      "button[class=alt-text-edit-cancel btn-default]",
+      "button[class=alt-text-edit-cancel btn btn-default]",
       "svg[class=fa d-icon d-icon-times svg-icon svg-string]",
       "svg[class=fa d-icon d-icon-trash-alt svg-icon svg-string]",
       "use[href=#times]",

From be3d6a56ceb6c41918df6ded81c9881bcb1f6407 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 18 Oct 2022 18:20:10 +0100
Subject: [PATCH 197/332] DEV: Introduce minification and source maps for Theme
 JS (#18646)

Theme javascript is now minified using Terser, just like our core/plugin JS bundles. This reduces the amount of data sent over the network.

This commit also introduces sourcemaps for theme JS. Browser developer tools will now be able show each source file separately when browsing, and also in backtraces.

For theme test JS, the sourcemap is inlined for simplicity. Network load is not a concern for tests.
---
 .../javascripts/discourse-js-processor.js     | 28 +++++-
 .../theme_javascripts_controller.rb           | 62 ++++++++----
 app/models/javascript_cache.rb                |  1 +
 app/models/theme.rb                           | 14 ++-
 app/models/theme_field.rb                     | 14 +--
 config/routes.rb                              |  1 +
 ...0550_add_source_map_to_javascript_cache.rb |  7 ++
 lib/discourse_js_processor.rb                 | 18 +++-
 lib/theme_javascript_compiler.rb              | 96 ++++++++++++++++---
 spec/lib/discourse_js_processor_spec.rb       | 26 +++++
 spec/lib/theme_javascript_compiler_spec.rb    | 68 +++++++++----
 spec/models/theme_field_spec.rb               | 22 +++++
 spec/models/theme_spec.rb                     |  3 +
 .../theme_javascripts_controller_spec.rb      | 45 +++++++++
 14 files changed, 338 insertions(+), 67 deletions(-)
 create mode 100644 db/migrate/20221018100550_add_source_map_to_javascript_cache.rb

diff --git a/app/assets/javascripts/discourse-js-processor.js b/app/assets/javascripts/discourse-js-processor.js
index 7050fe2ac7..0e038ec87f 100644
--- a/app/assets/javascripts/discourse-js-processor.js
+++ b/app/assets/javascripts/discourse-js-processor.js
@@ -1,4 +1,4 @@
-/* global Babel:true */
+/* global Babel:true Terser:true */
 
 // This is executed in mini_racer to provide the JS logic for lib/discourse_js_processor.rb
 
@@ -110,3 +110,29 @@ exports.transpile = function (
     throw error;
   }
 };
+
+// mini_racer doesn't have native support for getting the result of an async operation.
+// To work around that, we provide a getMinifyResult which can be used to fetch the result
+// in a followup method call.
+let lastMinifyError, lastMinifyResult;
+
+exports.minify = async function (sources, options) {
+  lastMinifyError = lastMinifyResult = null;
+  try {
+    lastMinifyResult = await Terser.minify(sources, options);
+  } catch (e) {
+    lastMinifyError = e;
+  }
+};
+
+exports.getMinifyResult = function () {
+  const error = lastMinifyError;
+  const result = lastMinifyResult;
+
+  lastMinifyError = lastMinifyResult = null;
+
+  if (error) {
+    throw error;
+  }
+  return result;
+};
diff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rb
index 77ad53f05c..418a076b82 100644
--- a/app/controllers/theme_javascripts_controller.rb
+++ b/app/controllers/theme_javascripts_controller.rb
@@ -9,10 +9,10 @@ class ThemeJavascriptsController < ApplicationController
     :preload_json,
     :redirect_to_login_if_required,
     :verify_authenticity_token,
-    only: [:show, :show_tests]
+    only: [:show, :show_map, :show_tests]
   )
 
-  before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show, :show_tests]
+  before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show, :show_map, :show_tests]
 
   def show
     raise Discourse::NotFound unless last_modified.present?
@@ -21,18 +21,29 @@ class ThemeJavascriptsController < ApplicationController
     # Security: safe due to route constraint
     cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.js"
 
-    unless File.exist?(cache_file)
-      content = query.pluck_first(:content)
-      raise Discourse::NotFound if content.nil?
-
-      FileUtils.mkdir_p(DISK_CACHE_PATH)
-      File.write(cache_file, content)
+    write_if_not_cached(cache_file) do
+      content, has_source_map = query.pluck_first(:content, "source_map IS NOT NULL")
+      if has_source_map
+        content += "\n//# sourceMappingURL=#{params[:digest]}.map?__ws=#{Discourse.current_hostname}\n"
+      end
+      content
     end
 
-    # this is only required for NGINX X-SendFile it seems
-    response.headers["Content-Length"] = File.size(cache_file).to_s
-    set_cache_control_headers
-    send_file(cache_file, disposition: :inline)
+    serve_file(cache_file)
+  end
+
+  def show_map
+    raise Discourse::NotFound unless last_modified.present?
+    return render body: nil, status: 304 if not_modified?
+
+    # Security: safe due to route constraint
+    cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.map"
+
+    write_if_not_cached(cache_file) do
+      query.pluck_first(:source_map)
+    end
+
+    serve_file(cache_file)
   end
 
   def show_tests
@@ -48,14 +59,11 @@ class ThemeJavascriptsController < ApplicationController
     @cache_file = "#{TESTS_DISK_CACHE_PATH}/#{digest}.js"
     return render body: nil, status: 304 if not_modified?
 
-    if !File.exist?(@cache_file)
-      FileUtils.mkdir_p(TESTS_DISK_CACHE_PATH)
-      File.write(@cache_file, content)
+    write_if_not_cached(@cache_file) do
+      content
     end
 
-    response.headers["Content-Length"] = File.size(@cache_file).to_s
-    set_cache_control_headers
-    send_file(@cache_file, disposition: :inline)
+    serve_file @cache_file
   end
 
   private
@@ -94,4 +102,22 @@ class ThemeJavascriptsController < ApplicationController
       immutable_for(1.year)
     end
   end
+
+  def write_if_not_cached(cache_file)
+    unless File.exist?(cache_file)
+      content = yield
+      raise Discourse::NotFound if content.nil?
+
+      FileUtils.mkdir_p(File.dirname(cache_file))
+      File.write(cache_file, content)
+    end
+  end
+
+  def serve_file(cache_file)
+    # this is only required for NGINX X-SendFile it seems
+    response.headers["Content-Length"] = File.size(cache_file).to_s
+    set_cache_control_headers
+    type = cache_file.end_with?(".map") ? "application/json" : "text/javascript"
+    send_file(cache_file, type: type, disposition: :inline)
+  end
 end
diff --git a/app/models/javascript_cache.rb b/app/models/javascript_cache.rb
index 85a31c94c4..794a4ef612 100644
--- a/app/models/javascript_cache.rb
+++ b/app/models/javascript_cache.rb
@@ -41,6 +41,7 @@ end
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  theme_id       :bigint
+#  source_map     :text
 #
 # Indexes
 #
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 1f9f23e548..662dc1c890 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,7 +6,7 @@ require 'json_schemer'
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 64
+  BASE_COMPILER_VERSION = 65
 
   attr_accessor :child_components
 
@@ -127,7 +127,7 @@ class Theme < ActiveRecord::Base
       settings_hash = build_settings_hash
       js_compiler.prepend_settings(settings_hash) if settings_hash.present?
       javascript_cache || build_javascript_cache
-      javascript_cache.update!(content: js_compiler.content)
+      javascript_cache.update!(content: js_compiler.content, source_map: js_compiler.source_map)
     else
       javascript_cache&.destroy!
     end
@@ -717,13 +717,17 @@ class Theme < ActiveRecord::Base
 
     compiler = ThemeJavascriptCompiler.new(id, name)
     compiler.append_tree(tests_tree, for_tests: true)
-    content = compiler.content
-
-    content = <<~JS + content
+    compiler.append_raw_script "test_setup.js", <<~JS
       (function() {
         require("discourse/lib/theme-settings-store").registerSettings(#{self.id}, #{cached_default_settings.to_json}, { force: true });
       })();
     JS
+    content = compiler.content
+
+    if compiler.source_map
+      content += "\n//# sourceMappingURL=data:application/json;base64,#{Base64.strict_encode64(compiler.source_map)}\n"
+    end
+
     [content, Digest::SHA1.hexdigest(content)]
   end
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 90d9aa9db8..475e354156 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -95,6 +95,7 @@ class ThemeField < ActiveRecord::Base
           js_compiler.append_ember_template("discourse/templates/#{name}", hbs_template)
         end
       rescue ThemeJavascriptCompiler::CompileError => ex
+        js_compiler.append_js_error("discourse/templates/#{name}", ex.message)
         errors << ex.message
       end
 
@@ -128,25 +129,23 @@ class ThemeField < ActiveRecord::Base
 
         js_compiler.append_module(js, "discourse/initializers/#{initializer_name}", include_variables: true)
       rescue ThemeJavascriptCompiler::CompileError => ex
+        js_compiler.append_js_error("discourse/initializers/#{initializer_name}", ex.message)
         errors << ex.message
       end
 
       node.remove
     end
 
-    doc.css('script').each do |node|
+    doc.css('script').each_with_index do |node, index|
       next unless inline_javascript?(node)
-      js_compiler.append_raw_script(node.inner_html)
+      js_compiler.append_raw_script("_html/#{Theme.targets[self.target_id]}/#{name}_#{index + 1}.js", node.inner_html)
       node.remove
     end
 
-    errors.each do |error|
-      js_compiler.append_js_error(error)
-    end
-
     settings_hash = theme.build_settings_hash
-    js_compiler.prepend_settings(settings_hash) if js_compiler.content.present? && settings_hash.present?
+    js_compiler.prepend_settings(settings_hash) if js_compiler.has_content? && settings_hash.present?
     javascript_cache.content = js_compiler.content
+    javascript_cache.source_map = js_compiler.source_map
     javascript_cache.save!
 
     doc.add_child("<script defer src='#{javascript_cache.url}' data-theme-id='#{theme_id}'></script>") if javascript_cache.content.present?
@@ -239,6 +238,7 @@ class ThemeField < ActiveRecord::Base
     end
 
     javascript_cache.content = js_compiler.content
+    javascript_cache.source_map = js_compiler.source_map
     javascript_cache.save!
     doc = ""
     doc = "<script defer src='#{javascript_cache.url}' data-theme-id='#{theme_id}'></script>" if javascript_cache.content.present?
diff --git a/config/routes.rb b/config/routes.rb
index 0b1931aaeb..ade3bfa2f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -561,6 +561,7 @@ Discourse::Application.routes.draw do
     get "stylesheets/:name.css" => "stylesheets#show", constraints: { name: /[-a-z0-9_]+/ }
     get "color-scheme-stylesheet/:id(/:theme_id)" => "stylesheets#color_scheme", constraints: { format: :json }
     get "theme-javascripts/:digest.js" => "theme_javascripts#show", constraints: { digest: /\h{40}/ }
+    get "theme-javascripts/:digest.map" => "theme_javascripts#show_map", constraints: { digest: /\h{40}/ }
     get "theme-javascripts/tests/:theme_id-:digest.js" => "theme_javascripts#show_tests"
 
     post "uploads/lookup-metadata" => "uploads#metadata"
diff --git a/db/migrate/20221018100550_add_source_map_to_javascript_cache.rb b/db/migrate/20221018100550_add_source_map_to_javascript_cache.rb
new file mode 100644
index 0000000000..1651e418bd
--- /dev/null
+++ b/db/migrate/20221018100550_add_source_map_to_javascript_cache.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSourceMapToJavascriptCache < ActiveRecord::Migration[7.0]
+  def change
+    add_column :javascript_caches, :source_map, :text
+  end
+end
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 9f1d9c756b..11f1ee2767 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -152,6 +152,10 @@ class DiscourseJsProcessor
         }
       JS
 
+      # Terser
+      load_file_in_context(ctx, "node_modules/source-map/dist/source-map.js")
+      load_file_in_context(ctx, "node_modules/terser/dist/bundle.min.js")
+
       # Template Compiler
       load_file_in_context(ctx, "node_modules/ember-source/dist/ember-template-compiler.js")
       load_file_in_context(ctx, "node_modules/babel-plugin-ember-template-compilation/src/plugin.js", wrap_in_module: "babel-plugin-ember-template-compilation/index")
@@ -197,6 +201,8 @@ class DiscourseJsProcessor
       ctx.eval <<~JS
         globalThis.compileRawTemplate = require('discourse-js-processor').compileRawTemplate;
         globalThis.transpile = require('discourse-js-processor').transpile;
+        globalThis.minify = require('discourse-js-processor').minify;
+        globalThis.getMinifyResult = require('discourse-js-processor').getMinifyResult;
       JS
 
       ctx
@@ -219,9 +225,16 @@ class DiscourseJsProcessor
       @ctx
     end
 
+    # Call a method in the global scope of the v8 context.
+    # The `fetch_result_call` kwarg provides a workaround for the lack of mini_racer async
+    # result support. The first call can perform some async operation, and then `fetch_result_call`
+    # will be called to fetch the result.
     def self.v8_call(*args, **kwargs)
+      fetch_result_call = kwargs.delete(:fetch_result_call)
       mutex.synchronize do
-        v8.call(*args, **kwargs)
+        result = v8.call(*args, **kwargs)
+        result = v8.call(fetch_result_call) if fetch_result_call
+        result
       end
     rescue MiniRacer::RuntimeError => e
       message = e.message
@@ -276,5 +289,8 @@ class DiscourseJsProcessor
       self.class.v8_call("compileRawTemplate", source, theme_id)
     end
 
+    def terser(tree, opts)
+      self.class.v8_call("minify", tree, opts, fetch_result_call: "getMinifyResult")
+    end
   end
 end
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 998963ef55..b278d322c9 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -7,16 +7,78 @@ class ThemeJavascriptCompiler
   class CompileError < StandardError
   end
 
-  attr_accessor :content
+  @@terser_disabled = false
+  def self.disable_terser!
+    raise "Tests only" if !Rails.env.test?
+    @@terser_disabled = true
+  end
+
+  def self.enable_terser!
+    raise "Tests only" if !Rails.env.test?
+    @@terser_disabled = false
+  end
 
   def initialize(theme_id, theme_name)
     @theme_id = theme_id
-    @content = +""
+    @output_tree = []
     @theme_name = theme_name
   end
 
+  def compile!
+    if !@compiled
+      @compiled = true
+      @output_tree.freeze
+      output = if !has_content?
+        { "code" => "" }
+      elsif @@terser_disabled
+        { "code" => raw_content }
+      else
+        DiscourseJsProcessor::Transpiler.new.terser(@output_tree.to_h, terser_config)
+      end
+      @content = output["code"]
+      @source_map = output["map"]
+    end
+    [@content, @source_map]
+  rescue DiscourseJsProcessor::TranspileError => e
+    message = "[THEME #{@theme_id} '#{@theme_name}'] Compile error: #{e.message}"
+    @content = "console.error(#{message.to_json});\n"
+    [@content, @source_map]
+  end
+
+  def terser_config
+    # Based on https://github.com/ember-cli/ember-cli-terser/blob/28df3d90a5/index.js#L12-L26
+    {
+      sourceMap: { includeSources: true, root: "theme-#{@theme_id}/" },
+      compress: {
+        negate_iife: false,
+        sequences: 30,
+      },
+      output: {
+        semicolons: false,
+      },
+    }
+  end
+
+  def content
+    compile!
+    @content
+  end
+
+  def source_map
+    compile!
+    @source_map
+  end
+
+  def raw_content
+    @output_tree.map { |filename, source| source }.join("")
+  end
+
+  def has_content?
+    @output_tree.present?
+  end
+
   def prepend_settings(settings_hash)
-    @content.prepend <<~JS
+    @output_tree.prepend ['settings.js', <<~JS]
       (function() {
         if ('require' in window) {
           require("discourse/lib/theme-settings-store").registerSettings(#{@theme_id}, #{settings_hash.to_json});
@@ -90,16 +152,17 @@ class ThemeJavascriptCompiler
       elsif extension == "hbr"
         append_raw_template(module_name.sub("discourse/templates/", ""), content)
       else
-        append_js_error("unknown file extension '#{extension}' (#{filename})")
+        append_js_error(filename, "unknown file extension '#{extension}' (#{filename})")
       end
     rescue CompileError => e
-      append_js_error "#{e.message} (#{filename})"
+      append_js_error filename, "#{e.message} (#{filename})"
     end
   end
 
   def append_ember_template(name, hbs_template)
-    name = "/#{name}" if !name.start_with?("/")
-    module_name = "discourse/theme-#{@theme_id}#{name}"
+    module_name = name
+    module_name = "/#{module_name}" if !module_name.start_with?("/")
+    module_name = "discourse/theme-#{@theme_id}#{module_name}"
 
     # Some themes are colocating connector JS under `/connectors`. Move template to /templates to avoid module name clash
     if (match = COLOCATED_CONNECTOR_REGEX.match(module_name)) && !match[:prefix].end_with?("/templates")
@@ -114,7 +177,7 @@ class ThemeJavascriptCompiler
     JS
 
     template_module = DiscourseJsProcessor.transpile(script, "", module_name, theme_id: @theme_id)
-    content << <<~JS
+    @output_tree << ["#{name}.js", <<~JS]
       if ('define' in window) {
       #{template_module}
       }
@@ -130,8 +193,12 @@ class ThemeJavascriptCompiler
 
   def append_raw_template(name, hbs_template)
     compiled = DiscourseJsProcessor::Transpiler.new.compile_raw_template(hbs_template, theme_id: @theme_id)
-    @content << <<~JS
+    source_for_comment = hbs_template.gsub("*/", '*\/').indent(4, ' ')
+    @output_tree << ["#{name}.js", <<~JS]
       (function() {
+        /*
+      #{source_for_comment}
+        */
         const addRawTemplate = requirejs('discourse-common/lib/raw-templates').addRawTemplate;
         const template = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
         addRawTemplate(#{raw_template_name(name)}, template);
@@ -141,11 +208,12 @@ class ThemeJavascriptCompiler
     raise CompileError.new ex.message
   end
 
-  def append_raw_script(script)
-    @content << script + "\n"
+  def append_raw_script(filename, script)
+    @output_tree << [filename, script + "\n"]
   end
 
   def append_module(script, name, include_variables: true)
+    original_filename = name
     name = "discourse/theme-#{@theme_id}/#{name.gsub(/^discourse\//, '')}"
 
     # Some themes are colocating connector JS under `/templates/connectors`. Move out of templates to avoid module name clash
@@ -155,7 +223,7 @@ class ThemeJavascriptCompiler
 
     script = "#{theme_settings}#{script}" if include_variables
     transpiler = DiscourseJsProcessor::Transpiler.new
-    @content << <<~JS
+    @output_tree << ["#{original_filename}.js", <<~JS]
       if ('define' in window) {
       #{transpiler.perform(script, "", name).strip}
       }
@@ -164,9 +232,9 @@ class ThemeJavascriptCompiler
     raise CompileError.new ex.message
   end
 
-  def append_js_error(message)
+  def append_js_error(filename, message)
     message = "[THEME #{@theme_id} '#{@theme_name}'] Compile error: #{message}"
-    append_raw_script "console.error(#{message.to_json});"
+    append_raw_script filename, "console.error(#{message.to_json});"
   end
 
   private
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
index 1fb2b64321..1d87b5a85b 100644
--- a/spec/lib/discourse_js_processor_spec.rb
+++ b/spec/lib/discourse_js_processor_spec.rb
@@ -185,4 +185,30 @@ RSpec.describe DiscourseJsProcessor do
       )
     end
   end
+
+  describe "Transpiler#terser" do
+    it "can minify code and provide sourcemaps" do
+      sources = {
+        "multiply.js" => "let multiply = (firstValue, secondValue) => firstValue * secondValue;",
+        "add.js" => "let add = (firstValue, secondValue) => firstValue + secondValue;"
+      }
+
+      result = DiscourseJsProcessor::Transpiler.new.terser(sources, { sourceMap: { includeSources: true } })
+      expect(result.keys).to contain_exactly("code", "map")
+
+      begin
+        # Check the code still works
+        ctx = MiniRacer::Context.new
+        ctx.eval(result["code"])
+        expect(ctx.eval("multiply(2, 3)")).to eq(6)
+        expect(ctx.eval("add(2, 3)")).to eq(5)
+      ensure
+        ctx.dispose
+      end
+
+      map = JSON.parse(result["map"])
+      expect(map["sources"]).to contain_exactly(*sources.keys)
+      expect(map["sourcesContent"]).to contain_exactly(*sources.values)
+    end
+  end
 end
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 46fa810ee5..e530d3ef85 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -8,28 +8,28 @@ RSpec.describe ThemeJavascriptCompiler do
       template = "<h1>hello</h1>"
       name = "/path/to/templates1"
       compiler.append_raw_template("#{name}.raw", template)
-      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"")
+      expect(compiler.raw_content.to_s).to include("addRawTemplate(\"#{name}\"")
 
       name = "/path/to/templates2"
       compiler.append_raw_template("#{name}.hbr", template)
-      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"")
+      expect(compiler.raw_content.to_s).to include("addRawTemplate(\"#{name}\"")
 
       name = "/path/to/templates3"
       compiler.append_raw_template("#{name}.hbs", template)
-      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}.hbs\"")
+      expect(compiler.raw_content.to_s).to include("addRawTemplate(\"#{name}.hbs\"")
     end
   end
 
   describe "#append_ember_template" do
     it 'maintains module names so that discourse-boot.js can correct them' do
       compiler.append_ember_template("/connectors/blah-1", "{{var}}")
-      expect(compiler.content.to_s).to include("define(\"discourse/theme-1/connectors/blah-1\", [\"exports\", \"@ember/template-factory\"]")
+      expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/connectors/blah-1\", [\"exports\", \"@ember/template-factory\"]")
 
       compiler.append_ember_template("connectors/blah-2", "{{var}}")
-      expect(compiler.content.to_s).to include("define(\"discourse/theme-1/connectors/blah-2\", [\"exports\", \"@ember/template-factory\"]")
+      expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/connectors/blah-2\", [\"exports\", \"@ember/template-factory\"]")
 
       compiler.append_ember_template("javascripts/connectors/blah-3", "{{var}}")
-      expect(compiler.content.to_s).to include("define(\"discourse/theme-1/javascripts/connectors/blah-3\", [\"exports\", \"@ember/template-factory\"]")
+      expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/javascripts/connectors/blah-3\", [\"exports\", \"@ember/template-factory\"]")
     end
   end
 
@@ -39,22 +39,22 @@ RSpec.describe ThemeJavascriptCompiler do
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
       compiler.append_ember_template("connectors/outlet/blah-1", "{{var}}")
       compiler.append_module("console.log('test')", "connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
 
       # Colocated under `/templates/connectors`
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
       compiler.append_ember_template("templates/connectors/outlet/blah-1", "{{var}}")
       compiler.append_module("console.log('test')", "templates/connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
 
       # Not colocated
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
       compiler.append_ember_template("templates/connectors/outlet/blah-1", "{{var}}")
       compiler.append_module("console.log('test')", "connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
-      expect(compiler.content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
+      expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
     end
   end
 
@@ -83,8 +83,8 @@ RSpec.describe ThemeJavascriptCompiler do
           "discourse/templates/components/mycomponent.hbs" => "{{my-component-template}}"
         }
       )
-      expect(compiler.content).to include('define("discourse/theme-1/components/mycomponent"')
-      expect(compiler.content).to include('define("discourse/theme-1/discourse/templates/components/mycomponent"')
+      expect(compiler.raw_content).to include('define("discourse/theme-1/components/mycomponent"')
+      expect(compiler.raw_content).to include('define("discourse/theme-1/discourse/templates/components/mycomponent"')
     end
 
     it "handles colocated components" do
@@ -97,8 +97,8 @@ RSpec.describe ThemeJavascriptCompiler do
           "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
         }
       )
-      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
-      expect(compiler.content).to include("setComponentTemplate")
+      expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.raw_content).to include("setComponentTemplate")
     end
 
     it "prints error when default export missing" do
@@ -111,8 +111,8 @@ RSpec.describe ThemeJavascriptCompiler do
           "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
         }
       )
-      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
-      expect(compiler.content).to include("throw new Error")
+      expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.raw_content).to include("throw new Error")
     end
 
     it "handles template-only components" do
@@ -121,9 +121,35 @@ RSpec.describe ThemeJavascriptCompiler do
           "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
         }
       )
-      expect(compiler.content).to include("__COLOCATED_TEMPLATE__ =")
-      expect(compiler.content).to include("setComponentTemplate")
-      expect(compiler.content).to include("@ember/component/template-only")
+      expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
+      expect(compiler.raw_content).to include("setComponentTemplate")
+      expect(compiler.raw_content).to include("@ember/component/template-only")
+    end
+  end
+
+  describe "terser compilation" do
+    it "applies terser and provides sourcemaps" do
+      sources = {
+        "multiply.js" => "let multiply = (firstValue, secondValue) => firstValue * secondValue;",
+        "add.js" => "let add = (firstValue, secondValue) => firstValue + secondValue;"
+      }
+
+      compiler.append_tree(sources)
+
+      expect(compiler.content).to include("multiply")
+      expect(compiler.content).to include("add")
+
+      map = JSON.parse(compiler.source_map)
+      expect(map["sources"]).to contain_exactly(*sources.keys)
+      expect(map["sourcesContent"].to_s).to include("let multiply")
+      expect(map["sourcesContent"].to_s).to include("let add")
+      expect(map["sourceRoot"]).to eq("theme-1/")
+    end
+
+    it "handles invalid JS" do
+      compiler.append_raw_script("filename.js", "if(someCondition")
+      expect(compiler.content).to include('console.error("[THEME 1')
+      expect(compiler.content).to include('Unexpected token')
     end
   end
 end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 931bc45bf7..5a14bca2fa 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -3,6 +3,8 @@
 
 RSpec.describe ThemeField do
   fab!(:theme) { Fabricate(:theme) }
+  before { ThemeJavascriptCompiler.disable_terser! }
+  after { ThemeJavascriptCompiler.enable_terser! }
 
   describe "scope: find_by_theme_ids" do
     it "returns result in the specified order" do
@@ -194,6 +196,26 @@ HTML
     expect(theme.javascript_cache.content).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery-2\"")
     expect(theme.javascript_cache.content).to include("const settings =")
     expect(theme.javascript_cache.content).to include("[THEME #{theme.id} '#{theme.name}'] Compile error: unknown file extension 'blah' (discourse/controllers/discovery.blah)")
+
+    # Check sourcemap
+    expect(theme.javascript_cache.source_map).to eq(nil)
+    ThemeJavascriptCompiler.enable_terser!
+    js_field.update(compiler_version: "0")
+    theme.save!
+
+    expect(theme.javascript_cache.source_map).not_to eq(nil)
+    map = JSON.parse(theme.javascript_cache.source_map)
+
+    expect(map["sources"]).to contain_exactly(
+      "discourse/controllers/discovery-2.js",
+      "discourse/controllers/discovery.blah",
+      "discourse/controllers/discovery.js",
+      "discourse/templates/discovery.js",
+      "discovery.js",
+      "other_discovery.js"
+    )
+    expect(map["sourceRoot"]).to eq("theme-#{theme.id}/")
+    expect(map["sourcesContent"].length).to eq(6)
   end
 
   def create_upload_theme_field!(name)
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index cf2bc2514f..8d513ee005 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -5,6 +5,9 @@ RSpec.describe Theme do
     Theme.clear_cache!
   end
 
+  before { ThemeJavascriptCompiler.disable_terser! }
+  after { ThemeJavascriptCompiler.enable_terser! }
+
   fab! :user do
     Fabricate(:user)
   end
diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rb
index aaa24753a4..0f2c58ce58 100644
--- a/spec/requests/theme_javascripts_controller_spec.rb
+++ b/spec/requests/theme_javascripts_controller_spec.rb
@@ -2,6 +2,9 @@
 RSpec.describe ThemeJavascriptsController do
   include ActiveSupport::Testing::TimeHelpers
 
+  before { ThemeJavascriptCompiler.disable_terser! }
+  after { ThemeJavascriptCompiler.enable_terser! }
+
   def clear_disk_cache
     if Dir.exist?(ThemeJavascriptsController::DISK_CACHE_PATH)
       `rm -rf #{ThemeJavascriptsController::DISK_CACHE_PATH}`
@@ -55,6 +58,40 @@ RSpec.describe ThemeJavascriptsController do
       get "/theme-javascripts/#{javascript_cache.digest}.js"
       expect(response.status).to eq(404)
     end
+
+    it "adds sourceMappingUrl if there is a source map" do
+      digest = SecureRandom.hex(20)
+      javascript_cache.update(digest: digest)
+      get "/theme-javascripts/#{digest}.js"
+      expect(response.status).to eq(200)
+      expect(response.body).to eq('console.log("hello");')
+
+      digest = SecureRandom.hex(20)
+      javascript_cache.update(digest: digest, source_map: '{fakeSourceMap: true}')
+      get "/theme-javascripts/#{digest}.js"
+      expect(response.status).to eq(200)
+      expect(response.body).to eq <<~JS
+        console.log("hello");
+        //# sourceMappingURL=#{digest}.map?__ws=test.localhost
+      JS
+    end
+  end
+
+  describe "#show_map" do
+    it "returns a source map when present" do
+      get "/theme-javascripts/#{javascript_cache.digest}.map"
+      expect(response.status).to eq(404)
+
+      digest = SecureRandom.hex(20)
+      javascript_cache.update(digest: digest, source_map: '{fakeSourceMap: true}')
+      get "/theme-javascripts/#{digest}.map"
+      expect(response.status).to eq(200)
+      expect(response.body).to eq("{fakeSourceMap: true}")
+
+      javascript_cache.destroy
+      get "/theme-javascripts/#{digest}.map"
+      expect(response.status).to eq(404)
+    end
   end
 
   describe "#show_tests" do
@@ -133,5 +170,13 @@ RSpec.describe ThemeJavascriptsController do
       expect(response.status).to eq(200)
       expect(response.body).to include("assert.ok(343434);")
     end
+
+    it "includes inline sourcemap" do
+      ThemeJavascriptCompiler.enable_terser!
+      content, digest = component.baked_js_tests_with_digest
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      expect(response.status).to eq(200)
+      expect(response.body).to include("//# sourceMappingURL=data:application/json;base64,")
+    end
   end
 end

From 897bcacdda9cebfa99f5dee470ae26d713a30309 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 10:35:01 -0700
Subject: [PATCH 198/332] A11Y: Improve topic timeline in WHCM (#18647)

---
 app/assets/stylesheets/common/topic-timeline.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index fb707e5abf..888330e495 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -243,6 +243,7 @@
       height: 100%;
       float: left;
       z-index: z("base") + 1;
+      outline: 1px solid transparent;
     }
 
     .timeline-scroller-content {
@@ -262,7 +263,7 @@
 
     .timeline-scroller {
       @include unselectable;
-      margin-left: -0.19em;
+      margin-left: -0.22em;
       cursor: ns-resize;
       display: flex;
       align-items: center;

From a2596fb3064add3c4728d0527d5a02b0694d5e39 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 18 Oct 2022 13:58:26 -0400
Subject: [PATCH 199/332] A11Y: Add aria labels for posts in group activity
 (#18601)

This view can show multiple posts from the same topic and the aria labels
will now include the post number to more easily differentiate posts in
screen readers.
---
 .../javascripts/discourse/app/components/group-post.js      | 6 ++++++
 .../discourse/app/templates/components/group-post.hbs       | 4 +++-
 config/locales/client.en.yml                                | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js
index 074f856b40..a233bc12cc 100644
--- a/app/assets/javascripts/discourse/app/components/group-post.js
+++ b/app/assets/javascripts/discourse/app/components/group-post.js
@@ -4,6 +4,7 @@ import getURL from "discourse-common/lib/get-url";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 import { propertyEqual } from "discourse/lib/computed";
 import { userPath } from "discourse/lib/url";
+import I18n from "I18n";
 
 export default Component.extend({
   classNameBindings: [
@@ -41,4 +42,9 @@ export default Component.extend({
   userUrl(username) {
     return userPath(username.toLowerCase());
   },
+
+  @discourseComputed("post.topic.title", "post.post_number")
+  titleAriaLabel(title, postNumber) {
+    return I18n.t("groups.aria_post_number", { postNumber, title });
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
index a442d7f077..901ebeb936 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
@@ -6,7 +6,9 @@
   <div class="user-stream-item__details">
     <div class="stream-topic-title">
       <span class="title">
-        <a href={{this.postUrl}}>{{html-safe this.post.topic.fancyTitle}}</a>
+        <a href={{this.postUrl}} aria-label={{this.titleAriaLabel}}>
+          {{html-safe this.post.topic.fancyTitle}}
+        </a>
       </span>
     </div>
     <div class="group-post-category">{{category-link this.post.category}}</div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bb55ec4f1d..b13e39725a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -922,6 +922,7 @@ en:
         no_filter_matches: "No members match that search."
       topics: "Topics"
       posts: "Posts"
+      aria_post_number: "%{title} - post #%{postNumber}"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Default notification level for group messages"

From 83c43bae2a08778d5a594819621ab04d450ddcf9 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 11:05:14 -0700
Subject: [PATCH 200/332] A11Y: Improve user card appearance in WHCM (#18648)

---
 app/assets/stylesheets/common/components/user-card.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 5a7815ee73..80d8162196 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -39,6 +39,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
   background-size: cover;
   transition: opacity 0.2s, transform 0.2s;
   opacity: 0;
+  outline: 2px solid transparent;
   @include transform(scale(0.9));
   &.show {
     opacity: 1;

From 5c7d9513304d14c48a938afedee804edab8d7e0c Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 11:15:42 -0700
Subject: [PATCH 201/332] FIX: User card focus state appearing on click
 (#18650)

---
 app/assets/stylesheets/common/components/user-card.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 80d8162196..307aadcc48 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -72,7 +72,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
         display: flex;
         align-items: center;
 
-        &:focus {
+        &:focus-visible {
           border: 1px solid;
           @include default-focus;
         }

From d25ca2a468ecc5521efb1c35e7258faf514073ec Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 18 Oct 2022 15:19:54 -0300
Subject: [PATCH 202/332] FIX: Exclude hidden topic posts and small actions
 from the RSS feed. (#18649)

This commit excludes posts from hidden topics from the latest posts and user activity RSS feeds. Additionally, it also excludes small actions from the first one.
---
 app/controllers/posts_controller.rb    |  3 ++
 spec/requests/posts_controller_spec.rb | 50 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 520aab3bcc..c404cb6969 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -79,6 +79,8 @@ class PostsController < ApplicationController
       rss_description = I18n.t("rss_description.private_posts")
     else
       posts = Post.public_posts
+        .visible
+        .where(post_type: Post.types[:regular])
         .order(created_at: :desc)
         .where('posts.id <= ?', last_post_id)
         .where('posts.id > ?', last_post_id - 50)
@@ -122,6 +124,7 @@ class PostsController < ApplicationController
     raise Discourse::NotFound unless guardian.can_see_profile?(user)
 
     posts = Post.public_posts
+      .visible
       .where(user_id: user.id)
       .where(post_type: Post.types[:regular])
       .order(created_at: :desc)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 348a5d026a..a7ffbdb8be 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -2063,6 +2063,29 @@ RSpec.describe PostsController do
       expect(body).to include(public_post.url)
     end
 
+    it "doesn't include posts from hidden topics" do
+      public_post.topic.update!(visible: false)
+
+      get "/u/#{user.username}/activity.rss"
+
+      expect(response.status).to eq(200)
+
+      body = response.body
+      expect(body).not_to include(public_post.url)
+    end
+
+    it "excludes small actions" do
+      small_action = Fabricate(:small_action, user: user)
+
+      get "/u/#{user.username}/activity.rss"
+
+      expect(response.status).to eq(200)
+
+      body = response.body
+
+      expect(body).not_to include(small_action.canonical_url)
+    end
+
     it 'returns public posts as JSON' do
       public_post
       private_post
@@ -2164,6 +2187,33 @@ RSpec.describe PostsController do
         expect(body).to_not include(private_post.url)
       end
 
+      it "doesn't include posts from hidden topics" do
+        public_post.topic.update!(visible: false)
+
+        get "/posts.rss"
+
+        expect(response.status).to eq(200)
+
+        body = response.body
+
+        # we cache in redis, in rare cases this can cause a flaky test
+        PostsHelper.clear_canonical_cache!(public_post)
+
+        expect(body).not_to include(public_post.canonical_url)
+      end
+
+      it "excludes small actions" do
+        small_action = Fabricate(:small_action)
+
+        get "/posts.rss"
+
+        expect(response.status).to eq(200)
+
+        body = response.body
+
+        expect(body).not_to include(small_action.canonical_url)
+      end
+
       it 'returns public posts with topic for json' do
         topicless_post.update topic_id: -100
 

From 8791b6d5ee54be43082e4941bfd8ceb118ef23ce Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 12:55:44 -0700
Subject: [PATCH 203/332] A11Y: Improve group search accessibility (#18651)

---
 .../javascripts/discourse/app/templates/groups/index.hbs      | 4 ++--
 config/locales/client.en.yml                                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index 578039fb95..2d818e83df 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -7,7 +7,7 @@
     {{/if}}
 
     <div class="groups-header-filters">
-      <Input @value={{readonly this.filter}} placeholder={{i18n "groups.index.all"}} class="groups-header-filters-name no-blur" {{on "input" (action "onFilterChanged" value="target.value")}} />
+      <Input @value={{readonly this.filter}} placeholder={{i18n "groups.index.all"}} class="groups-header-filters-name no-blur" {{on "input" (action "onFilterChanged" value="target.value")}} @type="search" aria-description={{i18n "groups.index.search_results"}} />
 
       <ComboBox @value={{this.type}} @content={{this.types}} @class="groups-header-filters-type" @onChange={{action (mut this.type)}} @options={{hash
           clearable=true
@@ -77,7 +77,7 @@
 
       <ConditionalLoadingSpinner @condition={{this.groups.loadingMore}} />
     {{else}}
-      <p>{{i18n "groups.index.empty"}}</p>
+      <p role="status">{{i18n "groups.index.empty"}}</p>
     {{/if}}
   </ConditionalLoadingSpinner>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b13e39725a..a5189f4363 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -888,6 +888,7 @@ en:
         group_type: "Group type"
         is_group_user: "Member"
         is_group_owner: "Owner"
+        search_results: "Search results will appear below."
       title:
         one: "Group"
         other: "Groups"

From 799fa8d6f9efb09f5819c3fa2ddab2903e60e1ed Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 19 Oct 2022 08:19:50 +1100
Subject: [PATCH 204/332] FIX: sidebar list destination for tracked and tags
 (#18639)

Follow up for https://github.com/discourse/discourse/pull/18594

Same solution for tracked and tag links.
---
 .../components/sidebar/user/tags-section.js   |   1 +
 .../community-section/tracked-section-link.js |   9 ++
 .../user/tags-section/tag-section-link.js     |  12 +-
 .../sidebar-user-community-section-test.js    | 117 ++++++++++++++++++
 .../sidebar-user-tags-section-test.js         | 113 +++++++++++++++++
 5 files changed, 251 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index fcb60d9de5..0bd4150123 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -48,6 +48,7 @@ export default class SidebarUserTagsSection extends Component {
           new TagSectionLink({
             tagName: tag.name,
             topicTrackingState: this.topicTrackingState,
+            currentUser: this.currentUser,
           })
         );
       }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
index de23bee0a2..87d7d49f0d 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js
@@ -3,6 +3,7 @@ import I18n from "I18n";
 import { tracked } from "@glimmer/tracking";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
 import { isTrackedTopic } from "discourse/lib/topic-list-tracked-filter";
+import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class TrackedSectionLink extends BaseSectionLink {
   @tracked totalUnread = 0;
@@ -64,6 +65,14 @@ export default class TrackedSectionLink extends BaseSectionLink {
   }
 
   get route() {
+    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+      if (this.totalUnread > 0) {
+        return "discovery.unread";
+      }
+      if (this.totalNew > 0) {
+        return "discovery.new";
+      }
+    }
     return "discovery.latest";
   }
 
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
index ed09b6f609..1d46de97fd 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
@@ -4,14 +4,16 @@ import { tracked } from "@glimmer/tracking";
 
 import { bind } from "discourse-common/utils/decorators";
 import BaseTagSectionLink from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
+import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class TagSectionLink extends BaseTagSectionLink {
   @tracked totalUnread = 0;
   @tracked totalNew = 0;
 
-  constructor({ topicTrackingState }) {
+  constructor({ topicTrackingState, currentUser }) {
     super(...arguments);
     this.topicTrackingState = topicTrackingState;
+    this.currentUser = currentUser;
     this.refreshCounts();
   }
 
@@ -33,6 +35,14 @@ export default class TagSectionLink extends BaseTagSectionLink {
   }
 
   get route() {
+    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+      if (this.totalUnread > 0) {
+        return "tag.showUnread";
+      }
+      if (this.totalNew > 0) {
+        return "tag.showNew";
+      }
+    }
     return "tag.show";
   }
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index c8fda4f215..2c36491d70 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -297,6 +297,123 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
   });
 
+  test("clicking on tracked link - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-tracked");
+    assert.strictEqual(
+      currentURL(),
+      "/latest?f=tracked",
+      "it should transition to the latest tracked url"
+    );
+
+    assert.ok(
+      exists(".sidebar-section-community .sidebar-section-link-tracked.active"),
+      "the tracked link is marked as active"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+  });
+
+  test("clicking on tracked link - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+    const categories = Site.current().categories;
+    const category = categories.find((c) => c.id === 1001);
+    category.set("notification_level", NotificationLevels.TRACKING);
+
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 1001,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-tracked");
+
+    assert.strictEqual(
+      currentURL(),
+      "/new?f=tracked",
+      "it should transition to the tracked new page"
+    );
+
+    assert.ok(
+      exists(".sidebar-section-community .sidebar-section-link-tracked.active"),
+      "the tracked link is marked as active"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+  });
+
+  test("clicking on tracked link - sidebar_list_destination set to unread/new with new and unread topics", async function (assert) {
+    const categories = Site.current().categories;
+    const category = categories.find((c) => c.id === 1001);
+    category.set("notification_level", NotificationLevels.TRACKING);
+
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+    topicTrackingState.states.set("t112", {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 1001,
+      created_in_new_period: true,
+    });
+    topicTrackingState.states.set("t113", {
+      last_read_post_number: 1,
+      highest_post_number: 2,
+      id: 113,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 1001,
+      created_in_new_period: true,
+    });
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+    await visit("/t/280");
+    await click(".sidebar-section-community .sidebar-section-link-tracked");
+
+    assert.strictEqual(
+      currentURL(),
+      "/unread?f=tracked",
+      "it should transition to the tracked unread page"
+    );
+
+    assert.ok(
+      exists(".sidebar-section-community .sidebar-section-link-tracked.active"),
+      "the tracked link is marked as active"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-community .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+  });
+
   test("clicking on users link", async function (assert) {
     await visit("/t/280");
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index f3041590d8..ba97bd9ac7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -12,6 +12,7 @@ import {
 } from "discourse/tests/helpers/qunit-helpers";
 import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 acceptance(
   "Sidebar - Logged on user - Tags section - tagging disabled",
@@ -235,6 +236,118 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
   });
 
+  test("clicking tag section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    await visit("/");
+    await click(".sidebar-section-link-tag1");
+
+    assert.strictEqual(
+      currentURL(),
+      "/tag/tag1",
+      "it should transition to tag1's topics discovery page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-tags .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-tag1.active`),
+      "the tag1 section link is marked as active"
+    );
+  });
+
+  test("clicking tag section links - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    this.container.lookup("service:topic-tracking-state").loadStates([
+      {
+        topic_id: 1,
+        highest_post_number: 1,
+        last_read_post_number: null,
+        created_at: "2022-05-11T03:09:31.959Z",
+        category_id: 1,
+        notification_level: null,
+        created_in_new_period: true,
+        treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        tags: ["tag1"],
+      },
+    ]);
+
+    await visit("/");
+    await click(".sidebar-section-link-tag1");
+
+    assert.strictEqual(
+      currentURL(),
+      "/tag/tag1/l/new",
+      "it should transition to tag1's topics new page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-tags .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-tag1.active`),
+      "the tag1 section link is marked as active"
+    );
+  });
+
+  test("clicking tag section links - sidebar_list_destination set to unread/new with unread topics", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_list_destination: "unread_new",
+      },
+    });
+
+    this.container.lookup("service:topic-tracking-state").loadStates([
+      {
+        topic_id: 1,
+        highest_post_number: 2,
+        last_read_post_number: 1,
+        created_at: "2022-05-11T03:09:31.959Z",
+        category_id: 1,
+        notification_level: NotificationLevels.TRACKING,
+        created_in_new_period: true,
+        treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        tags: ["tag1"],
+      },
+    ]);
+
+    await visit("/");
+    await click(".sidebar-section-link-tag1");
+
+    assert.strictEqual(
+      currentURL(),
+      "/tag/tag1/l/unread",
+      "it should transition to tag1's topics unread page"
+    );
+
+    assert.strictEqual(
+      count(".sidebar-section-tags .sidebar-section-link.active"),
+      1,
+      "only one link is marked as active"
+    );
+
+    assert.ok(
+      exists(`.sidebar-section-link-tag1.active`),
+      "the tag1 section link is marked as active"
+    );
+  });
+
   test("private message tag section links for user", async function (assert) {
     await visit("/");
 

From a8af510636641cac343201539549c1db9d793c97 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 15:01:09 -0700
Subject: [PATCH 205/332] A11Y: Return focus to header search button upon
 escape of search (#18656)

---
 app/assets/javascripts/discourse/app/widgets/search-menu.js  | 3 ++-
 .../javascripts/discourse/tests/acceptance/search-test.js    | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 09caead6b7..c2c546af63 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -356,8 +356,9 @@ export default createWidget("search-menu", {
   },
 
   keyDown(e) {
-    if (e.which === 27 /* escape */) {
+    if (e.key === "Escape") {
       this.sendWidgetAction("toggleSearchMenu");
+      document.querySelector("#search-button").focus();
       e.preventDefault();
       return false;
     }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index 0adb01f2be..751623da21 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -450,6 +450,11 @@ acceptance("Search - Authenticated", function (needs) {
     );
 
     await triggerKeyEvent(".search-menu", "keydown", "Escape");
+    assert.strictEqual(
+      document.activeElement,
+      query("#search-button"),
+      "Escaping search returns focus to search button"
+    );
     assert.ok(!exists(".search-menu:visible"), "Esc removes search dropdown");
 
     await click("#search-button");

From dcbfbbf19d36defbfa094881b23805ee55c7cdf4 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Oct 2022 15:14:27 -0700
Subject: [PATCH 206/332] A11Y: Add `aria-label` to topic post badges (#18657)

---
 .../app/templates/topic-post-badges.hbr       | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr b/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
index 5c1ec0cd2b..81017949a6 100644
--- a/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
+++ b/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
@@ -1,11 +1,26 @@
-<span class='topic-post-badges'>
-  {{~#if newPosts ~}}
-    &nbsp;<a href='{{url}}' class='badge badge-notification unread-posts' title='{{i18n "topic.unread_posts" count=newPosts}}'>{{newPosts}}</a>
+<span class="topic-post-badges">
+  {{~#if newPosts~}}
+    &nbsp;<a
+      href="{{url}}"
+      class="badge badge-notification unread-posts"
+      title="{{i18n 'topic.unread_posts' count=newPosts}}"
+      aria-label="{{i18n 'topic.unread_posts' count=newPosts}}"
+    >{{newPosts}}</a>
   {{~/if}}
-  {{~#if unreadPosts ~}}
-    &nbsp;<a href='{{url}}' class='badge badge-notification unread-posts' title='{{i18n "topic.unread_posts" count=unreadPosts}}'>{{unreadPosts}}</a>
+  {{~#if unreadPosts~}}
+    &nbsp;<a
+      href="{{url}}"
+      class="badge badge-notification unread-posts"
+      title="{{i18n 'topic.unread_posts' count=unreadPosts}}"
+      aria-label="{{i18n 'topic.unread_posts' count=unreadPosts}}"
+    >{{unreadPosts}}</a>
   {{~/if}}
-  {{~#if unseen ~}}
-    &nbsp;<a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
+  {{~#if unseen~}}
+    &nbsp;<a
+      href="{{url}}"
+      class="badge badge-notification new-topic"
+      title="{{i18n 'topic.new'}}"
+      aria-label="{{i18n 'topic.new'}}"
+    >{{newDotText}}</a>
   {{~/if}}
 </span>

From 99d9c933c6b24241a94ffffeb79678456af7458d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 18 Oct 2022 18:18:23 -0400
Subject: [PATCH 207/332] FIX: ensure dropdown is above sibling labels (#18658)

---
 app/assets/stylesheets/common/base/login.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 506897cd40..9b1b852d21 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -197,6 +197,9 @@ body.invite-page {
         padding: 0 0.25em 0 0.25em;
         font-size: $font-down-1;
       }
+      .user-field.dropdown:focus-within {
+        z-index: 1000; // this ensures the active dropdown is always on top of sibling dropdown labels
+      }
       input:focus + label.alt-placeholder,
       input.value-entered + label.alt-placeholder {
         top: -8px;

From 45bdfa1c8488092e37ae11b68da4f12d96f112b9 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 19 Oct 2022 11:48:36 +1100
Subject: [PATCH 208/332] FIX: sidebar_list_destination on
 CurrentUserSerializer (#18660)

Before, `sidebar_list_destination` was an attribute on UserOptionSerializer. The problem was that this attribute was added to user model only when the user entered the preferences panel. We want that attribute to be available all the time, therefore it was moved to CurrentUserSerializer.
---
 .../app/controllers/preferences/sidebar.js    |  4 ++++
 .../javascripts/discourse/app/models/user.js  |  2 +-
 .../sidebar-user-categories-section-test.js   | 12 +++-------
 .../sidebar-user-community-section-test.js    | 24 +++++--------------
 .../sidebar-user-tags-section-test.js         | 12 +++-------
 .../user-preferences-sidebar-test.js          |  4 +---
 app/serializers/current_user_serializer.rb    |  7 +++++-
 app/serializers/user_option_serializer.rb     |  7 +-----
 .../current_user_serializer_spec.rb           |  9 +++++++
 spec/serializers/user_serializer_spec.rb      |  9 -------
 10 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js b/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
index b4c1067d8f..9e7f5b80cb 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
@@ -46,6 +46,10 @@ export default class extends Controller {
         if (result.user.sidebar_tags) {
           this.model.set("sidebar_tags", result.user.sidebar_tags);
         }
+        this.model.set(
+          "sidebar_list_destination",
+          this.newSidebarListDestination
+        );
 
         this.saved = true;
       })
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index d80c75fc1f..352aa1e09f 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -350,7 +350,7 @@ const User = RestModel.extend({
     );
   },
 
-  sidebarListDestination: readOnly("user_option.sidebar_list_destination"),
+  sidebarListDestination: readOnly("sidebar_list_destination"),
 
   changeUsername(new_username) {
     return ajax(userPath(`${this.username_lower}/preferences/username`), {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index d47e21dca7..c5e11bf95d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -295,9 +295,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
   test("clicking section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
     const { category1 } = setupUserSidebarCategories();
 
@@ -336,9 +334,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     await visit("/");
@@ -384,9 +380,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     await visit("/");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index 2c36491d70..dbfdc5ebfd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -162,9 +162,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
   test("clicking on everything link - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     await visit("/t/280");
@@ -201,9 +199,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
     await visit("/t/280");
     await click(".sidebar-section-community .sidebar-section-link-everything");
@@ -248,9 +244,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
     await visit("/t/280");
     await click(".sidebar-section-community .sidebar-section-link-everything");
@@ -299,9 +293,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
   test("clicking on tracked link - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     await visit("/t/280");
@@ -340,9 +332,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
     await visit("/t/280");
     await click(".sidebar-section-community .sidebar-section-link-tracked");
@@ -389,9 +379,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
     await visit("/t/280");
     await click(".sidebar-section-community .sidebar-section-link-tracked");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index ba97bd9ac7..fd96263148 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -238,9 +238,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
   test("clicking tag section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     await visit("/");
@@ -266,9 +264,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
   test("clicking tag section links - sidebar_list_destination set to unread/new with new topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -308,9 +304,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
   test("clicking tag section links - sidebar_list_destination set to unread/new with unread topics", async function (assert) {
     updateCurrentUser({
-      user_option: {
-        sidebar_list_destination: "unread_new",
-      },
+      sidebar_list_destination: "unread_new",
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
index a78df47e32..85db3fbb62 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
@@ -46,9 +46,7 @@ acceptance("User Preferences - Sidebar", function (needs) {
               { name: "monkey", pm_only: false },
               { name: "gazelle", pm_only: false },
             ],
-            user_option: {
-              sidebar_list_destination: "unread_new",
-            },
+            sidebar_list_destination: "unread_new",
           },
         });
       }
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index a144b560e3..62b358e165 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -81,7 +81,8 @@ class CurrentUserSerializer < BasicUserSerializer
              :likes_notifications_disabled,
              :grouped_unread_notifications,
              :redesigned_user_menu_enabled,
-             :redesigned_user_page_nav_enabled
+             :redesigned_user_page_nav_enabled,
+             :sidebar_list_destination
 
   delegate :user_stat, to: :object, private: true
   delegate :any_posts, :draft_count, :pending_posts_count, :read_faq?, to: :user_stat
@@ -160,6 +161,10 @@ class CurrentUserSerializer < BasicUserSerializer
     object.user_option.bookmark_auto_delete_preference
   end
 
+  def sidebar_list_destination
+    object.user_option.sidebar_list_none_selected? ? SiteSetting.default_sidebar_list_destination : object.user_option.sidebar_list_destination
+  end
+
   def can_send_private_email_messages
     scope.can_send_private_messages_to_email?
   end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 582e00b7f2..19e7c794b0 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -34,8 +34,7 @@ class UserOptionSerializer < ApplicationSerializer
              :timezone,
              :skip_new_user_tips,
              :default_calendar,
-             :oldest_search_log_date,
-             :sidebar_list_destination
+             :oldest_search_log_date
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
@@ -52,8 +51,4 @@ class UserOptionSerializer < ApplicationSerializer
   def theme_ids
     object.theme_ids.presence || [SiteSetting.default_theme_id]
   end
-
-  def sidebar_list_destination
-    object.sidebar_list_none_selected? ? SiteSetting.default_sidebar_list_destination : object.sidebar_list_destination
-  end
 end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 267eedac16..a8095e7557 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -388,5 +388,14 @@ RSpec.describe CurrentUserSerializer do
     end
   end
 
+  describe "#sidebar_list_destination" do
+    it "returns choosen value or default" do
+      expect(serializer.as_json[:sidebar_list_destination]).to eq(SiteSetting.default_sidebar_list_destination)
+
+      user.user_option.update!(sidebar_list_destination: "unread_new")
+      expect(serializer.as_json[:sidebar_list_destination]).to eq("unread_new")
+    end
+  end
+
   include_examples "#display_sidebar_tags", described_class
 end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index dc82b84251..b5abe360d2 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -426,13 +426,4 @@ RSpec.describe UserSerializer do
   end
 
   include_examples "#display_sidebar_tags", UserSerializer
-
-  describe "#sidebar_list_destination" do
-    it "returns choosen value or default" do
-      expect(serializer.as_json[:user_option][:sidebar_list_destination]).to eq(SiteSetting.default_sidebar_list_destination)
-
-      user.user_option.update!(sidebar_list_destination: "unread_new")
-      expect(serializer.as_json[:user_option][:sidebar_list_destination]).to eq("unread_new")
-    end
-  end
 end

From 7c25597da24320ead6dbccc5f94c314221cf67a3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 19 Oct 2022 14:03:57 +1000
Subject: [PATCH 209/332] FEATURE: Generic hashtag autocomplete part 1 (#18592)

This commit adds a new `/hashtag/search` endpoint and both
relevant JS and ruby plugin APIs to handle plugins adding their
own data sources and priority orders for types of things to search
when `#` is pressed.

A `context` param is added to `setupHashtagAutocomplete` which
a corresponding chat PR https://github.com/discourse/discourse-chat/pull/1302
will now use.

The UI calls `registerHashtagSearchParam` for each context that will
require a `#` search (e.g. the topic composer), for each type of record that
the context needs to search for, as well as a priority order for that type. Core
uses this call to add the `category` and `tag` data sources to the topic composer.

The `register_hashtag_data_source` ruby plugin API call is for plugins to
add a new data source for the hashtag searching endpoint, e.g. discourse-chat
may add a `channel` data source.

This functionality is hidden behind the `enable_experimental_hashtag_autocomplete`
flag, except for the change to `setupHashtagAutocomplete` since only core and
discourse-chat are using that function. Note this PR does **not** include required
changes for hashtag lookup or new styling.
---
 .../discourse/app/components/d-editor.js      |  13 +-
 .../composer-hashtag-autocomplete.js          |  16 ++
 .../discourse/app/lib/category-hashtags.js    |  39 +---
 .../discourse/app/lib/hashtag-autocomplete.js | 139 +++++++++++--
 .../discourse/app/lib/plugin-api.js           |  30 +++
 .../app/templates/hashtag-autocomplete.hbr    |   8 +-
 .../stylesheets/common/base/tagging.scss      |  20 +-
 app/controllers/hashtags_controller.rb        |  44 +---
 app/services/hashtag_autocomplete_service.rb  | 192 ++++++++++++++++++
 config/routes.rb                              |   1 +
 lib/plugin/instance.rb                        |  10 +
 spec/rails_helper.rb                          |   3 +
 .../hashtag_autocomplete_service_spec.rb      | 133 ++++++++++++
 13 files changed, 554 insertions(+), 94 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/initializers/composer-hashtag-autocomplete.js
 create mode 100644 app/services/hashtag_autocomplete_service.rb
 create mode 100644 spec/services/hashtag_autocomplete_service_spec.rb

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index bb3fbbeb15..3dcdfd0f7e 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -462,10 +462,15 @@ export default Component.extend(TextareaTextManipulation, {
   },
 
   _applyCategoryHashtagAutocomplete() {
-    setupHashtagAutocomplete(this._$textarea, this.siteSettings, (value) => {
-      this.set("value", value);
-      schedule("afterRender", this, this.focusTextArea);
-    });
+    setupHashtagAutocomplete(
+      "topic-composer",
+      this._$textarea,
+      this.siteSettings,
+      (value) => {
+        this.set("value", value);
+        schedule("afterRender", this, this.focusTextArea);
+      }
+    );
   },
 
   _applyEmojiAutocomplete($textarea) {
diff --git a/app/assets/javascripts/discourse/app/initializers/composer-hashtag-autocomplete.js b/app/assets/javascripts/discourse/app/initializers/composer-hashtag-autocomplete.js
new file mode 100644
index 0000000000..b46fab8cd2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/composer-hashtag-autocomplete.js
@@ -0,0 +1,16 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+export default {
+  name: "composer-hashtag-autocomplete",
+
+  initialize(container) {
+    const siteSettings = container.lookup("service:site-settings");
+
+    withPluginApi("1.4.0", (api) => {
+      if (siteSettings.enable_experimental_hashtag_autocomplete) {
+        api.registerHashtagSearchParam("category", "topic-composer", 100);
+        api.registerHashtagSearchParam("tag", "topic-composer", 50);
+      }
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/lib/category-hashtags.js b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
index 18cf98b899..b8ed69c74f 100644
--- a/app/assets/javascripts/discourse/app/lib/category-hashtags.js
+++ b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
@@ -1,9 +1,7 @@
+import { hashtagTriggerRule } from "discourse/lib/hashtag-autocomplete";
+import deprecated from "discourse-common/lib/deprecated";
+
 export const SEPARATOR = ":";
-import {
-  caretPosition,
-  caretRowCol,
-  inCodeBlock,
-} from "discourse/lib/utilities";
 
 export function replaceSpan($elem, categorySlug, categoryLink, type) {
   type = type ? ` data-type="${type}"` : "";
@@ -13,29 +11,12 @@ export function replaceSpan($elem, categorySlug, categoryLink, type) {
 }
 
 export function categoryHashtagTriggerRule(textarea, opts) {
-  const result = caretRowCol(textarea);
-  const row = result.rowNum;
-  let col = result.colNum;
-  let line = textarea.value.split("\n")[row - 1];
-
-  if (opts && opts.backSpace) {
-    col = col - 1;
-    line = line.slice(0, line.length - 1);
-
-    // Don't trigger autocomplete when backspacing into a `#category |` => `#category|`
-    if (/^#{1}\w+/.test(line)) {
-      return false;
+  deprecated(
+    "categoryHashtagTriggerRule is being replaced by hashtagTriggerRule and the new hashtag-autocomplete plugin APIs",
+    {
+      since: "2.9.0.beta10",
+      dropFrom: "3.0.0.beta1",
     }
-  }
-
-  // Don't trigger autocomplete when ATX-style headers are used
-  if (col < 6 && line.slice(0, col) === "#".repeat(col)) {
-    return false;
-  }
-
-  if (inCodeBlock(textarea.value, caretPosition(textarea))) {
-    return false;
-  }
-
-  return true;
+  );
+  return hashtagTriggerRule(textarea, opts);
 }
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
index eba9dcf0d6..e62e0ea507 100644
--- a/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
@@ -1,39 +1,81 @@
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
-
-// TODO: (martin) Make a more generic version of these functions.
-import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
+import discourseLater from "discourse-common/lib/later";
+import { INPUT_DELAY, isTesting } from "discourse-common/config/environment";
+import { cancel } from "@ember/runloop";
+import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import { ajax } from "discourse/lib/ajax";
+import discourseDebounce from "discourse-common/lib/debounce";
+import {
+  caretPosition,
+  caretRowCol,
+  inCodeBlock,
+} from "discourse/lib/utilities";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 
 export function setupHashtagAutocomplete(
+  context,
   $textArea,
   siteSettings,
   afterComplete
 ) {
   if (siteSettings.enable_experimental_hashtag_autocomplete) {
-    _setupExperimental($textArea, siteSettings, afterComplete);
+    _setupExperimental(context, $textArea, siteSettings, afterComplete);
   } else {
     _setup($textArea, siteSettings, afterComplete);
   }
 }
 
-function _setupExperimental($textArea, siteSettings, afterComplete) {
+const contextBasedParams = {};
+
+export function registerHashtagSearchParam(param, context, priority) {
+  if (!contextBasedParams[context]) {
+    contextBasedParams[context] = {};
+  }
+  contextBasedParams[context][param] = priority;
+}
+
+export function hashtagTriggerRule(textarea, opts) {
+  const result = caretRowCol(textarea);
+  const row = result.rowNum;
+  let col = result.colNum;
+  let line = textarea.value.split("\n")[row - 1];
+
+  if (opts && opts.backSpace) {
+    col = col - 1;
+    line = line.slice(0, line.length - 1);
+
+    // Don't trigger autocomplete when backspacing into a `#category |` => `#category|`
+    if (/^#{1}\w+/.test(line)) {
+      return false;
+    }
+  }
+
+  // Don't trigger autocomplete when ATX-style headers are used
+  if (col < 6 && line.slice(0, col) === "#".repeat(col)) {
+    return false;
+  }
+
+  if (inCodeBlock(textarea.value, caretPosition(textarea))) {
+    return false;
+  }
+
+  return true;
+}
+
+function _setupExperimental(context, $textArea, siteSettings, afterComplete) {
   $textArea.autocomplete({
     template: findRawTemplate("hashtag-autocomplete"),
     key: "#",
     afterComplete,
     treatAsTextarea: $textArea[0].tagName === "INPUT",
-    transformComplete: (obj) => {
-      return obj.text;
-    },
+    transformComplete: (obj) => obj.ref,
     dataSource: (term) => {
       if (term.match(/\s/)) {
         return null;
       }
-      return searchCategoryTag(term, siteSettings);
-    },
-    triggerRule: (textarea, opts) => {
-      return categoryHashtagTriggerRule(textarea, opts);
+      return _searchGeneric(term, siteSettings, context);
     },
+    triggerRule: (textarea, opts) => hashtagTriggerRule(textarea, opts),
   });
 }
 
@@ -42,17 +84,78 @@ function _setup($textArea, siteSettings, afterComplete) {
     template: findRawTemplate("category-tag-autocomplete"),
     key: "#",
     afterComplete,
-    transformComplete: (obj) => {
-      return obj.text;
-    },
+    transformComplete: (obj) => obj.text,
     dataSource: (term) => {
       if (term.match(/\s/)) {
         return null;
       }
       return searchCategoryTag(term, siteSettings);
     },
-    triggerRule: (textarea, opts) => {
-      return categoryHashtagTriggerRule(textarea, opts);
-    },
+    triggerRule: (textarea, opts) => hashtagTriggerRule(textarea, opts),
   });
 }
+
+let searchCache = {};
+let searchCacheTime;
+let currentSearch;
+
+function _updateSearchCache(term, results) {
+  searchCache[term] = results;
+  searchCacheTime = new Date();
+  return results;
+}
+
+function _searchGeneric(term, siteSettings, context) {
+  if (currentSearch) {
+    currentSearch.abort();
+    currentSearch = null;
+  }
+  if (new Date() - searchCacheTime > 30000) {
+    searchCache = {};
+  }
+  const cached = searchCache[term];
+  if (cached) {
+    return cached;
+  }
+
+  return new Promise((resolve) => {
+    let timeoutPromise = isTesting()
+      ? null
+      : discourseLater(() => {
+          resolve(CANCELLED_STATUS);
+        }, 5000);
+
+    if (term === "") {
+      return resolve(CANCELLED_STATUS);
+    }
+
+    const debouncedSearch = (q, ctx, resultFunc) => {
+      discourseDebounce(this, _searchRequest, q, ctx, resultFunc, INPUT_DELAY);
+    };
+
+    debouncedSearch(term, context, (result) => {
+      cancel(timeoutPromise);
+      resolve(_updateSearchCache(term, result));
+    });
+  });
+}
+
+function _searchRequest(term, context, resultFunc) {
+  currentSearch = ajax("/hashtags/search.json", {
+    data: { term, order: _sortedContextParams(context) },
+  });
+  currentSearch
+    .then((r) => {
+      resultFunc(r.results || CANCELLED_STATUS);
+    })
+    .finally(() => {
+      currentSearch = null;
+    });
+  return currentSearch;
+}
+
+function _sortedContextParams(context) {
+  return Object.entries(contextBasedParams[context])
+    .sort((a, b) => b[1] - a[1])
+    .map((item) => item[0]);
+}
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 7074c83d13..9635da273a 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -104,6 +104,7 @@ import DiscourseURL from "discourse/lib/url";
 import { registerNotificationTypeRenderer } from "discourse/lib/notification-types-manager";
 import { registerUserMenuTab } from "discourse/lib/user-menu/tab";
 import { registerModelTransformer } from "discourse/lib/model-transformers";
+import { registerHashtagSearchParam } from "discourse/lib/hashtag-autocomplete";
 
 // If you add any methods to the API ensure you bump up the version number
 // based on Semantic Versioning 2.0.0. Please update the changelog at
@@ -1981,6 +1982,35 @@ class PluginApi {
   registerModelTransformer(modelName, transformer) {
     registerModelTransformer(modelName, transformer);
   }
+
+  /**
+   * EXPERIMENTAL. Do not use.
+   *
+   * When initiating a search inside the composer or other designated inputs
+   * with the `#` key, we search records based on params registered with
+   * this function, and order them by type using the priority here. Since
+   * there can be many different inputs that use `#` and some may need to
+   * weight different types higher in priority, we also require a context
+   * parameter.
+   *
+   * For example, the topic composer may wish to search for categories
+   * and tags, with categories appearing first in the results. The usage
+   * looks like this:
+   *
+   * api.registerHashtagSearchParam("category", "topic-composer", 100);
+   * api.registerHashtagSearchParam("tag", "topic-composer", 50);
+   *
+   * Additional types of records used for the hashtag search results
+   * can be registered via the #register_hashtag_data_source plugin API
+   * method.
+   *
+   * @param {string} param - The type of record to be fetched.
+   * @param {string} context - Where the hashtag search is being initiated using `#`
+   * @param {number} priority - Used for ordering types of records. Priority order is descending.
+   */
+  registerHashtagSearchParam(param, context, priority) {
+    registerHashtagSearchParam(param, context, priority);
+  }
 }
 
 // from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
diff --git a/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
index f1ddde7111..2b52969887 100644
--- a/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
+++ b/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
@@ -1,12 +1,8 @@
 <div class='autocomplete hashtag-autocomplete'>
   <ul>
     {{#each options as |option|}}
-      <li>
-        {{#if option.model}}
-          <a href>{{category-link option.model allowUncategorized="true" link="false"}}</a>
-        {{else}}
-          <a href>{{d-icon 'tag'}}{{option.name}} x {{option.count}}</a>
-        {{/if}}
+      <li class="hashtag-autocomplete__option">
+        <a class="hashtag-autocomplete__link" href>{{d-icon option.icon}}<span class="hashtag-autocomplete__text">{{option.text}}</span></a>
       </li>
     {{/each}}
   </ul>
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 6ded31f48d..78d8411ccb 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -191,7 +191,7 @@ header .discourse-tag {
   }
 }
 
-.autocomplete {
+.autocomplete.ac-category-or-tag {
   a {
     color: var(--primary-medium);
   }
@@ -203,6 +203,24 @@ header .discourse-tag {
   }
 }
 
+.hashtag-autocomplete {
+  .hashtag-autocomplete__option {
+    .hashtag-autocomplete__link {
+      align-items: center;
+      color: var(--primary-medium);
+      display: flex;
+
+      .d-icon {
+        padding-right: 0.5em;
+      }
+
+      .hashtag-autocomplete__text {
+        flex: 1;
+      }
+    }
+  }
+}
+
 .tags-admin-menu {
   margin-top: 20px;
   ul {
diff --git a/app/controllers/hashtags_controller.rb b/app/controllers/hashtags_controller.rb
index 6fa0cf282c..ec625b7f22 100644
--- a/app/controllers/hashtags_controller.rb
+++ b/app/controllers/hashtags_controller.rb
@@ -3,46 +3,18 @@
 class HashtagsController < ApplicationController
   requires_login
 
-  HASHTAGS_PER_REQUEST = 20
-
   def show
     raise Discourse::InvalidParameters.new(:slugs) if !params[:slugs].is_a?(Array)
+    render json: HashtagAutocompleteService.new(guardian).lookup(params[:slugs])
+  end
 
-    all_slugs = []
-    tag_slugs = []
+  def search
+    params.require(:term)
+    params.require(:order)
+    raise Discourse::InvalidParameters.new(:order) if !params[:order].is_a?(Array)
 
-    params[:slugs][0..HASHTAGS_PER_REQUEST].each do |slug|
-      if slug.end_with?(PrettyText::Helpers::TAG_HASHTAG_POSTFIX)
-        tag_slugs << slug.chomp(PrettyText::Helpers::TAG_HASHTAG_POSTFIX)
-      else
-        all_slugs << slug
-      end
-    end
+    results = HashtagAutocompleteService.new(guardian).search(params[:term], params[:order])
 
-    # Try to resolve hashtags as categories first
-    category_slugs_and_ids = all_slugs.map { |slug| [slug, Category.query_from_hashtag_slug(slug)&.id] }.to_h
-    category_ids_and_urls = Category
-      .secured(guardian)
-      .select(:id, :slug, :parent_category_id) # fields required for generating category URL
-      .where(id: category_slugs_and_ids.values)
-      .map { |c| [c.id, c.url] }
-      .to_h
-    categories_hashtags = {}
-    category_slugs_and_ids.each do |slug, id|
-      if category_url = category_ids_and_urls[id]
-        categories_hashtags[slug] = category_url
-      end
-    end
-
-    # Resolve remaining hashtags as tags
-    tag_hashtags = {}
-    if SiteSetting.tagging_enabled
-      tag_slugs += (all_slugs - categories_hashtags.keys)
-      DiscourseTagging.filter_visible(Tag.where_name(tag_slugs), guardian).each do |tag|
-        tag_hashtags[tag.name] = tag.full_url
-      end
-    end
-
-    render json: { categories: categories_hashtags, tags: tag_hashtags }
+    render json: success_json.merge(results: results)
   end
 end
diff --git a/app/services/hashtag_autocomplete_service.rb b/app/services/hashtag_autocomplete_service.rb
new file mode 100644
index 0000000000..3d1efe2227
--- /dev/null
+++ b/app/services/hashtag_autocomplete_service.rb
@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+
+class HashtagAutocompleteService
+  HASHTAGS_PER_REQUEST = 20
+
+  attr_reader :guardian
+  cattr_reader :data_sources
+
+  def self.register_data_source(type, &block)
+    @@data_sources[type] = block
+  end
+
+  def self.clear_data_sources
+    @@data_sources = {}
+
+    register_data_source("category") do |guardian, term, limit|
+      guardian_categories = Site.new(guardian).categories
+
+      guardian_categories
+        .select { |category| category[:name].downcase.include?(term) }
+        .take(limit)
+        .map do |category|
+          HashtagItem.new.tap do |item|
+            item.text = category[:name]
+            item.slug = category[:slug]
+
+            # Single-level category heirarchy should be enough to distinguish between
+            # categories here.
+            item.ref =
+              if category[:parent_category_id]
+                parent_category =
+                  guardian_categories.find { |c| c[:id] === category[:parent_category_id] }
+                category[:slug] if !parent_category
+
+                parent_slug = parent_category[:slug]
+                "#{parent_slug}:#{category[:slug]}"
+              else
+                category[:slug]
+              end
+            item.icon = "folder"
+          end
+        end
+    end
+
+    register_data_source("tag") do |guardian, term, limit|
+      if SiteSetting.tagging_enabled
+        tags_with_counts, _ =
+          DiscourseTagging.filter_allowed_tags(
+            guardian,
+            term: term,
+            with_context: true,
+            limit: limit,
+            for_input: true,
+          )
+        TagsController
+          .tag_counts_json(tags_with_counts)
+          .take(limit)
+          .map do |tag|
+            HashtagItem.new.tap do |item|
+              item.text = "#{tag[:name]} x #{tag[:count]}"
+              item.slug = tag[:name]
+              item.icon = "tag"
+            end
+          end
+      else
+        []
+      end
+    end
+  end
+
+  clear_data_sources
+
+  class HashtagItem
+    # The text to display in the UI autocomplete menu for the item.
+    attr_accessor :text
+
+    # Canonical slug for the item. Different from the ref, which can
+    # have the type as a suffix to distinguish between conflicts.
+    attr_accessor :slug
+
+    # The icon to display in the UI autocomplete menu for the item.
+    attr_accessor :icon
+
+    # Distinguishes between different entities e.g. tag, category.
+    attr_accessor :type
+
+    # Inserted into the textbox when an autocomplete item is selected,
+    # and must be unique so it can be used for lookups via the #lookup
+    # method above.
+    attr_accessor :ref
+  end
+
+  def initialize(guardian)
+    @guardian = guardian
+  end
+
+  def lookup(slugs)
+    raise Discourse::InvalidParameters.new(:slugs) if !slugs.is_a?(Array)
+
+    all_slugs = []
+    tag_slugs = []
+
+    slugs[0..HashtagAutocompleteService::HASHTAGS_PER_REQUEST].each do |slug|
+      if slug.end_with?(PrettyText::Helpers::TAG_HASHTAG_POSTFIX)
+        tag_slugs << slug.chomp(PrettyText::Helpers::TAG_HASHTAG_POSTFIX)
+      else
+        all_slugs << slug
+      end
+    end
+
+    # Try to resolve hashtags as categories first
+    category_slugs_and_ids =
+      all_slugs.map { |slug| [slug, Category.query_from_hashtag_slug(slug)&.id] }.to_h
+    category_ids_and_urls =
+      Category
+        .secured(guardian)
+        .select(:id, :slug, :parent_category_id) # fields required for generating category URL
+        .where(id: category_slugs_and_ids.values)
+        .map { |c| [c.id, c.url] }
+        .to_h
+    categories_hashtags = {}
+    category_slugs_and_ids.each do |slug, id|
+      if category_url = category_ids_and_urls[id]
+        categories_hashtags[slug] = category_url
+      end
+    end
+
+    # Resolve remaining hashtags as tags
+    tag_hashtags = {}
+    if SiteSetting.tagging_enabled
+      tag_slugs += (all_slugs - categories_hashtags.keys)
+      DiscourseTagging
+        .filter_visible(Tag.where_name(tag_slugs), guardian)
+        .each { |tag| tag_hashtags[tag.name] = tag.full_url }
+    end
+
+    { categories: categories_hashtags, tags: tag_hashtags }
+  end
+
+  def search(term, types_in_priority_order, limit = 5)
+    raise Discourse::InvalidParameters.new(:order) if !types_in_priority_order.is_a?(Array)
+
+    results = []
+    slugs_by_type = {}
+    term = term.downcase
+    types_in_priority_order =
+      types_in_priority_order.select { |type| @@data_sources.keys.include?(type) }
+
+    types_in_priority_order.each do |type|
+      data = @@data_sources[type].call(guardian, term, limit - results.length)
+      next if data.empty?
+
+      all_data_items_valid = data.all? do |item|
+        item.kind_of?(HashtagItem) && item.slug.present? && item.text.present?
+      end
+      next if !all_data_items_valid
+
+      data.each do |item|
+        item.type = type
+        item.ref = item.ref || item.slug
+      end
+      slugs_by_type[type] = data.map(&:slug)
+
+      results.concat(data)
+
+      break if results.length >= limit
+    end
+
+    # Any items that are _not_ the top-ranked type (which could possibly not be
+    # the same as the first item in the types_in_priority_order if there was
+    # no data for that type) that have conflicting slugs with other items for
+    # other types need to have a ::type suffix added to their ref.
+    #
+    # This will be used for the lookup method above if one of these items is
+    # chosen in the UI, otherwise there is no way to determine whether a hashtag is
+    # for a category or a tag etc.
+    #
+    # For example, if there is a category with the slug #general and a tag
+    # with the slug #general, then the tag will have its ref changed to #general::tag
+    top_ranked_type = slugs_by_type.keys.first
+    results.each do |hashtag_item|
+      next if hashtag_item.type == top_ranked_type
+
+      other_slugs = results.reject { |r| r.type === hashtag_item.type }.map(&:slug)
+      if other_slugs.include?(hashtag_item.slug)
+        hashtag_item.ref = "#{hashtag_item.slug}::#{hashtag_item.type}"
+      end
+    end
+
+    results.take(limit)
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index ade3bfa2f3..cbb1ee5197 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -771,6 +771,7 @@ Discourse::Application.routes.draw do
     end
 
     get "hashtags" => "hashtags#show"
+    get "hashtags/search" => "hashtags#search"
 
     TopTopic.periods.each do |period|
       get "top/#{period}.rss", to: redirect("top.rss?period=#{period}", status: 301)
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 84306edbce..dfa943792d 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -1086,6 +1086,16 @@ class Plugin::Instance
     About.add_plugin_stat_group(plugin_stat_group_name, show_in_ui: show_in_ui, &block)
   end
 
+  # Registers a new record type to be searched via the HashtagAutocompleteService and the
+  # /hashtags/search endpoint. The data returned by the block must be an array
+  # with each item an instance of HashtagAutocompleteService::HashtagItem.
+  #
+  # See also registerHashtagSearchParam in the plugin JS API, otherwise the
+  # clientside hashtag search code will use the new type registered here.
+  def register_hashtag_data_source(type, &block)
+    HashtagAutocompleteService.register_data_source(type, &block)
+  end
+
   protected
 
   def self.js_path
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e825618a94..0a057d4962 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -155,6 +155,9 @@ module TestSetup
     # Make sure the default Post and Topic bookmarkables are registered
     Bookmark.reset_bookmarkables
 
+    # Make sure only the default category and tag hashtag data sources are registered.
+    HashtagAutocompleteService.clear_data_sources
+
     OmniAuth.config.test_mode = false
   end
 end
diff --git a/spec/services/hashtag_autocomplete_service_spec.rb b/spec/services/hashtag_autocomplete_service_spec.rb
new file mode 100644
index 0000000000..c098dd3f5e
--- /dev/null
+++ b/spec/services/hashtag_autocomplete_service_spec.rb
@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+RSpec.describe HashtagAutocompleteService do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:category1) { Fabricate(:category, name: "Book Club", slug: "book-club") }
+  fab!(:tag1) { Fabricate(:tag, name: "great-books") }
+  let(:guardian) { Guardian.new(user) }
+
+  subject { described_class.new(guardian) }
+
+  before { Site.clear_cache }
+
+  def register_bookmark_data_source
+    HashtagAutocompleteService.register_data_source("bookmark") do |guardian_scoped, term, limit|
+      guardian_scoped
+        .user
+        .bookmarks
+        .where("name ILIKE ?", "%#{term}%")
+        .limit(limit)
+        .map do |bm|
+          HashtagAutocompleteService::HashtagItem.new.tap do |item|
+            item.text = bm.name
+            item.slug = bm.name.gsub(" ", "-")
+            item.icon = "bookmark"
+          end
+        end
+    end
+  end
+
+  describe "#search" do
+    it "returns search results for tags and categories by default" do
+      expect(subject.search("book", %w[category tag]).map(&:text)).to eq(
+        ["Book Club", "great-books x 0"],
+      )
+    end
+
+    it "respects the types_in_priority_order param" do
+      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(
+        ["great-books x 0", "Book Club"],
+      )
+    end
+
+    it "respects the limit param" do
+      expect(subject.search("book", %w[tag category], 1).map(&:text)).to eq(["great-books x 0"])
+    end
+
+    it "includes the tag count" do
+      tag1.update!(topic_count: 78)
+      expect(subject.search("book", %w[tag category], 1).map(&:text)).to eq(["great-books x 78"])
+    end
+
+    it "does case-insensitive search" do
+      expect(subject.search("book", %w[category tag]).map(&:text)).to eq(
+        ["Book Club", "great-books x 0"],
+      )
+      expect(subject.search("bOOk", %w[category tag]).map(&:text)).to eq(
+        ["Book Club", "great-books x 0"],
+      )
+    end
+
+    it "does not include categories the user cannot access" do
+      category1.update!(read_restricted: true)
+      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(["great-books x 0"])
+    end
+
+    it "does not include tags the user cannot access" do
+      Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["great-books"])
+      expect(subject.search("book", %w[tag]).map(&:text)).to be_empty
+    end
+
+    it "does not search other data sources if the limit is reached by earlier type data sources" do
+      Site.any_instance.expects(:categories).never
+      subject.search("book", %w[tag category], 1)
+    end
+
+    it "includes other data sources" do
+      Fabricate(:bookmark, user: user, name: "read review of this fantasy book")
+      Fabricate(:bookmark, user: user, name: "cool rock song")
+      guardian.user.reload
+
+      HashtagAutocompleteService.register_data_source("bookmark") do |guardian_scoped, term, limit|
+        guardian_scoped
+          .user
+          .bookmarks
+          .where("name ILIKE ?", "%#{term}%")
+          .limit(limit)
+          .map do |bm|
+            HashtagAutocompleteService::HashtagItem.new.tap do |item|
+              item.text = bm.name
+              item.slug = bm.name.dasherize
+              item.icon = "bookmark"
+            end
+          end
+      end
+
+      expect(subject.search("book", %w[category tag bookmark]).map(&:text)).to eq(
+        ["Book Club", "great-books x 0", "read review of this fantasy book"],
+      )
+    end
+
+    it "handles refs for categories that have a parent" do
+      parent = Fabricate(:category, name: "Hobbies", slug: "hobbies")
+      category1.update!(parent_category: parent)
+      expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
+        %w[hobbies:book-club great-books],
+      )
+    end
+
+    it "appends type suffixes for the ref on conflicting slugs on items that are not the top priority type" do
+      Fabricate(:tag, name: "book-club")
+      expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
+        %w[book-club great-books book-club::tag],
+      )
+
+      Fabricate(:bookmark, user: user, name: "book club")
+      guardian.user.reload
+
+      register_bookmark_data_source
+
+      expect(subject.search("book", %w[category tag bookmark]).map(&:ref)).to eq(
+        %w[book-club great-books book-club::tag book-club::bookmark],
+      )
+    end
+
+    context "when not tagging_enabled" do
+      before { SiteSetting.tagging_enabled = false }
+
+      it "does not return any tags" do
+        expect(subject.search("book", %w[category tag]).map(&:text)).to eq(["Book Club"])
+      end
+    end
+  end
+end

From 437de6338efd2bae22ef00febaa3d992ee5ed790 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 18 Oct 2022 21:02:56 -0700
Subject: [PATCH 210/332] DEV: add currentPath arg to above-site-header plugin
 outlet

---
 app/assets/javascripts/discourse/app/templates/application.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs
index d135bc5dd8..1bcc83c735 100644
--- a/app/assets/javascripts/discourse/app/templates/application.hbs
+++ b/app/assets/javascripts/discourse/app/templates/application.hbs
@@ -1,7 +1,7 @@
 <DiscourseRoot>
   <a href="#main-container" id="skip-link">{{i18n "skip_to_main_content"}}</a>
   <DDocument />
-  <PluginOutlet @name="above-site-header" @connectorTagName="div" />
+  <PluginOutlet @name="above-site-header" @connectorTagName="div" @args={{hash currentPath=this.router._router.currentPath}} />
 
   {{#if this.showSiteHeader}}
     <SiteHeader

From a705e4815fac1cc74073848a8dfa3c7b441ead22 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 19 Oct 2022 09:53:56 +0200
Subject: [PATCH 211/332] FIX: do not include group less emojis in standard
 list (#18659)

---
 app/models/emoji.rb       |  5 +++--
 spec/models/emoji_spec.rb | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 0519b1abe8..2525b30948 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -88,13 +88,14 @@ class Emoji
 
   def self.create_from_db_item(emoji)
     name = emoji["name"]
+    return unless group = groups[name]
     filename = emoji['filename'] || name
 
     Emoji.new.tap do |e|
       e.name = name
       e.tonable = Emoji.tonable_emojis.include?(name)
       e.url = Emoji.url_for(filename)
-      e.group = groups[name] || DEFAULT_GROUP
+      e.group = group
       e.search_aliases = search_aliases[name] || []
     end
   end
@@ -151,7 +152,7 @@ class Emoji
   end
 
   def self.load_standard
-    db['emojis'].map { |e| Emoji.create_from_db_item(e) }
+    db['emojis'].map { |e| Emoji.create_from_db_item(e) }.compact
   end
 
   def self.load_custom
diff --git a/spec/models/emoji_spec.rb b/spec/models/emoji_spec.rb
index 6e13304ee5..6a6ec56294 100644
--- a/spec/models/emoji_spec.rb
+++ b/spec/models/emoji_spec.rb
@@ -143,15 +143,26 @@ RSpec.describe Emoji do
     end
   end
 
+  describe ".load_standard" do
+    it "removes nil emojis" do
+      expect(Emoji.load_standard.any? { |element| element.nil? }).to be false
+    end
+  end
+
   describe "#create_from_db_item" do
     it "sets the group of the emoji" do
       emoji = Emoji.create_from_db_item("name" => "scotland")
       expect(emoji.group).to eq("flags")
     end
 
-    it "sets the search aliases of the emoji" do
-      emoji = Emoji.create_from_db_item("name" => "sad")
-      expect(emoji.search_aliases).to contain_exactly("frowning_face", "slightly_frowning_face", "sob", "crying_cat_face", "cry", "face_holding_back_tears")
+    it "sets the group of the emoji" do
+      emoji = Emoji.create_from_db_item("name" => "scotland")
+      expect(emoji.group).to eq("flags")
+    end
+
+    it "doesn’t create emoji when group is unknown" do
+      emoji = Emoji.create_from_db_item("name" => "white_hair")
+      expect(emoji).to be_nil
     end
   end
 end

From 4e97c6ba13145e446c8d56c9cb3e5884dbed55d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:03:25 +0200
Subject: [PATCH 212/332] Build(deps-dev): Bump rspec-rails from 6.0.0 to 6.0.1
 (#18653)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1529a77ae2..6aa078370f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (6.0.0)
+    rspec-rails (6.0.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)

From a8cd5454e71ecc2a071575fbcdebedb1780247ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:03:55 +0200
Subject: [PATCH 213/332] Build(deps-dev): Bump mocha from 1.15.0 to 1.16.0
 (#18654)

Bumps [mocha](https://github.com/freerange/mocha) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/freerange/mocha/releases)
- [Changelog](https://github.com/freerange/mocha/blob/v1.16.0/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v1.15.0...v1.16.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 6aa078370f..78500b1b71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -239,7 +239,7 @@ GEM
     mini_suffix (0.3.3)
       ffi (~> 1.9)
     minitest (5.16.3)
-    mocha (1.15.0)
+    mocha (1.16.0)
     msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)

From cf3b5fa1cb67d200bd4bf07b6f90a73f72cb21dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:12:48 +0200
Subject: [PATCH 214/332] Build(deps): Bump nokogiri from 1.13.8 to 1.13.9
 (#18655)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.9/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 78500b1b71..7ae646d9e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -255,16 +255,16 @@ GEM
     net-smtp (0.3.2)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.8-aarch64-linux)
+    nokogiri (1.13.9-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.8-arm64-darwin)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)

From b6ba106f2688016507d85b09301e3d2fa49b1cc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:47:09 +0200
Subject: [PATCH 215/332] Build(deps-dev): Bump rswag-specs from 2.6.0 to 2.7.0
 (#18662)

Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.6.0...2.7.0)

---
updated-dependencies:
- dependency-name: rswag-specs
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7ae646d9e8..cf43e5c864 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -190,8 +190,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.6.2)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
+    json-schema (3.0.0)
+      addressable (>= 2.8)
     json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
@@ -401,10 +401,11 @@ GEM
     rspec-support (3.11.1)
     rss (0.2.9)
       rexml
-    rswag-specs (2.6.0)
+    rswag-specs (2.7.0)
       activesupport (>= 3.1, < 7.1)
-      json-schema (~> 2.2)
+      json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
+      rspec-core (>= 2.14)
     rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)

From a53eb0882ac9822786ee4dfb0745352b45949f28 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 19 Oct 2022 11:46:01 +0200
Subject: [PATCH 216/332] DEV: Prevent potential site state leaks in tests
 (#18663)

If one were to modify nested objects in `Site.current()` those changes would be carried over subsequent tests.
---
 .../discourse/tests/helpers/qunit-helpers.js     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index b9b348770f..081431fe29 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -127,14 +127,14 @@ export function withFrozenTime(timeString, timezone, callback) {
 
 let _pretenderCallbacks = {};
 
-export function resetSite(siteSettings, extras) {
-  let siteAttrs = Object.assign(
-    {},
-    siteFixtures["site.json"].site,
-    extras || {}
-  );
-  siteAttrs.siteSettings = siteSettings;
-  PreloadStore.store("site", siteAttrs);
+export function resetSite(siteSettings, extras = {}) {
+  const siteAttrs = {
+    ...siteFixtures["site.json"].site,
+    ...extras,
+    siteSettings,
+  };
+
+  PreloadStore.store("site", cloneJSON(siteAttrs));
   Site.resetCurrent();
 }
 

From c185043590f931c7185ccbec33eb0bd2d77d764d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 19 Oct 2022 10:49:01 +0100
Subject: [PATCH 217/332] FIX: Ensure minification does not break colocated
 connectors (#18664)

The filenames (minus the extensions) were being used as keys in a hash to pass to Terser, which meant that colocated connector files would overwrite each other. This commit moves the un-colocating earlier in the pipeline so that the fixed filenames are passed to Terser.

Followup to be3d6a56ceb6c41918df6ded81c9881bcb1f6407
---
 lib/theme_javascript_compiler.rb           | 29 ++++++++++++++--------
 spec/lib/theme_javascript_compiler_spec.rb | 21 +++++++++++-----
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index b278d322c9..1668168145 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -2,7 +2,7 @@
 
 class ThemeJavascriptCompiler
 
-  COLOCATED_CONNECTOR_REGEX = /\A(?<prefix>.*)\/connectors\/(?<outlet>[^\/]+)\/(?<name>[^\/\.]+)\z/
+  COLOCATED_CONNECTOR_REGEX = /\A(?<prefix>.*\/?)connectors\/(?<outlet>[^\/]+)\/(?<name>[^\/\.]+)\.(?<extension>.+)\z/
 
   class CompileError < StandardError
   end
@@ -101,6 +101,23 @@ class ThemeJavascriptCompiler
       end
     end
 
+    # Some themes are colocating connector JS under `/connectors`. Move template to /templates to avoid module name clash
+    tree.transform_keys! do |filename|
+      match = COLOCATED_CONNECTOR_REGEX.match(filename)
+      next filename if !match
+
+      is_template = match[:extension] == "hbs"
+      is_in_templates_directory = match[:prefix].split("/").last == "templates"
+
+      if is_template && !is_in_templates_directory
+        "#{match[:prefix]}templates/connectors/#{match[:outlet]}/#{match[:name]}.#{match[:extension]}"
+      elsif !is_template && is_in_templates_directory
+        "#{match[:prefix].chomp('templates/')}connectors/#{match[:outlet]}/#{match[:name]}.#{match[:extension]}"
+      else
+        filename
+      end
+    end
+
     # Handle colocated components
     tree.dup.each_pair do |filename, content|
       is_component_template = filename.end_with?(".hbs") && filename.start_with?("#{root_name}/components/")
@@ -164,11 +181,6 @@ class ThemeJavascriptCompiler
     module_name = "/#{module_name}" if !module_name.start_with?("/")
     module_name = "discourse/theme-#{@theme_id}#{module_name}"
 
-    # Some themes are colocating connector JS under `/connectors`. Move template to /templates to avoid module name clash
-    if (match = COLOCATED_CONNECTOR_REGEX.match(module_name)) && !match[:prefix].end_with?("/templates")
-      module_name = "#{match[:prefix]}/templates/connectors/#{match[:outlet]}/#{match[:name]}"
-    end
-
     # Mimics the ember-cli implementation
     # https://github.com/ember-cli/ember-cli-htmlbars/blob/d5aa14b3/lib/template-compiler-plugin.js#L18-L26
     script = <<~JS
@@ -216,11 +228,6 @@ class ThemeJavascriptCompiler
     original_filename = name
     name = "discourse/theme-#{@theme_id}/#{name.gsub(/^discourse\//, '')}"
 
-    # Some themes are colocating connector JS under `/templates/connectors`. Move out of templates to avoid module name clash
-    if (match = COLOCATED_CONNECTOR_REGEX.match(name)) && match[:prefix].end_with?("/templates")
-      name = "#{match[:prefix].delete_suffix("/templates")}/connectors/#{match[:outlet]}/#{match[:name]}"
-    end
-
     script = "#{theme_settings}#{script}" if include_variables
     transpiler = DiscourseJsProcessor::Transpiler.new
     @output_tree << ["#{original_filename}.js", <<~JS]
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index e530d3ef85..116e4ee3e7 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -37,24 +37,33 @@ RSpec.describe ThemeJavascriptCompiler do
     it 'separates colocated connectors to avoid module name clash' do
       # Colocated under `/connectors`
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
-      compiler.append_ember_template("connectors/outlet/blah-1", "{{var}}")
-      compiler.append_module("console.log('test')", "connectors/outlet/blah-1")
+      compiler.append_tree({
+        "connectors/outlet/blah-1.hbs" => "{{var}}",
+        "connectors/outlet/blah-1.js" => "console.log('test')"
+      })
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
 
       # Colocated under `/templates/connectors`
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
-      compiler.append_ember_template("templates/connectors/outlet/blah-1", "{{var}}")
-      compiler.append_module("console.log('test')", "templates/connectors/outlet/blah-1")
+      compiler.append_tree({
+        "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
+        "templates/connectors/outlet/blah-1.js" => "console.log('test')"
+      })
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
 
       # Not colocated
       compiler = ThemeJavascriptCompiler.new(1, 'marks')
-      compiler.append_ember_template("templates/connectors/outlet/blah-1", "{{var}}")
-      compiler.append_module("console.log('test')", "connectors/outlet/blah-1")
+      compiler.append_tree({
+        "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
+        "connectors/outlet/blah-1.js" => "console.log('test')"
+      })
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
       expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
+      expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
     end
   end
 

From 8d3fe3ddc5d38ab02a8f5c6aed7ebf7a6bcfbfec Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 19 Oct 2022 10:52:39 +0100
Subject: [PATCH 218/332] DEV: Bump theme compiler version for connector fix
 (#18665)

This should have been included in c185043590f931c7185ccbec33eb0bd2d77d764d
---
 app/models/theme.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/theme.rb b/app/models/theme.rb
index 662dc1c890..adce6dbabd 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,7 +6,7 @@ require 'json_schemer'
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 65
+  BASE_COMPILER_VERSION = 66
 
   attr_accessor :child_components
 

From 91b991320c267aad6ba88dde26f9fe5729508689 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 19 Oct 2022 12:07:04 +0100
Subject: [PATCH 219/332] DEV: Enable ember-qunit's `TestIsolationValidation`
 feature (#18666)

This ensures ember's runloop is settled before starting the next test.
---
 app/assets/javascripts/discourse/tests/test-boot-ember-cli.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
index eabbec1ef7..66bf28a39e 100644
--- a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
+++ b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
@@ -61,6 +61,7 @@ document.addEventListener("discourse-booted", () => {
     loadTests: false,
     startTests: !disableAutoStart,
     setupEmberOnerrorValidation: !skipCore,
+    setupTestIsolationValidation: true,
   });
 });
 

From 0af2837b73924759af6503a081737e6e85af3ff5 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Wed, 19 Oct 2022 09:19:28 -0400
Subject: [PATCH 220/332] Update translations (#18642)

---
 config/locales/client.ar.yml                  |   7 -
 config/locales/client.be.yml                  |   3 +
 config/locales/client.bg.yml                  |   9 +-
 config/locales/client.bs_BA.yml               |   9 +-
 config/locales/client.ca.yml                  |   8 +-
 config/locales/client.cs.yml                  |   8 +-
 config/locales/client.da.yml                  |  11 +-
 config/locales/client.de.yml                  | 352 ++++++-------
 config/locales/client.el.yml                  |   9 +-
 config/locales/client.es.yml                  |  64 ++-
 config/locales/client.et.yml                  |   4 +
 config/locales/client.fa_IR.yml               |  37 +-
 config/locales/client.fi.yml                  |   7 -
 config/locales/client.fr.yml                  |   8 -
 config/locales/client.gl.yml                  |  11 +-
 config/locales/client.he.yml                  |  40 +-
 config/locales/client.hr.yml                  |  12 +-
 config/locales/client.hu.yml                  |  10 +-
 config/locales/client.hy.yml                  |   8 +-
 config/locales/client.id.yml                  |   2 +
 config/locales/client.it.yml                  | 211 +++++---
 config/locales/client.ja.yml                  |  35 +-
 config/locales/client.ko.yml                  |  11 +-
 config/locales/client.lt.yml                  |   9 +-
 config/locales/client.lv.yml                  |   9 +-
 config/locales/client.nb_NO.yml               |   9 +-
 config/locales/client.nl.yml                  |  11 +-
 config/locales/client.pl_PL.yml               |  14 +-
 config/locales/client.pt.yml                  |   9 +-
 config/locales/client.pt_BR.yml               |   8 -
 config/locales/client.ro.yml                  |   5 +-
 config/locales/client.ru.yml                  |  46 +-
 config/locales/client.sk.yml                  |   2 +
 config/locales/client.sl.yml                  |   9 +-
 config/locales/client.sq.yml                  |   2 +
 config/locales/client.sr.yml                  |   2 +
 config/locales/client.sv.yml                  |  37 +-
 config/locales/client.sw.yml                  |   2 +
 config/locales/client.te.yml                  |   2 +
 config/locales/client.th.yml                  |   2 +
 config/locales/client.tr_TR.yml               |  38 +-
 config/locales/client.uk.yml                  |  14 +-
 config/locales/client.ur.yml                  |  11 +-
 config/locales/client.vi.yml                  |  11 +-
 config/locales/client.zh_CN.yml               | 461 +++++++++---------
 config/locales/client.zh_TW.yml               |  44 +-
 config/locales/server.ar.yml                  |   3 -
 config/locales/server.be.yml                  |   2 -
 config/locales/server.bs_BA.yml               |   2 -
 config/locales/server.ca.yml                  |   3 -
 config/locales/server.cs.yml                  |   3 -
 config/locales/server.da.yml                  |   4 -
 config/locales/server.de.yml                  | 293 ++++++-----
 config/locales/server.el.yml                  |   3 -
 config/locales/server.en_GB.yml               |   2 -
 config/locales/server.es.yml                  |  86 +++-
 config/locales/server.et.yml                  |   1 -
 config/locales/server.fa_IR.yml               |   7 +-
 config/locales/server.fi.yml                  |   3 -
 config/locales/server.fr.yml                  |   5 -
 config/locales/server.gl.yml                  |   3 -
 config/locales/server.he.yml                  |  15 +-
 config/locales/server.hr.yml                  |   4 -
 config/locales/server.hu.yml                  |   5 -
 config/locales/server.hy.yml                  |   1 -
 config/locales/server.id.yml                  |   2 -
 config/locales/server.it.yml                  | 186 +++++--
 config/locales/server.ja.yml                  |   3 -
 config/locales/server.ko.yml                  |   5 -
 config/locales/server.lt.yml                  |   4 -
 config/locales/server.nb_NO.yml               |   1 -
 config/locales/server.nl.yml                  |   3 -
 config/locales/server.pl_PL.yml               |   7 -
 config/locales/server.pt.yml                  |   4 -
 config/locales/server.pt_BR.yml               |   7 -
 config/locales/server.ro.yml                  |   2 -
 config/locales/server.ru.yml                  |  13 +-
 config/locales/server.sk.yml                  |   2 -
 config/locales/server.sv.yml                  |  15 +-
 config/locales/server.sw.yml                  |   2 -
 config/locales/server.tr_TR.yml               |   8 +-
 config/locales/server.uk.yml                  |   5 -
 config/locales/server.ur.yml                  |   4 -
 config/locales/server.vi.yml                  |   3 -
 config/locales/server.zh_CN.yml               | 441 ++++++++---------
 config/locales/server.zh_TW.yml               |  15 +-
 .../config/locales/server.cs.yml              |   4 +
 .../config/locales/client.cs.yml              |  31 ++
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.it.yml              |   2 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 .../config/locales/server.cs.yml              |   5 +
 .../config/locales/server.cs.yml              | 103 ++--
 .../config/locales/server.zh_CN.yml           |   2 +-
 plugins/poll/config/locales/server.de.yml     |   2 +-
 plugins/poll/config/locales/server.it.yml     |   7 +
 plugins/poll/config/locales/server.zh_CN.yml  |   4 +-
 .../styleguide/config/locales/client.de.yml   |   6 +-
 .../styleguide/config/locales/client.it.yml   |   4 +-
 .../config/locales/client.zh_CN.yml           |   4 +-
 public/403.cs.html                            |   4 +-
 101 files changed, 1663 insertions(+), 1329 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 7653c7b44c..c572e875e1 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -1451,8 +1451,6 @@ ar:
         edit: "تعديل"
         edit_title: "تعديل تطبيق المصادقة"
         edit_description: "اسم تطبيق المصادقة"
-        enable_security_key_description: |
-          عندما يكون <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">مفتاح الأمان المحمول</a> لديك جاهزًا، اضغط على الزر "تسجيل" أدناه.
         totp:
           title: "تطبيقات المصادقة المعتمدة على الرموز المميزة"
           add: "إضافة تطبيق مصادقة"
@@ -1460,14 +1458,10 @@ ar:
           name_and_code_required_error: "يجب عليك إدخال اسم، والرمز من تطبيق المصادقة."
         security_key:
           register: "التسجيل"
-          title: "مفاتيح الأمان"
-          add: "إضافة مفتاح أمان"
           default_name: "مفتاح الأمان الرئيسي"
           not_allowed_error: "انتهت مهلة عملية تسجيل مفتاح الأمان أو تم إلغاؤها."
           already_added_error: "لقد سجَّلت مفتاح الأمان هذا بالفعل. ليس عليك تسجيله مرة أخرى."
-          edit: "تعديل مفتاح الأمان"
           save: "حفظ"
-          edit_description: "اسم مفتاح الأمان"
           name_required_error: "يجب عليك إدخال اسم لمفتاح الأمان."
       change_about:
         title: "تغيير \"نبذة عني\""
@@ -2019,7 +2013,6 @@ ar:
       second_factor_backup_title: "الرمز الاحتياطي للمصادقة الثنائية"
       second_factor_backup_description: "يُرجى إدخال أحد الرموز الاحتياطية:"
       second_factor: "تسجيل الدخول باستخدام تطبيق المصادقة"
-      security_key_description: "عندما يكون مفتاح الأمان المادي جاهزًا، اضغط على زر \"المصادقة باستخدام مفتاح الأمان\" أدناه."
       security_key_alternative: "جرِّب طريقة أخرى"
       security_key_authenticate: "المصادقة باستخدام مفتاح الأمان"
       security_key_not_allowed_error: "انتهت مهلة عملية المصادقة باستخدام مفتاح الأمان أو تم إلغاؤها."
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index dcd8ee2968..a82cc566c3 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -467,6 +467,7 @@ be:
         regular: "звычайны"
       experimental_sidebar:
         options: "Налады"
+        navigation_section: "рух"
       tag_settings: "Цэтлікі"
       watched_tags_instructions: "Вы будзеце аўтаматычна адсочваць усе новыя тэмы па гэтых цэтліках. Таксама вам будуць прыходзіць паведамленні пра новыя пасты і тэмы, а падлік непрачытаных і новых пастоў адлюструюцца побач з тэмамі."
       tracked_tags_instructions: "Вы будзеце аўтаматычна адсочваць усе тэмы па гэтых цэтліках. Падлік непрачытаных і новых пастоў побач адлюструюцца побач з тэмамі."
@@ -521,6 +522,8 @@ be:
         edit: "рэдагаваць"
         security_key:
           register: "рэгістрацыя"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           save: "Захаваць"
       change_about:
         title: "Змяніць інфу аба мяне"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 7cf7a89261..af5ea7c878 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -1038,6 +1038,8 @@ bg:
       enable_defer: "Активирайте отлагане, за да маркирате темите като непрочетени"
       experimental_sidebar:
         options: "Опции"
+        navigation_section: "Навигация"
+        list_destination_default: "По подразбиране"
       change: "промени"
       featured_topic: "Представена тема"
       moderator: "%{user} е модератор"
@@ -1207,8 +1209,6 @@ bg:
         edit: "Редактирай"
         edit_title: "Редактиране на Authenticator"
         edit_description: "Име на Authenticator"
-        enable_security_key_description: |
-          Когато сте <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">хардуерен ключ за сигурност</a> , натиснете бутона Регистриране по-долу.
         totp:
           title: "Authenticator, базиран на токени"
           add: "Добавете Authenticator"
@@ -1216,14 +1216,10 @@ bg:
           name_and_code_required_error: "Трябва да предоставите име и кода от вашето приложение за удостоверяване."
         security_key:
           register: "Регистриране"
-          title: "Ключове за сигурност"
-          add: "Добавете ключ за сигурност"
           default_name: "Основен ключ за сигурност"
           not_allowed_error: "Процесът на регистрация на ключ за сигурност или е изтекъл, или е бил анулиран."
           already_added_error: "Вече сте регистрирали този ключ за сигурност. Не е нужно да го регистрирате отново."
-          edit: "Редактиране на ключа за сигурност"
           save: "Запази"
-          edit_description: "Име на ключа за сигурност"
           name_required_error: "Трябва да посочите име за вашия ключ за сигурност."
       change_about:
         title: "Смяна на За мен"
@@ -1663,7 +1659,6 @@ bg:
       second_factor_backup_title: "Двуфакторно резервно копие"
       second_factor_backup_description: "Моля, въведете един от вашите резервни кодове:"
       second_factor: "Влезте с помощта на приложението Authenticator"
-      security_key_description: "Когато сте подготвили вашия физически ключ за сигурност, натиснете бутона Удостоверяване с ключ за сигурност по-долу."
       security_key_alternative: "Опитайте друг начин"
       security_key_authenticate: "Удостоверяване с ключ за сигурност"
       security_key_not_allowed_error: "Процесът на удостоверяване на ключа за сигурност или изтече, или беше анулиран."
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index e18a4e38e9..f7e09dd544 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -949,6 +949,8 @@ bs_BA:
       enable_defer: "Uključi odgodu označavanja nepročitanih tema"
       experimental_sidebar:
         options: "Opcije"
+        navigation_section: "Navigacija"
+        list_destination_default: "Uobičajen"
       change: "promjeni"
       featured_topic: "Istaknuta tema"
       moderator: "%{user} je moderator"
@@ -1094,8 +1096,6 @@ bs_BA:
         disable: "Onemogući"
         save: "Sačuvaj"
         edit: "Izmijeni"
-        enable_security_key_description: |
-          Kada pripremite <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardverski sigurnosni ključ</a> , pritisnite tipku Registracija u nastavku.
         totp:
           title: "Autentikatori zasnovani na tokenu"
           add: "Dodaj provjeru autentičnosti"
@@ -1103,14 +1103,10 @@ bs_BA:
           name_and_code_required_error: "Morate navesti ime i kôd iz aplikacije za provjeru autentičnosti."
         security_key:
           register: "Registriraj"
-          title: "Sigurnosni ključevi"
-          add: "Dodaj sigurnosni ključ"
           default_name: "Glavni sigurnosni ključ"
           not_allowed_error: "Proces registracije sigurnosnog ključa je ili vremenski istekao ili je odkazan."
           already_added_error: "Već ste registrirali ovaj sigurnosni ključ. Ne morate ga ponovno registrirati."
-          edit: "Izmijeni sigurnosni ključ"
           save: "Sačuvaj"
-          edit_description: "Ime sigurnosnog ključa"
           name_required_error: "Morate navesti ime za svoj sigurnosni ključ."
       change_about:
         title: "Promjeni O meni"
@@ -1539,7 +1535,6 @@ bs_BA:
       second_factor_backup: "Loguj se koristeći backup kod"
       second_factor_backup_description: "Molim ukucajte jedan od vaši rezevni kodova"
       second_factor: "Loguj se koristeći Authenticator app"
-      security_key_description: "Kada ste pripremili vaš fizički sigurnosni ključ, pritisnite ispod dugme Autentifikacija pomoću sigurnosnog ključa."
       security_key_alternative: "Pokušaj na drugi način"
       security_key_authenticate: "Autentifikacija sa sigurnosnim ključem"
       security_key_not_allowed_error: "Ovaj proces prijave pomoću sigurnosnog ključa je ili vremenski istekao ili je odkazan."
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index f4535ad6d3..ef3bd29c81 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -923,6 +923,8 @@ ca:
       enable_defer: "Habilita l'ajornament per a marcar temes no llegits"
       experimental_sidebar:
         options: "Opcions"
+        navigation_section: "Navegació"
+        list_destination_default: "Per defecte"
       change: "canvia"
       featured_topic: "Tema destacat"
       moderator: "%{user} és un moderador"
@@ -1063,13 +1065,12 @@ ca:
           default_name: "El meu autenticador"
         security_key:
           register: "Registre"
-          title: "Claus de seguretat"
           default_name: "Clau de seguretat principal"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "El procés de registre de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
           already_added_error: "Ja heu registrat aquesta clau de seguretat. No cal que la registreu de nou."
-          edit: "Edita la clau de seguretat"
           save: "Desa"
-          edit_description: "Nom de la clau de seguretat"
       change_about:
         title: "Canvia Quant a mi"
         error: "Hi ha hagut un error en canviar aquest valor"
@@ -1466,7 +1467,6 @@ ca:
       second_factor_backup: "Inici de sessió amb codi de còpia de seguretat "
       second_factor_backup_description: "Introduïu un dels vostres codis de còpia de seguretat:"
       second_factor: "Inici de sessió amb l’aplicació Authenticator"
-      security_key_description: "Quan tingueu preparada la vostra clau de seguretat física, premeu el botó Autentica amb clau de seguretat."
       security_key_alternative: "Proveu d’una altra manera"
       security_key_authenticate: "Autenticació amb clau de seguretat"
       security_key_not_allowed_error: "El procés d'autenticació de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 220fe1ca51..fa6db0dc85 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -929,6 +929,8 @@ cs:
       enable_quoting: "Povolit odpověď s citací z označeného textu"
       experimental_sidebar:
         options: "Možnosti"
+        navigation_section: "Navigace"
+        list_destination_default: "Výchozí"
       change: "změnit"
       featured_topic: "Doporučené téma"
       moderator: "%{user} je moderátor"
@@ -1076,8 +1078,6 @@ cs:
         edit: "Upravit"
         edit_title: "Upravit autentifikátor"
         edit_description: "Jméno autentifikátoru"
-        enable_security_key_description: |
-          Když máte připravený <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardwarový bezpečnostní klíč</a> , stiskněte tlačítko Registrace níže.
         totp:
           title: "Ověření založené na tokenech"
           add: "Přidat autentifikátor"
@@ -1085,14 +1085,10 @@ cs:
           name_and_code_required_error: "Musíte zadat jméno a kód z vaší ověřovací aplikace."
         security_key:
           register: "Registrovat"
-          title: "Bezpečnostní klíče"
-          add: "Přidat bezpečnostní klíč"
           default_name: "Hlavní bezpečnostní klíč"
           not_allowed_error: "Proces registrace bezpečnostního klíče buď vypršel, nebo byl zrušen."
           already_added_error: "Tento bezpečnostní klíč jste již zaregistrovali. Není nutné jej znovu zaregistrovat."
-          edit: "Upravit bezpečnostní klíč"
           save: "Uložit"
-          edit_description: "Název bezpečnostního klíče"
           name_required_error: "Musíte zadat název bezpečnostního klíče."
       change_about:
         title: "Změna o mně"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 1b22d0d63e..9363261ba3 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -1055,6 +1055,8 @@ da:
       enable_defer: "Aktivér 'udsæt' for at markere emner som ulæste"
       experimental_sidebar:
         options: "Indstillinger"
+        navigation_section: "Navigation"
+        list_destination_default: "Standard"
       change: "skift"
       featured_topic: "Fremhævet emne"
       moderator: "%{user} er en moderator"
@@ -1220,8 +1222,6 @@ da:
         edit: "Rediger"
         edit_title: "Rediger godkendelsesenhed"
         edit_description: "Navn på godkendelsesenhed"
-        enable_security_key_description: |
-          Når du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardware-sikkerhedsnøgle</a> forberedt, tryk på Register knappen nedenfor.
         totp:
           title: "Token-baserede autentificatorer"
           add: "Tilføj godkendelsesenhed"
@@ -1229,14 +1229,12 @@ da:
           name_and_code_required_error: "Du skal angive et navn og koden fra din godkendelsesapp."
         security_key:
           register: "Registrer"
-          title: "Sikkerhedsnøgler"
-          add: "Tilføj Sikkerhedsnøgle"
           default_name: "Hoved sikkerhedsnøgle"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Registreringsprocessen for sikkerhedsnøgle fik enten timeout eller blev annulleret."
           already_added_error: "Du har allerede registreret denne sikkerhedsnøgle. Du behøver ikke at registrere det igen."
-          edit: "Rediger Sikkerhedsnøgle"
           save: "Gem"
-          edit_description: "Navn på sikkerhedsnøgle"
           name_required_error: "Du skal angive et navn til din sikkerhedsnøgle."
       change_about:
         title: "Skift “Om mig”"
@@ -1733,7 +1731,6 @@ da:
       second_factor_backup_title: "To-faktor backup"
       second_factor_backup_description: "Indtast venligst en af dine backup koder:"
       second_factor: "Log ind ved hjælp af Authenticator app"
-      security_key_description: "Når du har forberedt din fysiske sikkerhedsnøgle, skal du trykke på knappen Godkend med sikkerhedsnøgle nedenfor."
       security_key_alternative: "Prøv en anden måde"
       security_key_authenticate: "Godkend med sikkerhedsnøgle"
       security_key_not_allowed_error: "Godkendelsesprocessen for sikkerhedsnøgle fik enten timeout eller blev annulleret."
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index e6eb6e605f..16ae595d15 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -78,8 +78,8 @@ de:
         date_year: "MMM 'YY"
       medium:
         less_than_x_minutes:
-          one: "weniger als %{count} Min"
-          other: "weniger als %{count} Min"
+          one: "weniger als %{count} Min."
+          other: "weniger als %{count} Min."
         x_minutes:
           one: "%{count} Minute"
           other: "%{count} Minuten"
@@ -96,8 +96,8 @@ de:
           one: "%{count} Monat"
           other: "%{count} Monate"
         about_x_years:
-          one: "über %{count} Jahr"
-          other: "etwa %{count} Jahre"
+          one: "ungefähr %{count} Jahr"
+          other: "ungefähr %{count} Jahre"
         over_x_years:
           one: "über %{count} Jahr"
           other: "über %{count} Jahre"
@@ -135,10 +135,10 @@ de:
       next_month: "Nächster Monat"
       placeholder: Datum
       from_placeholder: "ab Datum"
-      to_placeholder: "zu Datum"
+      to_placeholder: "bis Datum"
     share:
       topic_html: 'Thema: <span class="topic-title">%{topicTitle}</span>'
-      post: "Beitrag Nr.%{postNumber} von @%{username}"
+      post: "Beitrag Nr. %{postNumber} von @%{username}"
       close: "Schließen"
       twitter: "Auf Twitter teilen"
       facebook: "Auf Facebook teilen"
@@ -189,12 +189,12 @@ de:
       other: "Damit du mit deiner Website einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mehr als %{count} Benutzer registriert haben."
     bootstrap_mode_disabled: "Der Starthilfe-Modus wird in den nächsten 24 Stunden deaktiviert."
     bootstrap_invite_button_title: "Einladungen versenden"
-    bootstrap_wizard_link_title: "Einrichtungsassistent beenden"
+    bootstrap_wizard_link_title: "Setup-Assistenten beenden"
     themes:
       default_description: "Standard"
-      broken_theme_alert: "Deine Website funktioniert vielleicht nicht, weil eine Theme / eine Komponente Fehler hat."
-      error_caused_by: "Verursacht durch '%{name}'. <a target='blank' href='%{path}'>Klicke hier</a> , um die Funktion zu aktualisieren, neu zu konfigurieren oder zu deaktivieren."
-      only_admins: "(Diese Meldung wird nur Site-Administratoren angezeigt)"
+      broken_theme_alert: "Deine Website funktioniert vielleicht nicht, weil ein Theme/eine Komponente Fehler hat."
+      error_caused_by: "Verursacht durch „%{name}“. <a target='blank' href='%{path}'>Klicke hier</a> , um die Funktion zu aktualisieren, neu zu konfigurieren oder zu deaktivieren."
+      only_admins: "(Diese Nachricht wird nur Website-Administratoren angezeigt)"
     broken_decorator_alert: "Beiträge werden möglicherweise nicht richtig angezeigt, weil einer der Beitragsausstatter auf deiner Website einen Fehler ausgelöst hat."
     s3:
       regions:
@@ -315,7 +315,7 @@ de:
       not_bookmarked: "diesen Beitrag mit Lesezeichen versehen"
       remove_reminder_keep_bookmark: "Erinnerung entfernen und Lesezeichen behalten"
       created_with_reminder: "Du wirst %{date} an dieses Lesezeichen erinnert. %{name}"
-      created_with_reminder_generic: "Du wirst %{date} an dieses Lesezeichen erinnert. %{name}"
+      created_with_reminder_generic: "Du wirst am %{date} an dieses Lesezeichen erinnert. %{name}"
       remove: "Lesezeichen entfernen"
       delete: "Lesezeichen löschen"
       confirm_delete: "Möchtest du dieses Lesezeichen wirklich löschen? Die Erinnerung wird ebenfalls gelöscht."
@@ -326,7 +326,7 @@ de:
       list_permission_denied: "Du hast keine Berechtigung, die Lesezeichen dieses Benutzers anzuzeigen."
       no_user_bookmarks: "Du hast noch keine Beiträge mit einem Lesezeichen versehen. Lesezeichen erlauben dir den schnellen Zugriff auf bestimmte Beiträge."
       auto_delete_preference:
-        label: "Nachdem Du benachrichtigst wurdest."
+        label: "Nachdem du benachrichtigst wurdest"
         never: "Lesezeichen behalten"
         when_reminder_sent: "Lesezeichen löschen"
         on_owner_reply: "Lesezeichen löschen, sobald ich antworte"
@@ -341,7 +341,7 @@ de:
     copy_codeblock:
       copied: "Kopiert!"
       copy: "Code in die Zwischenablage kopieren"
-      fullscreen: "zeige Code im Vollbildmodus"
+      fullscreen: "Code im Vollbildmodus zeigen"
     drafts:
       label: "Entwürfe"
       label_with_count: "Entwürfe (%{count})"
@@ -349,7 +349,7 @@ de:
       remove: "Entfernen"
       remove_confirmation: "Bist du sicher, dass du diesen Entwurf löschen möchtest?"
       new_topic: "Neuer Entwurf für Thema"
-      new_private_message: "Neuer persönlicher Nachrichtenentwurf"
+      new_private_message: "Neuer Entwurf für persönliche Nachricht"
       topic_reply: "Entwurf für Antwort"
       abandon:
         confirm: "Du hast einen Entwurf für dieses Thema in Arbeit. Was würdest du gerne damit machen?"
@@ -378,7 +378,7 @@ de:
     saved: "Gespeichert!"
     upload: "Hochladen"
     uploading: "Wird hochgeladen …"
-    processing: "Verarbeitung..."
+    processing: "Verarbeitung …"
     uploading_filename: "Wird hochgeladen: %{filename} …"
     processing_filename: "Wird verarbeitet: %{filename} …"
     clipboard: "Zwischenablage"
@@ -1069,6 +1069,9 @@ de:
       no_notifications_title: "Du hast noch keine Benachrichtigungen"
       no_notifications_body: >
         Du wirst in diesem Panel über für dich direkt relevante Aktivitäten benachrichtigt, einschließlich Antworten auf deine Themen und Beiträge, wenn dich jemand mit <b>@</b> erwähnt oder zitiert und wenn jemand auf Themen antwortet, die du beobachtest. Benachrichtigungen werden auch an deine E-Mail-Adresse gesendet, wenn du dich eine Weile nicht eingeloggt hast. <br><br> Suche nach %{icon}, um zu entscheiden, bei welchen Themen, Kategorien und Schlagwörtern du benachrichtigt werden möchtest. Weiteres findest du in den <a href='%{preferencesUrl}'>Benachrichtigungseinstellungen</a>.
+      no_other_notifications_title: "Du hast noch keine anderen Benachrichtigungen"
+      no_other_notifications_body: >
+        In diesem Bereich wirst du über andere Aktivitäten benachrichtigt, die für dich relevant sein könnten – zum Beispiel, wenn jemand einen deiner Beiträge verlinkt oder bearbeitet.
       no_notifications_page_title: "Du hast noch keine Benachrichtigungen"
       no_notifications_page_body: >
         Du wirst über für dich direkt relevante Aktivitäten benachrichtigt, einschließlich Antworten auf deine Themen und Beiträge, wenn dich jemand mit <b>@</b> erwähnt oder zitiert und wenn jemand auf Themen antwortet, die du beobachtest. Benachrichtigungen werden auch an deine E-Mail-Adresse gesendet, wenn du dich eine Weile nicht eingeloggt hast. <br><br> Suche nach %{icon}, um zu entscheiden, bei welchen Themen, Kategorien und Schlagwörtern du benachrichtigt werden möchtest. Weiteres findest du in den <a href='%{preferencesUrl}'>Benachrichtigungseinstellungen</a>.
@@ -1098,12 +1101,11 @@ de:
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       enable_defer: "Aufschieben aktivieren, um Themen als ungelesen zu markieren"
       experimental_sidebar:
-        enable: "Experimentelle Seitenleiste aktivieren"
         options: "Optionen"
-        categories_section: "Kategorien Abschnitt"
-        categories_section_instruction: "Ausgewählte Kategorien werden im Abschnitt Kategorien der Seitenleiste angezeigt."
-        tags_section: "Schlagwort-Abschnitt"
-        tags_section_instruction: "Ausgewählte Schlagwörter werden im Abschnitt Schlagwörter der Seitenleiste angezeigt."
+        categories_section: "Abschnitt „Kategorien“"
+        categories_section_instruction: "Ausgewählte Kategorien werden im Abschnitt „Kategorien“ der Seitenleiste angezeigt."
+        tags_section: "Abschnitt „Schlagwörter“"
+        tags_section_instruction: "Ausgewählte Schlagwörter werden im Abschnitt „Schlagwörter“ der Seitenleiste angezeigt."
       change: "ändern"
       featured_topic: "Hervorgehobenes Thema"
       moderator: "%{user} ist ein Moderator"
@@ -1202,10 +1204,10 @@ de:
         tags: "Schlagwörter"
         all_tags: "Alle Schlagwörter"
         warnings: "Offizielle Warnungen"
-        read_more_in_group: "Möchtest Du mehr lesen? Entdecke andere Nachrichten in %{groupLink}."
-        read_more: "Möchtest Du mehr lesen? Durchsuche andere Nachrichten in <a href='%{basePath}/u/%{username}/messages'>persönliche Nachrichten</a>."
-        read_more_group_pm_MF: "Dort { UNREAD, plural, =0 {} one { ist <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># ungelesen</a> } other { sind <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># ungelesen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{und } false {ist } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># neue</a> Nachricht} other { {BOTH, select, true{und } false {sind } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># neue</a> Nachrichten} } verbleibend, oder durchsuche andere Nachrichten in {groupLink}"
-        read_more_personal_pm_MF: "Dort { UNREAD, plural, =0 {} one { ist <a href='{basePath}/u/{username}/messages/unread'># ungelesen</a> } other { sind <a href='{basePath}/u/{username}/messages/unread'># ungelesen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{und } false {ist } other{}} <a href='{basePath}/u/{username}/messages/new'># neue</a> Nachricht} other { {BOTH, select, true{und } false {sind } other{}} <a href='{basePath}/u/{username}/messages/new'># neue</a> Nachrichten} } verbleibend oder durchsuche andere <a href='{basePath}/u/{username}/messages'>persönliche Nachrichten</a>"
+        read_more_in_group: "Möchtest du mehr lesen? Entdecke andere Nachrichten in %{groupLink}."
+        read_more: "Möchtest du mehr lesen? Durchsuche andere Nachrichten in <a href='%{basePath}/u/%{username}/messages'>persönliche Nachrichten</a>."
+        read_more_group_pm_MF: "Es gibt { UNREAD, plural, =0 {} one { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># ungelesene</a> Nachricht} other { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># ungelesene</a> Nachrichten} } { NEW, plural, =0 {} one { {BOTH, select, true{und } false {} other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># neue</a> Nachricht} other { {BOTH, select, true{und } false {} other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># neue</a> Nachrichten} } – oder entdecke andere Nachrichten in {groupLink}"
+        read_more_personal_pm_MF: "Es gibt { UNREAD, plural, =0 {} one { <a href='{basePath}/u/{username}/messages/unread'># ungelesene</a> Nachricht } other { <a href='{basePath}/u/{username}/messages/unread'># ungelesene</a> Nachrichten} } { NEW, plural, =0 {} one { {BOTH, select, true{und } false {} other{}} <a href='{basePath}/u/{username}/messages/new'># neue</a> Nachricht} other { {BOTH, select, true{und } false { } other{}} <a href='{basePath}/u/{username}/messages/new'># neue</a> Nachrichten} } – oder durchsuche andere <a href='{basePath}/u/{username}/messages'>persönliche Nachrichten</a>"
       preferences_nav:
         account: "Konto"
         security: "Sicherheit"
@@ -1274,8 +1276,6 @@ de:
         edit: "Bearbeiten"
         edit_title: "Authentifikator bearbeiten"
         edit_description: "Authentifikator-Name"
-        enable_security_key_description: |
-          Wenn du deinen <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">Hardware-Sicherheitsschlüssel</a> vorbereitet hast, klicke unten auf „Registrieren“.
         totp:
           title: "Token-basierte Authentifikatoren"
           add: "Authentifikator hinzufügen"
@@ -1283,14 +1283,10 @@ de:
           name_and_code_required_error: "Du musst einen Namen und den Code aus deiner Authentifikator-App angeben."
         security_key:
           register: "Registrieren"
-          title: "Sicherheitsschlüssel"
-          add: "Sicherheitsschlüssel hinzufügen"
           default_name: "Hauptsicherheitsschlüssel"
           not_allowed_error: "Der Registrierungsvorgang für den Sicherheitsschlüssel ist abgelaufen oder wurde abgebrochen."
           already_added_error: "Du hast diesen Sicherheitsschlüssel bereits registriert. Du musst ihn nicht erneut registrieren."
-          edit: "Bearbeite den Sicherheitsschlüssel"
           save: "Speichern"
-          edit_description: "Name des Sicherheitsschlüssels"
           name_required_error: "Du musst einen Namen für deinen Sicherheitsschlüssel angeben."
       change_about:
         title: "„Über mich“ ändern"
@@ -1367,7 +1363,7 @@ de:
         not_connected: "(nicht verbunden)"
         confirm_modal_title: "Verbinde „%{provider}“-Konto"
         confirm_description:
-          disconnect: "Ihr vorhandenes %{provider} -Konto '%{account_description}' wird getrennt."
+          disconnect: "Dein bestehendes %{provider}-Konto „%{account_description}“ wird getrennt."
           account_specific: "Dein „%{provider}“-Konto „%{account_description}“ wird für die Authentifizierung genutzt."
           generic: "Dein „%{provider}“-Konto wird für die Authentifizierung genutzt."
       name:
@@ -1455,7 +1451,7 @@ de:
         every_month: "jeden Monat"
         every_six_months: "alle sechs Monate"
       email_level:
-        title: "Schicke mir eine E-Mail, wenn ich zitiert werde, wenn auf mich geantwortet wird, wenn mein @Nutzername erwähnt wird oder wenn es neue Aktivitäten in meinen beobachteten Kategorien, Tags oder Themen gibt"
+        title: "Mich per E-Mail benachrichtigen, wenn ich zitiert werde, wenn auf mich geantwortet wird, wenn ich per @ erwähnt werde oder wenn es neue Aktivitäten zu meinen beobachteten Kategorien, Schlagwörtern oder Themen gibt"
         always: "immer"
         only_when_away: "nur bei Abwesenheit"
         never: "nie"
@@ -1538,7 +1534,7 @@ de:
         invite:
           new_title: "Einladung erstellen"
           edit_title: "Einladung bearbeiten"
-          instructions: "Teile diesen Link, um sofort Zugriff auf folgende Seite zu gewähren:"
+          instructions: "Teile diesen Link, um sofort Zugriff auf diese Website zu gewähren:"
           copy_link: "Link kopieren"
           expires_in_time: "Läuft in %{time} ab"
           expired_at_time: "Abgelaufen um %{time}"
@@ -1642,6 +1638,9 @@ de:
         title: "Flair"
         none: "(keiner)"
         instructions: "neben deinem Profilbild angezeigtes Symbol"
+      status:
+        title: "Benutzerdefinierter Status"
+        not_set: "Nicht festgelegt"
       primary_group:
         title: "Primäre Gruppe"
         none: "(keine)"
@@ -1655,8 +1654,17 @@ de:
     user_status:
       save: "Speichern"
       set_custom_status: "Benutzerdefinierten Status festlegen"
-      what_are_you_doing: "Was machst du da?"
+      what_are_you_doing: "Was machst du gerade?"
       remove_status: "Status entfernen"
+    popup:
+      primary: "Verstanden!"
+      secondary: "diese Tipps nicht anzeigen"
+      first_notification:
+        title: "Deine erste Benachrichtigung!"
+        content: "Benachrichtigungen dienen dazu, dich auf dem Laufenden zu halten, was in der Community passiert."
+      topic_timeline:
+        title: "Themenzeitleiste"
+        content: "Mit der Themenzeitleiste kannst du schnell durch einen Beitrag scrollen."
     loading: "Wird geladen …"
     errors:
       prev_page: "während des Ladens"
@@ -1690,7 +1698,7 @@ de:
       login_disabled: "Die Anmeldung ist deaktiviert, während sich die Website im Nur-Lesen-Modus befindet."
       logout_disabled: "Die Abmeldung ist deaktiviert, während sich die Website im Nur-Lesen-Modus befindet."
     staff_writes_only_mode:
-      enabled: "Diese Website befindet sich im Nur-Mitarbeiter-Modus. Du kannst weiterhin Inhalte lesen, aber das Erstellen von Beiträgen, Vergeben von „Gefällt mir“ und Durchführen einiger weiterer Aktionen ist derzeit nur für Mitarbeiter möglich."
+      enabled: "Diese Website befindet sich im Nur-Team-Modus. Du kannst weiterhin Inhalte lesen, aber das Antworten, Vergeben von „Gefällt mir“ und Durchführen einiger weiterer Aktionen ist derzeit nur für Team-Mitglieder möglich."
     too_few_topics_and_posts_notice_MF: >-
       Lass <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">die Diskussion beginnen!</a> Es {currentTopics, plural, one {ist <strong>#</strong> Thema} other {sind <strong>#</strong> Themen}} und {currentPosts, plural, one {<strong>#</strong> Beitrag} other {<strong>#</strong> Beiträge}} vorhanden. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens {requiredTopics, plural, one {<strong>#</strong> Thema} other {<strong>#</strong> Themen}} und {requiredPosts, plural, one {<strong>#</strong> Beitrag} other {<strong>#</strong> Beiträge}}. Dieser Hinweis wird nur Team-Mitgliedern angezeigt.
     too_few_topics_notice_MF: >-
@@ -1722,7 +1730,7 @@ de:
       hide_forever: "Nein danke"
       hidden_for_session: "In Ordnung, wir fragen dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
       intro: "Hallo! Es sieht so aus, als ob dir diese Diskussion gefällt, aber du hast bislang noch kein Konto angelegt."
-      value_prop: "Hast du es satt, dich durch die gleichen Beiträge zu scrollen? Wenn du ein Konto erstellst, kommst du immer wieder dorthin zurück, wo du aufgehört hast. Mit einem Konto kannst du auch über neue Antworten benachrichtigt werden, Lesezeichen speichern und anderen mit Likes danken. Wir können alle zusammenarbeiten, um diese Gemeinschaft großartig zu machen. :heart:"
+      value_prop: "Hast du es satt, dich durch die gleichen Beiträge zu scrollen? Wenn du ein Konto erstellst, kommst du immer wieder dorthin zurück, wo du aufgehört hast. Mit einem Konto kannst du auch über neue Antworten benachrichtigt werden, Lesezeichen speichern und anderen mit „Gefällt mir“ danken. Wir können alle zusammenarbeiten, um diese Community zu etwas Großartigem zu machen. :heart:"
     summary:
       enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden."
       description:
@@ -1732,7 +1740,7 @@ de:
       enable: "Dieses Thema zusammenfassen"
       disable: "Alle Beiträge anzeigen"
       short_label: "Zusammenfassen"
-      short_title: "Eine Zusammenfassung dieses Themas anzeigen: die interessantesten Beiträge, wie sie von der Community bestimmt wurden"
+      short_title: "Eine Zusammenfassung dieses Themas anzeigen: die laut der Community interessantesten Beiträge"
     deleted_filter:
       enabled_description: "Dieses Thema enthält gelöschte Beiträge, die derzeit versteckt sind."
       disabled_description: "Gelöschte Beiträge werden in diesem Thema angezeigt."
@@ -1763,7 +1771,7 @@ de:
       disclaimer: "Mit der Registrierung stimmst du der <a href='%{privacy_link}' target='blank'>Datenschutzerklärung</a> und den <a href='%{tos_link}' target='blank'>Nutzungsbedingungen</a> zu."
       title: "Erstelle dein Konto"
       failed: "Etwas ist schiefgelaufen. Vielleicht ist diese E-Mail-Adresse bereits registriert. Versuche es mit dem „Passwort vergessen“-Link."
-      associate: "Hast du bereits ein Konto? <a href='%{associate_link}'>Logge dich ein</a> um dein %{provider} -Konto zu verknüpfen."
+      associate: "Hast du bereits ein Konto? <a href='%{associate_link}'>Logge dich ein</a>, um dein %{provider}-Konto zu verknüpfen."
     forgot_password:
       title: "Passwort zurücksetzen"
       action: "Ich habe mein Passwort vergessen"
@@ -1805,7 +1813,6 @@ de:
       second_factor_backup_title: "Zwei-Faktor-Backup"
       second_factor_backup_description: "Bitte gib einen deiner Wiederherstellungscodes ein:"
       second_factor: "Anmeldung mit einer Authentifizierungs-App"
-      security_key_description: "Wenn du deinen physischen Sicherheitsschlüssel vorbereitet hast, klicke unten auf die Schaltfläche „Mit Sicherheitsschlüssel authentifizieren“."
       security_key_alternative: "Versuche es anderweitig"
       security_key_authenticate: "Mit Sicherheitsschlüssel authentifizieren"
       security_key_not_allowed_error: "Der Authentifizierungsprozess für den Sicherheitsschlüssel ist abgelaufen oder wurde abgebrochen."
@@ -1989,13 +1996,13 @@ de:
         one: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>%{count} Person</a> zu benachrichtigen – bist du dir sicher?"
         other: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>%{count} Personen</a> zu benachrichtigen – bist du dir sicher?"
       cannot_see_mention:
-        category: "Du hast @%{username} erwähnt, aber diese Personen werden nicht benachrichtigt, da sie keinen Zugriff auf diese Kategorie haben. Füge sie einer Gruppe hinzu, diese Zugriff auf diese Kategorie haben."
-        private: "Du hast @%{username} erwähnt, aber diese Personen werden nicht benachrichtigt, da sie diese persönliche Nachricht nicht sehen können. Lade sie zu dieser persönlichen Nachricht ein."
-        muted_topic: "Du hast @%{username} erwähnt, aber sie werden nicht benachrichtigt, weil sie dieses Thema stumm geschaltet haben."
-        not_allowed: "Du hast @%{username} erwähnt, aber sie werden nicht benachrichtigt, weil sie nicht zu diesem Thema eingeladen wurden."
+        category: "Du hast @%{username} erwähnt, aber diese Person wird nicht benachrichtigt, da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu, die Zugriff auf diese Kategorie hat."
+        private: "Du hast @%{username} erwähnt, aber diese Person wird nicht benachrichtigt, da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser persönlichen Nachricht ein."
+        muted_topic: "Du hast @%{username} erwähnt, aber diese Person wird nicht benachrichtigt, weil sie dieses Thema stummgeschaltet hat."
+        not_allowed: "Du hast @%{username} erwähnt, aber diese Person wird nicht benachrichtigt, weil sie nicht zu diesem Thema eingeladen wurde."
       here_mention:
-        one: "Indem du <b>@%{here}</b>erwähnst, bist du dabei, %{count} Benutzer zu benachrichtigen - bist du sicher?"
-        other: "Indem du <b>@%{here}</b>erwähnst, benachrichtigst du %{count} Benutzer - bist du sicher?"
+        one: "Indem du <b>@%{here}</b> erwähnst, bist du im Begriff, %{count} Benutzer zu benachrichtigen – bist du sicher?"
+        other: "Indem du <b>@%{here}</b> erwähnst, bist du im Begriff, %{count} Benutzer zu benachrichtigen – bist du sicher?"
       duplicate_link: "Es sieht so aus, als ob dein Link zu <b>%{domain}</b> bereits im Thema von <b>@%{username}</b> in <a href='%{post_url}'>einer Antwort vor %{ago}</a> geteilt wurde – bist du sicher, dass du ihn noch einmal teilen möchtest?"
       reference_topic_title: "AW: %{title}"
       error:
@@ -2027,7 +2034,7 @@ de:
       create_whisper: "Flüstern"
       create_shared_draft: "Gemeinsamen Entwurf erstellen"
       edit_shared_draft: "Gemeinsamen Entwurf bearbeiten"
-      title: "Oder drücke %{modifier} Eingabetaste"
+      title: "Oder drücke %{modifier}Eingabetaste"
       users_placeholder: "Benutzer oder Gruppen hinzufügen"
       title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz."
       title_or_link_placeholder: "Gib einen Titel ein oder füge einen Link ein"
@@ -2073,7 +2080,7 @@ de:
       abandon: "Editor schließen und Entwurf verwerfen"
       enter_fullscreen: "Vollbild-Editor öffnen"
       exit_fullscreen: "Vollbild-Editor verlassen"
-      exit_fullscreen_prompt: "Drücke <kbd>ESC</kbd> um den Vollbildmodus zu verlassen."
+      exit_fullscreen_prompt: "Drücke <kbd>ESC</kbd>, um den Vollbildmodus zu verlassen"
       show_toolbar: "Editor-Werkzeugleiste anzeigen"
       hide_toolbar: "Editor-Werkzeugleiste ausblenden"
       modal_ok: "OK"
@@ -2085,8 +2092,8 @@ de:
       slow_mode:
         error: "Dieses Thema befindet sich im langsamen Modus. Du hast bereits kürzlich gepostet. Du kannst erneut in %{timeLeft} posten."
       user_not_seen_in_a_while:
-        single: "Die Person, der du eine Nachricht sendest, <b>%{usernames}</b>, wurde hier schon lange nicht mehr gesehen - %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhält. Du solltest nach alternativen Methoden suchen, um %{usernames}zu kontaktieren."
-        multiple: "Die folgenden Personen, die du anschreibst: <b>%{usernames}</b>, wurden hier schon sehr lange nicht mehr gesehen - %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhalten. Du solltest nach alternativen Methoden suchen, um sie zu kontaktieren."
+        single: "Die Person, der du eine Nachricht sendest (<b>%{usernames}</b>) wurde hier schon lange nicht mehr gesehen – %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhält. Du solltest nach alternativen Methoden suchen, um %{usernames} zu kontaktieren."
+        multiple: "Die Personen, denen du eine Nachricht sendest (<b>%{usernames}</b>) wurden hier schon lange nicht mehr gesehen – %{time_ago}. Es kann sein, dass sie deine Nachricht nicht erhalten. Du solltest nach alternativen Methoden suchen, um sie zu kontaktieren."
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
       composer_actions:
         reply: Antworten
@@ -2182,12 +2189,12 @@ de:
             one: "Bist du sicher? Du hast %{count} wichtige Benachrichtigung."
             other: "Bist du sicher? Du hast %{count} wichtige Benachrichtigungen."
           bookmarks:
-            one: "Bist du sicher? Du hast %{count} ungelesene Lesezeichen Erinnerung."
+            one: "Bist du sicher? Du hast %{count} ungelesene Lesezeichen-Erinnerung."
             other: "Bist du sicher? Du hast %{count} ungelesene Lesezeichen-Erinnerungen."
           messages:
             one: "Bist du sicher? Du hast %{count} ungelesene persönliche Nachricht."
             other: "Bist du sicher? Du hast %{count} ungelesene persönliche Nachrichten."
-        dismiss: "Alles gelesen"
+        dismiss: "Verwerfen"
         cancel: "Abbrechen"
       group_message_summary:
         one: "%{count} Nachricht in deinem „%{group_name}“-Posteingang"
@@ -2275,7 +2282,7 @@ de:
       enter_hint: "oder drücke die Eingabetaste"
       in_posts_by: "in Beiträgen von %{username}"
       browser_tip: "%{modifier} + f"
-      browser_tip_description: "nochmal um die native Browsersuche zu verwenden"
+      browser_tip_description: "noch mal, um die native Browsersuche zu verwenden"
       recent: "Letzte Suchanfragen"
       clear_recent: "Letzte Suchanfragen löschen"
       type:
@@ -2291,8 +2298,8 @@ de:
         private_messages: "Nachrichten durchsuchen"
       tips:
         category_tag: "filtern nach Kategorie oder Schlagwort"
-        author: "filtern nach Beitragsautor"
-        in: "filtern nach Metadaten (z.B. in:title, in:personal, in:pinned)"
+        author: "filtern nach Beitragsverfasser"
+        in: "filtern nach Metadaten (z. B. in:title, in:personal, in:pinned)"
         status: "filtern nach Themenstatus"
         full_search: "startet die Ganzseitensuche"
         full_search_key: "%{modifier} + Eingabetaste"
@@ -2300,7 +2307,7 @@ de:
         title: Erweiterte Filter
         posted_by:
           label: Beiträge von
-          aria_label: Filtern nach Beitragsautor
+          aria_label: Filtern nach Beitragsverfasser
         in_category:
           label: In der Kategorie
         in_group:
@@ -2353,10 +2360,10 @@ de:
           label: Aufrufe
         min_views:
           placeholder: Minimum
-          aria_label: nach minimaler Anzahl von Ansichten filtern
+          aria_label: nach minimaler Anzahl von Aufrufen filtern
         max_views:
           placeholder: Maximum
-          aria_label: nach maximaler Anzahl von Ansichten filtern
+          aria_label: nach maximaler Anzahl von Aufrufen filtern
         additional_options:
           label: "Nach Beitragsanzahl und Themenaufrufen filtern"
     hamburger_menu: "Menü"
@@ -2368,53 +2375,53 @@ de:
     user_menu:
       generic_no_items: "Es gibt keine Einträge in dieser Liste."
       sr_menu_tabs: "Registerkarten des Benutzermenüs"
-      view_all_notifications: "Alle Benachrichtigungen anzeigen"
-      view_all_bookmarks: "Alle Lesezeichen anzeigen"
-      view_all_messages: "Alle persönlichen Nachrichten anzeigen"
+      view_all_notifications: "alle Benachrichtigungen anzeigen"
+      view_all_bookmarks: "alle Lesezeichen anzeigen"
+      view_all_messages: "alle persönlichen Nachrichten anzeigen"
       tabs:
         all_notifications: "Alle Benachrichtigungen"
         replies: "Antworten"
         replies_with_unread:
-          one: "Antworten - %{count} ungelesene Antwort"
-          other: "Antworten - %{count} ungelesene Antworten"
+          one: "Antworten – %{count} ungelesene Antwort"
+          other: "Antworten – %{count} ungelesene Antworten"
         mentions: "Erwähnungen"
         mentions_with_unread:
-          one: "Erwähnungen - %{count} ungelesene Erwähnung"
-          other: "Erwähnungen - %{count} ungelesene Erwähnungen"
-        likes: "Erhaltene „Gefällt mir“"
+          one: "Erwähnungen – %{count} ungelesene Erwähnung"
+          other: "Erwähnungen – %{count} ungelesene Erwähnungen"
+        likes: "„Gefällt mir“"
         likes_with_unread:
-          one: "Likes - %{count} ungelesene Likes"
-          other: "Likes - %{count} ungelesene Likes"
+          one: "„Gefällt mir“ – %{count} ungelesenes „Gefällt mir“"
+          other: "„Gefällt mir“ – %{count} ungelesene „Gefällt mir“"
         watching: "Beobachtete Themen"
         watching_with_unread:
-          one: "Beobachtete Themen - %{count} ungelesenes beobachtetes Thema"
-          other: "Beobachtete Themen — %{count} ungelesene beobachtete Themen"
+          one: "Beobachtete Themen – %{count} ungelesenes beobachtetes Thema"
+          other: "Beobachtete Themen – %{count} ungelesene beobachtete Themen"
         messages: "Persönliche Nachrichten"
         messages_with_unread:
-          one: "Persönliche Nachrichten - %{count} ungelesene Nachricht"
-          other: "Persönliche Nachrichten - %{count} ungelesene Nachrichten"
+          one: "Persönliche Nachrichten – %{count} ungelesene Nachricht"
+          other: "Persönliche Nachrichten – %{count} ungelesene Nachrichten"
         bookmarks: "Lesezeichen"
         bookmarks_with_unread:
-          one: "Bookmarks - %{count} ungelesenes Lesezeichen"
-          other: "Lesezeichen - %{count} ungelesene Lesezeichen"
-        review_queue: "Warteschlange überprüfen"
+          one: "Lesezeichen – %{count} ungelesenes Lesezeichen"
+          other: "Lesezeichen – %{count} ungelesene Lesezeichen"
+        review_queue: "Warteschlange zur Überprüfung"
         review_queue_with_unread:
-          one: "Überprüfungswarteschlange — %{count} Artikel benötigt Überprüfung"
-          other: "Warteschlange für Überprüfungen — %{count} Artikel müssen überprüft werden"
+          one: "Warteschlange zur Überprüfung – %{count} Element benötigt Überprüfung"
+          other: "Warteschlange zur Überprüfung – %{count} Elemente benötigen Überprüfung"
         other_notifications: "Andere Benachrichtigungen"
         other_notifications_with_unread:
-          one: "Andere Benachrichtigungen - %{count} ungelesene Benachrichtigung"
-          other: "Andere Benachrichtigungen - %{count} Ungelesene Benachrichtigungen"
+          one: "Andere Benachrichtigungen – %{count} ungelesene Benachrichtigung"
+          other: "Andere Benachrichtigungen – %{count} ungelesene Benachrichtigungen"
         profile: "Profil"
       reviewable:
-        view_all: "alle Bewertungselemente ansehen"
+        view_all: "alle Elemente zur Überprüfung anzeigen"
         queue: "Warteschlange"
         deleted_user: "(gelöschter Benutzer)"
         deleted_post: "(gelöschter Beitrag)"
-        post_number_with_topic_title: "Beitrag #%{post_number} - %{title}"
+        post_number_with_topic_title: "Beitrag #%{post_number} – %{title}"
         new_post_in_topic: "neuer Beitrag in %{title}"
         user_requires_approval: "%{username} erfordert eine Genehmigung"
-        default_item: "Überprüfbarer Artikel #%{reviewable_id}"
+        default_item: "Element zur Überprüfung #%{reviewable_id}"
     topics:
       new_messages_marker: "letzter Besuch"
       bulk:
@@ -2442,11 +2449,11 @@ de:
           other: "Neue Themen ignorieren (%{count})"
         toggle: "Massenauswahl von Themen umschalten"
         actions: "Massenoperationen"
-        change_category: "Kategorie festlegen..."
+        change_category: "Kategorie festlegen …"
         close_topics: "Themen schließen"
         archive_topics: "Themen archivieren"
         move_messages_to_inbox: "In Posteingang verschieben"
-        notification_level: "Benachrichtigungen..."
+        notification_level: "Benachrichtigungen …"
         change_notification_level: "Benachrichtigungsstufe ändern"
         choose_new_category: "Neue Kategorie für die gewählten Themen:"
         selected:
@@ -2693,7 +2700,7 @@ de:
         open: "Thema öffnen"
         close: "Thema schließen"
         multi_select: "Beiträge auswählen …"
-        slow_mode: "Aktiviere langsamen Modus..."
+        slow_mode: "Langsamen Modus einstellen …"
         timed_update: "Zeitschaltuhren …"
         pin: "Thema anheften …"
         unpin: "Thema loslösen …"
@@ -2702,7 +2709,7 @@ de:
         invisible: "Thema nicht auflisten"
         visible: "Thema auflisten"
         reset_read: "„Gelesen“ zurücksetzen"
-        make_public: "Öffentliches Thema erstellen..."
+        make_public: "Öffentliches Thema erstellen …"
         make_private: "In persönliche Nachricht umwandeln"
         reset_bump_date: "„Nach oben verschieben“-Datum zurücksetzen"
       feature:
@@ -2721,8 +2728,8 @@ de:
         instructions: "Link zu diesem Thema teilen:"
         copied: "Themen-Link kopiert."
         restricted_groups:
-          one: "Nur für Mitglieder der Gruppe sichtbar: %{groupNames}"
-          other: "Nur für Gruppenmitglieder sichtbar: %{groupNames}"
+          one: "Nur für Mitglieder der folgenden Gruppe sichtbar: %{groupNames}"
+          other: "Nur für Mitglieder der folgenden Gruppen sichtbar: %{groupNames}"
         invite_users: "Einladen"
       print:
         title: "Drucken"
@@ -2941,11 +2948,11 @@ de:
         one: "dir und %{count} weiteren Person gefällt dieser Beitrag"
         other: "dir und %{count} weiteren Personen gefällt dieser Beitrag"
       sr_post_like_count_button:
-        one: "%{count} Person mochte diesen Beitrag. Zum Ansehen klicken"
+        one: "%{count} Person gefällt dieser Beitrag. Zum Anzeigen klicken"
         other: "%{count} Personen gefällt dieser Beitrag. Zum Anzeigen klicken"
       sr_post_read_count_button:
-        one: "%{count} Person hat diesen Beitrag gelesen. Zur Ansicht klicken"
-        other: "%{count} Personen lesen diesen Beitrag. Zur Ansicht klicken"
+        one: "%{count} Person hat diesen Beitrag gelesen. Zum Anzeigen klicken"
+        other: "%{count} Personen haben diesen Beitrag gelesen. Zum Anzeigen klicken"
       filtered_replies_hint:
         one: "Diesen Beitrag und seine Antwort ansehen"
         other: "Diesen Beitrag und seine %{count} Antworten ansehen"
@@ -2959,8 +2966,8 @@ de:
         edit: "Entschuldige, es gab einen Fehler beim Bearbeiten des Beitrags. Bitte versuche es noch einmal."
         upload: "Entschuldige, es gab einen Fehler beim Hochladen der Datei. Bitte versuche es noch einmal."
         file_too_large: "Entschuldige, die Datei ist zu groß (die maximale Größe beträgt %{max_size_kb} KB). Wie wäre es, die Datei bei einem Cloud-Sharing-Service hochzuladen und dann den Link einzufügen?"
-        file_size_zero: "Es tut uns leid, es sieht so aus, als ob etwas schief gelaufen ist. Die Datei, die Du hochzuladen versuchst, hat 0 Bytes. Bitte versuche es erneut."
-        file_too_large_humanized: "Entschuldige, die Datei ist zu groß (die maximale Größe beträgt %{max_size}). Wie wäre es, die Datei bei einem Cloud-Sharing-Service hochzuladen und dann den Link einzufügen?"
+        file_size_zero: "Entschuldigung, es sieht so aus, als ob etwas schiefgelaufen ist. Die Datei, die du hochladen möchtest, ist 0 Byte groß. Bitte versuche es erneut."
+        file_too_large_humanized: "Entschuldigung, diese Datei ist zu groß (die maximale Größe beträgt %{max_size}). Lade deine große Datei bitte bei einem Cloud-Sharing-Dienst hoch und füge den Link ein."
         too_many_uploads: "Entschuldige, du darfst immer nur eine Datei hochladen."
         too_many_dragged_and_dropped_files:
           one: "Es kann leider nur %{count} Datei gleichzeitig hochgeladen werden."
@@ -3005,7 +3012,7 @@ de:
           just_the_post: "Nein, nur diesen Beitrag"
         admin: "Administrative Aktionen"
         permanently_delete: "Endgültig löschen"
-        permanently_delete_confirmation: "Bist Du sicher, dass Du diesen Beitrag dauerhaft löschen möchtest? Du wirst ihn nicht wiederherstellen können."
+        permanently_delete_confirmation: "Bist du sicher, dass du diesen Beitrag endgültig löschen möchtest? Du kannst ihn nicht wiederherstellen."
         wiki: "Wiki erstellen"
         unwiki: "Wiki entfernen"
         convert_to_moderator: "Team-Einfärbung hinzufügen"
@@ -3013,8 +3020,8 @@ de:
         rebake: "HTML erneuern"
         publish_page: "Als Seite veröffentlichen"
         unhide: "Einblenden"
-        change_owner: "Eigentümer ändern..."
-        grant_badge: "Abzeichen verleihen..."
+        change_owner: "Eigentümer ändern …"
+        grant_badge: "Abzeichen verleihen …"
         lock_post: "Beitrag sperren"
         lock_post_description: "verhindern, dass der Autor den Beitrag bearbeitet"
         unlock_post: "Beitrag entsperren"
@@ -3028,8 +3035,8 @@ de:
         delete_topic_confirm_modal_no: "Nein, dieses Thema behalten"
         delete_topic_error: "Beim Löschen dieses Themas ist ein Fehler aufgetreten"
         delete_topic: "Thema löschen"
-        add_post_notice: "Team-Notiz hinzufügen..."
-        change_post_notice: "Team-Notiz ändern..."
+        add_post_notice: "Team-Notiz hinzufügen …"
+        change_post_notice: "Team-Notiz ändern …"
         delete_post_notice: "Team-Notiz löschen"
         remove_timer: "Zeitschaltuhr deaktivieren"
         edit_timer: "Zeitschaltuhr bearbeiten"
@@ -3116,7 +3123,7 @@ de:
             description: "Ändere den Namen des Lesezeichens oder den Erinnerungszeitpunkt."
           clear_bookmark_reminder:
             name: "Erinnerung löschen"
-            description: "Lösche das Datum und die Uhrzeit der Erinnerung"
+            description: "Datum und Uhrzeit der Erinnerung löschen"
           pin_bookmark:
             name: "Lesezeichen anheften"
             description: "Das Lesezeichen anheften, damit es oben auf der Liste der Lesezeichen erscheint."
@@ -3154,8 +3161,8 @@ de:
       required_tag_group:
         description: "Neue Themen müssen Schlagwörter aus Schlagwortgruppen haben:"
         delete: "Löschen"
-        add: "Erforderliche Schlagwort-Gruppe hinzufügen"
-        placeholder: "Schlagwort-Gruppe auswählen..."
+        add: "Erforderliche Schlagwortgruppe hinzufügen"
+        placeholder: "Schlagwortgruppe auswählen …"
       topic_featured_link_allowed: "Erlaube hervorgehobene Links in dieser Kategorie"
       delete: "Kategorie löschen"
       create: "Neue Kategorie"
@@ -3168,7 +3175,7 @@ de:
       name: "Name der Kategorie"
       description: "Beschreibung"
       logo: "Logo für Kategorie"
-      logo_dark: "Logobild der Kategorie „Dunkelmodus“."
+      logo_dark: "Logobild der Kategorie „Dunkler Modus“"
       background_image: "Hintergrundbild für Kategorie"
       badge_colors: "Farben des Abzeichens"
       background_color: "Hintergrundfarbe"
@@ -3226,12 +3233,12 @@ de:
       position_disabled: "Kategorien werden in der Reihenfolge der Aktivität angezeigt. Um die Reihenfolge von Kategorien in Listen zu steuern, "
       position_disabled_click: 'aktiviere die Einstellung „fixed category positions“.'
       minimum_required_tags: "Mindestanzahl an Schlagwörtern, die ein Thema erfordert"
-      default_slow_mode: 'Aktiviere den "Slow Mode" für neue Themen in dieser Kategorie.'
+      default_slow_mode: '„Langsamer Modus“ für neue Themen in dieser Kategorie aktivieren.'
       parent: "Übergeordnete Kategorie"
       num_auto_bump_daily: "Anzahl der offenen Themen, die automatisch täglich nach oben verschoben werden:"
       navigate_to_first_post_after_read: "Gehe zum ersten Beitrag, nachdem Themen gelesen wurden"
       notifications:
-        title: "ändere Benachrichtigungsstufe für diese Kategorie"
+        title: "Benachrichtigungsstufe für diese Kategorie ändern"
         watching:
           title: "Beobachten"
           description: "Du wirst automatisch alle Themen in dieser Kategorie beobachten. Du wirst über alle neuen Beiträge in allen Themen benachrichtigt und die Anzahl der neuen Antworten wird angezeigt."
@@ -3378,7 +3385,7 @@ de:
         other {}}
     original_post: "Original-Beitrag"
     views: "Aufrufe"
-    sr_views: "Nach Ansichten sortieren"
+    sr_views: "Nach Aufrufen sortieren"
     views_lowercase:
       one: "Aufruf"
       other: "Aufrufe"
@@ -3390,8 +3397,8 @@ de:
     activity: "Aktivität"
     sr_activity: "Nach Aktivität sortieren"
     likes: "„Gefällt mir“"
-    sr_likes: "Nach Likes sortieren"
-    sr_op_likes: "Nach Likes des Originalbeitrags sortieren"
+    sr_likes: "Nach „Gefällt mir“ sortieren"
+    sr_op_likes: "Nach „Gefällt mir“ des Originalbeitrags sortieren"
     likes_lowercase:
       one: "„Gefällt mir“"
       other: "„Gefällt mir“"
@@ -3480,8 +3487,8 @@ de:
         this_week: "Woche"
         today: "Heute"
         other_periods: "angesagte Themen ansehen:"
-    browser_update: 'Leider wird <a href="https://www.discourse.org/faq/#browser">dein Browser nicht unterstützt</a>. Bitte <a href="https://browsehappy.com">wechsle zu einem unterstützten Browser</a> , um die Inhalte zu sehen, dich anzumelden und zu antworten.'
-    safari_13_warning: Diese Seite wird bald die Unterstützung für iOS und Safari Version 13 und darunter entfernen. Eine vereinfachte Nur-Lese-Version wird weiterhin verfügbar sein. (<a href="https://meta.discourse.org/t/224747">mehr Informationen</a>)
+    browser_update: 'Leider wird <a href="https://www.discourse.org/faq/#browser">dein Browser nicht unterstützt</a>. Bitte <a href="https://browsehappy.com">wechsle zu einem unterstützten Browser</a>, um die Inhalte in vollem Umfang zu sehen, dich anzumelden und zu antworten.'
+    safari_13_warning: Diese Website wird bald die Unterstützung für iOS und Safari Version 13 und darunter entfernen. Eine vereinfachte Nur-Lesen-Version wird weiterhin verfügbar sein. (<a href="https://meta.discourse.org/t/224747">Mehr Informationen</a>)
     permission_types:
       full: "Erstellen/Antworten/Ansehen"
       create_post: "Antworten/Ansehen"
@@ -3504,7 +3511,7 @@ de:
       shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
       shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Tastenkombinationen"
-      short_title: "Verknüpfungen"
+      short_title: "Tastenkombinationen"
       jump_to:
         title: "Springe zu"
         home: "%{shortcut} Startseite"
@@ -3572,7 +3579,7 @@ de:
         edit: "%{shortcut} Beitrag bearbeiten"
         delete: "%{shortcut} Beitrag löschen"
         mark_muted: "%{shortcut} Thema stummschalten"
-        mark_regular: "%{shortcut} Normales (Standard) Thema"
+        mark_regular: "%{shortcut} Normales (Standard-)Thema"
         mark_tracking: "%{shortcut} Thema verfolgen"
         mark_watching: "%{shortcut} Thema beobachten"
         print: "%{shortcut} Thema ausdrucken"
@@ -3582,7 +3589,7 @@ de:
         title: "Suchmenü"
         prev_next: "%{shortcut} Auswahl bewegen ↑ ↓"
         insert_url: "%{shortcut} Auswahl in geöffneten Editor einfügen"
-        full_page_search: "%{shortcut} Startet die ganzseitige Suche"
+        full_page_search: "%{shortcut} Startet die Ganzseitensuche"
     badges:
       earned_n_times:
         one: "Abzeichen %{count}-mal erhalten"
@@ -3622,8 +3629,8 @@ de:
       title: "Kalender herunterladen"
       save_ics: ".ics-Datei herunterladen"
       save_google: "Zum Google-Kalender hinzufügen"
-      remember: "Frag mich nicht mehr"
-      remember_explanation: "(Du kannst diese Einstellung in Deinen Benutzereinstellungen ändern)"
+      remember: "Nicht mehr fragen"
+      remember_explanation: "(Du kannst diese Einstellung in deinen Benutzereinstellungen ändern)"
       download: "Herunterladen"
       default_calendar: "Standard-Kalender"
       default_calendar_instruction: "Lege fest, welcher Kalender verwendet werden soll, wenn Daten gespeichert werden"
@@ -3639,14 +3646,14 @@ de:
       tags: "Schlagwörter"
       choose_for_topic: "optionale Schlagwörter"
       choose_for_topic_required:
-        one: "mindestens %{count} Schlagwort auswählen..."
-        other: "mindestens %{count} Schlagwörter auswählen..."
+        one: "mindestens %{count} Schlagwort auswählen …"
+        other: "mindestens %{count} Schlagwörter auswählen …"
       choose_for_topic_required_group:
-        one: "wähle %{count} Schlagwort von '%{name}'..."
-        other: "wähle %{count} Schlagwörter von '%{name}'..."
+        one: "%{count} Schlagwort von „%{name}“ auswählen …"
+        other: "%{count} Schlagwörter von „%{name}“ auswählen …"
       info: "Info"
       default_info: "Dieses Schlagwort ist nicht auf Kategorien beschränkt und hat keine Synonyme."
-      staff_info: "Um Einschränkungen hinzuzufügen, füge dieses Schlagwort in eine <a href=%{basePath}/tag_groups>Tag-Gruppe</a>ein."
+      staff_info: "Um Einschränkungen hinzuzufügen, füge dieses Schlagwort einer <a href=%{basePath}/tag_groups>Schlagwortgruppe</a> hinzu."
       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."
@@ -3674,7 +3681,7 @@ de:
       delete_confirm_synonyms:
         one: "Das Synonym wird ebenfalls gelöscht."
         other: "Es werden %{count} weitere Synonyme ebenfalls gelöscht."
-      edit_tag: "Schlagwortname und Beschreibung bearbeiten"
+      edit_tag: "Name und Beschreibung des Schlagwortes bearbeiten"
       description: "Beschreibung"
       sort_by: "Sortieren nach:"
       sort_by_count: "Anzahl"
@@ -3791,20 +3798,20 @@ de:
       unsupported_file_picked: "Du hast eine nicht unterstützte Datei ausgewählt. Unterstützte Dateitypen – %{types}."
     user_activity:
       no_activity_title: "Noch keine Aktivität"
-      no_activity_body: "Willkommen in unserer Community! Du bist ganz neu hier und hast noch nicht an Diskussionen teilgenommen. Besuche als ersten Schritt <a href='%{topUrl}'>Top</a> oder <a href='%{categoriesUrl}'>Kategorien</a> und fang einfach an zu lesen! Wähle %{heartIcon} bei Beiträgen aus, die Dir gefallen oder über die Du mehr erfahren möchtest. Wenn Du teilnimmst, wird Deine Aktivität hier aufgelistet."
+      no_activity_body: "Willkommen in unserer Community! Du bist ganz neu hier und hast noch nicht an Diskussionen teilgenommen. Besuche als ersten Schritt <a href='%{topUrl}'>Top</a> oder <a href='%{categoriesUrl}'>Kategorien</a> und fang einfach an zu lesen! Wähle %{heartIcon} bei Beiträgen aus, die dir gefallen oder über die du mehr erfahren möchtest. Wenn du teilnimmst, wird deine Aktivität hier aufgelistet."
       no_replies_title: "Du hast noch keine Themen beantwortet"
       no_replies_title_others: "%{username} hat noch auf keine Themen geantwortet"
-      no_replies_body: "Wenn du <a href='%{searchUrl}'>eine interessante Unterhaltung entdeckst</a>, zu der du etwas beitragen möchtest, klicke auf die Schaltfläche <kbd>Antworten</kbd> direkt unter einem Beitrag, um auf diesen Beitrag zu antworten. Wenn du lieber auf das allgemeine Thema als auf einen einzelnen Beitrag oder eine Person antworten möchtest, findest du die Schaltfläche <kbd>Antworten</kbd> ganz unten im Thema oder unter der Zeitleiste des Themas."
+      no_replies_body: "Wenn du eine interessante Unterhaltung <a href='%{searchUrl}'>entdeckst</a>, zu der du etwas beitragen möchtest, klicke auf die Schaltfläche <kbd>Antworten</kbd> direkt unter einem Beitrag, um auf diesen Beitrag zu antworten. Wenn du lieber auf das allgemeine Thema als auf einen einzelnen Beitrag oder eine Person antworten möchtest, findest du die Schaltfläche <kbd>Antworten</kbd> ganz unten im Thema oder unter der Zeitleiste des Themas."
       no_drafts_title: "Du hast noch keine Entwürfe begonnen"
-      no_drafts_body: "Noch nicht ganz bereit? Wir speichern automatisch einen neuen Entwurf und listen ihn hier auf, wenn Du ein Thema, eine Antwort oder eine persönliche Nachricht verfasst. Wähle die Abbrechen-Schaltfläche, um Deinen Entwurf zu verwerfen oder zu speichern, um später fortzufahren."
-      no_likes_title: "Du hast noch keine Themen mit \"gefällt mir\" markiert."
-      no_likes_title_others: "%{username} hat noch keine Themen geliked"
-      no_likes_body: "Eine großartige Möglichkeit einzusteigen und Beiträge zu leisten, besteht darin, bereits stattgefundene Konversationen zu lesen und die %{heartIcon} bei Beiträgen auszuwählen, die Dir gefallen!"
+      no_drafts_body: "Noch nicht ganz bereit? Wir speichern automatisch einen neuen Entwurf und listen ihn hier auf, wenn du ein Thema, eine Antwort oder eine persönliche Nachricht verfasst. Wähle die Abbrechen-Schaltfläche aus, um deinen Entwurf zu verwerfen, oder speichere ihn, um später fortzusetzen."
+      no_likes_title: "Du hast noch keine Themen mit „Gefällt mir“ markiert"
+      no_likes_title_others: "%{username} hat noch keine Themen mit „Gefällt mir“ markiert"
+      no_likes_body: "Eine großartige Möglichkeit, loszulegen und etwas beizutragen, besteht darin, bereits stattgefundene Unterhaltungen zu lesen und %{heartIcon} bei Beiträgen auszuwählen, die dir gefallen!"
       no_topics_title: "Du hast noch keine Themen begonnen"
-      no_topics_body: "Es ist immer am besten, <a href='%{searchUrl}'></a> nach bestehenden Themen zu suchen, bevor du ein neues Thema eröffnest. Wenn du dir aber sicher bist, dass es das gewünschte Thema noch nicht gibt, kannst du auch einfach ein neues Thema erstellen. Suche nach der Schaltfläche <kbd>+ Neues Thema</kbd> oben rechts in der Themenliste, der Kategorie oder dem Tag, um ein neues Thema in diesem Bereich zu erstellen."
+      no_topics_body: "Es ist immer am besten, nach bestehenden Themen zu <a href='%{searchUrl}'>suchen</a>, bevor du ein neues Thema eröffnest. Wenn du dir aber sicher bist, dass es das gewünschte Thema noch nicht gibt, kannst du auch einfach ein neues Thema erstellen. Suche nach der Schaltfläche <kbd>+ Neues Thema</kbd> oben rechts in der Themenliste, bei der Kategorie oder bei dem Schlagwort, um ein neues Thema in diesem Bereich zu erstellen."
       no_topics_title_others: "%{username} hat noch keine Themen begonnen"
       no_read_topics_title: "Du hast noch keine Themen gelesen"
-      no_read_topics_body: "Sobald Du mit dem Lesen von Diskussionen beginnst, siehst Du hier eine Liste. Zum Lesen suche nach Themen, die Du in <a href='%{topUrl}'>Top</a> oder <a href='%{categoriesUrl}'>Kategorien</a> oder suche nach dem Stichwort %{searchIcon}"
+      no_read_topics_body: "Sobald du mit dem Lesen von Diskussionen beginnst, siehst du hier eine Liste. Zum Lesen suche in <a href='%{topUrl}'>Top</a> oder <a href='%{categoriesUrl}'>Kategorien</a> nach Themen, die dich interessieren, oder suche nach einem Schlüsselwort %{searchIcon}"
     no_group_messages_title: "Keine Gruppennachrichten gefunden"
     topic_entrance:
       sr_jump_top_button: "Zum ersten Beitrag springen"
@@ -3812,14 +3819,14 @@ de:
     fullscreen_table:
       expand_btn: "Tabelle erweitern"
     second_factor_auth:
-      redirect_after_success: "Die Zwei-Faktor-Authentifizierung ist erfolgreich. Weiterleitung zur vorherigen Seite…"
+      redirect_after_success: "Die Zwei-Faktor-Authentifizierung war erfolgreich. Weiterleitung zur vorherigen Seite …"
     sidebar:
       unread_count:
-        one: "%{count} ungelesene"
-        other: "%{count} ungelesene"
+        one: "%{count} ungelesen"
+        other: "%{count} ungelesen"
       new_count:
-        one: "%{count} neue"
-        other: "%{count} neue"
+        one: "%{count} neu"
+        other: "%{count} neu"
       toggle_section: "Abschnitt umschalten"
       more: "Mehr"
       all_categories: "Alle Kategorien"
@@ -3840,14 +3847,14 @@ de:
             archive: "Archiv"
         tags:
           none: "Du hast keine Schlagwörter hinzugefügt."
-          click_to_get_started: "Klicke hier, um zu starten."
+          click_to_get_started: "Klicke hier, um zu beginnen."
           header_link_text: "Schlagwörter"
-          header_action_title: "Bearbeite die Schlagwörter in deiner Seitenleiste"
+          header_action_title: "bearbeite die Schlagwörter in deiner Seitenleiste"
         categories:
           none: "Du hast keine Kategorien hinzugefügt."
-          click_to_get_started: "Klicke hier, um zu starten."
+          click_to_get_started: "Klicke hier, um zu beginnen."
           header_link_text: "Kategorien"
-          header_action_title: "Bearbeite die Kategorien in deiner Seitenleiste"
+          header_action_title: "bearbeite die Kategorien in deiner Seitenleiste"
         community:
           header_link_text: "Community"
           header_action_title: "ein neues Thema erstellen"
@@ -3884,7 +3891,6 @@ de:
               pending_count: "%{count} ausstehend"
     welcome_topic_banner:
       title: "Erstelle dein Willkommensthema"
-      description: 'Dein Willkommensthema ist das erste, was Neuankömmlinge lesen werden. Sieh es als deinen einseitigen "Elevator Pitch" oder "Mission Statement" an.'
       button_title: "Bearbeitung beginnen"
     until: "Bis:"
   admin_js:
@@ -4031,7 +4037,7 @@ de:
             automatic_membership_user_count:
               one: "%{count} Benutzer hat die neuen E-Mail-Domains und wird der Gruppe hinzugefügt."
               other: "%{count} Benutzer haben die neuen E-Mail-Domains und werden der Gruppe hinzugefügt."
-            automatic_membership_associated_groups: "Nutzer, die Mitglied einer Gruppe eines hier aufgeführten Dienstes sind, werden dieser Gruppe automatisch hinzugefügt, wenn sie sich mittels diesen Dienstes anmelden."
+            automatic_membership_associated_groups: "Benutzer, die Mitglied einer Gruppe eines hier aufgeführten Dienstes sind, werden dieser Gruppe automatisch hinzugefügt, wenn sie sich mittels dieses Dienstes anmelden."
             primary_group: "Automatisch als primäre Gruppe festlegen"
         name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
         primary: "Primäre Gruppe"
@@ -4096,7 +4102,7 @@ de:
             Du kannst auch definieren, welche Parameter erlaubt sind. Verwende Kommas, um mehrere Werte zu trennen.
           title: Bereiche
           granular: Granular
-          read_only: Schreibgeschützt
+          read_only: Nur Lesen
           global: Global
           global_description: Der API-Schlüssel hat keine Einschränkung und alle Endpunkte sind zugänglich.
           resource: Ressource
@@ -4107,17 +4113,17 @@ de:
           allowed_urls: Zulässige URLs
           descriptions:
             global:
-              read: Schränke den API-Schlüssel auf schreibgeschützte Endpunkte ein.
+              read: API-Schlüssel auf Nur-Lesen-Endpunkte einschränken.
             topics:
               read: Lies ein Thema oder einen bestimmten Beitrag darin. RSS wird ebenfalls unterstützt.
               write: Erstelle ein neues Thema oder schreibe einen Beitrag zu einem bestehenden.
-              update: Aktualisiere ein Thema. Ändere den Titel, die Kategorie, Tags usw.
+              update: Aktualisiere ein Thema. Ändere den Titel, die Kategorie, Schlagwörter usw.
               read_lists: Lies Themenlisten wie „Angesagt“, „Neu“, „Aktuell“ usw. RSS wird ebenfalls unterstützt.
             posts:
               edit: Bearbeite jeden Beitrag oder einen bestimmten.
             categories:
-              list: Eine Liste der Kategorien anfordern.
-              show: Eine einzelne Kategorie nach der ID abrufen.
+              list: Eine Liste der Kategorien abrufen.
+              show: Eine einzelne Kategorie nach ID abrufen.
             uploads:
               create: Lade eine neue Datei hoch oder starte einzelne oder mehrteilige direkte Uploads auf einen externen Speicher.
             users:
@@ -4129,22 +4135,22 @@ de:
               log_out: Alle Sitzungen für einen Benutzer abmelden.
               anonymize: Benutzerkonten anonymisieren.
               delete: Benutzerkonten löschen.
-              list: Benutzerliste anfordern
+              list: Benutzerliste abrufen.
             email:
               receive_emails: Kombiniere diesen Bereich mit dem E-Mail-Empfänger, um eingehende E-Mails zu verarbeiten.
             badges:
-              create: Erstelle ein neues Abzeichen.
-              show: Erhalte Informationen über ein Abzeichen.
+              create: Ein neues Abzeichen erstellen.
+              show: Informationen über ein Abzeichen abrufen.
               update: Abzeichen aktualisieren.
               delete: Abzeichen löschen.
-              list_user_badges: Abzeichen eines Nutzers auflisten.
-              assign_badge_to_user: Abzeichen einem Nutzer zuweisen.
-              revoke_badge_from_user: Abzeichen einem Nutzer entziehen.
+              list_user_badges: Abzeichen eines Benutzers auflisten.
+              assign_badge_to_user: Einem Benutzer ein Abzeichen zuweisen.
+              revoke_badge_from_user: Einem Benutzer ein Abzeichen entziehen.
             wordpress:
-              publishing: Erforderlich für die Veröffentlichungsfunktionen des WP Discourse-Plugins (erforderlich).
-              commenting: Erforderlich für die Kommentarfunktionen des WP Discourse-Plugins.
-              discourse_connect: Erforderlich für die DiscourseConnect-Funktionen des WP Discourse-Plugins.
-              utilities: Erforderlich, wenn du das WP Discourse Plugin Utilities verwendest.
+              publishing: Erforderlich für die Veröffentlichungsfunktionen des WP-Discourse-Plug-ins (erforderlich).
+              commenting: Erforderlich für die Kommentarfunktionen des WP-Discourse-Plug-ins.
+              discourse_connect: Erforderlich für die DiscourseConnect-Funktionen des WP-Discourse-Plug-ins.
+              utilities: Erforderlich, wenn du WP-Discourse-Plug-in-Dienstprogramme verwendest.
       web_hooks:
         title: "Webhooks"
         none: "Aktuell gibt es keine Webhooks."
@@ -4204,8 +4210,8 @@ de:
           name: "Benachrichtigungs-Ereignis"
           details: "Wenn ein Benutzer eine Benachrichtigung in seinem Feed erhält."
         user_promoted_event:
-          name: "Vom Benutzer gefördertes Ereignis"
-          details: "Wenn ein Nutzer von einer Vertrauensstufe zur nächsten befördert wird."
+          name: "Benutzer-Beförderungs-Ereignis"
+          details: "Wenn ein Benutzer von einer Vertrauensstufe zur nächsten befördert wird."
         user_badge_event:
           name: "Abzeichen-Verleihungs-Ereignis"
           details: "Wenn ein Benutzer ein Abzeichen erhält."
@@ -4518,7 +4524,7 @@ de:
 
               Eigenschaften sollten mit einem Präfix versehen werden, um Konflikte mit Discourse und/oder Plug-ins zu vermeiden.
           head_tag:
-            text: "Kopf"
+            text: "Head"
             title: "HTML, das vor dem Head-Tag eingefügt wird"
           body_tag:
             text: "Body"
@@ -4890,7 +4896,7 @@ de:
           upload: "Aus Datei hinzufügen"
           upload_successful: "Hochladen erfolgreich. Wörter wurden hinzugefügt."
           case_sensitivity_label: "Groß- und Kleinschreibung wird unterschieden"
-          case_sensitivity_description: "Nur Wörter mit passender Schreibweise"
+          case_sensitivity_description: "Nur Wörter mit passender Groß- und Kleinschreibung"
         test:
           button_label: "Test"
           modal_title: "%{action}: Beobachtete Wörter testen"
@@ -5037,20 +5043,20 @@ de:
         anonymize_failed: "Beim Anonymisieren des Kontos ist ein Fehler aufgetreten."
         delete: "Benutzer löschen"
         delete_posts:
-          button: "Lösche alle Beiträge"
+          button: "Alle Beiträge löschen"
           progress:
             title: "Fortschritt beim Löschen von Beiträgen"
             description: "Beiträge werden gelöscht …"
           confirmation:
-            title: "Lösche alle Beiträge von @%{username}"
+            title: "Alle Beiträge von @%{username} löschen"
             description: |
-              <p>Bist Du sicher, dass Du <b>%{post_count}</b> Beiträge von @%{username} löschen möchtest?
+              <p>Bist du sicher, dass du <b>%{post_count}</b> Beiträge von @%{username} löschen möchtest?
 
               <p><b>Dies kann nicht rückgängig gemacht werden!</b></p>
 
-              <p>Um fortzufahren bitte eingeben: <code>%{text}</code></p>
-            text: "lösche Beiträge von @%{username}"
-            delete: "Beiträge löschen von @%{username}"
+              <p>Zum Fortsetzen bitte Folgendes eingeben: <code>%{text}</code></p>
+            text: "Beiträge von @%{username} löschen"
+            delete: "Beiträge von @%{username} löschen"
             cancel: "Abbrechen"
         merge:
           button: "Zusammenführen"
@@ -5089,8 +5095,8 @@ de:
         cant_delete_all_too_many_posts:
           one: "Nicht alle Beiträge können gelöscht werden, da der Benutzer mehr als %{count} Beitrag hat. (Siehe die Einstellung „delete_all_posts_max“.)"
           other: "Nicht alle Beiträge können gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat. (Siehe die Einstellung „delete_all_posts_max“.)"
-        delete_confirm_title: "Bist du sicher, dass du diesen Benutzer löschen willst? Das ist dauerhaft!"
-        delete_confirm: "Im Allgemeinen ist es besser, Nutzer/innen zu anonymisieren, als sie zu löschen, um zu vermeiden, dass Inhalte aus bestehenden Diskussionen entfernt werden."
+        delete_confirm_title: "Bist du SICHER, dass du diesen Benutzer löschen möchtest? Dies kann nicht rückgängig gemacht werden!"
+        delete_confirm: "Im Allgemeinen ist es besser, Benutzer zu anonymisieren, als sie zu löschen, um zu vermeiden, dass Inhalte aus bestehenden Diskussionen entfernt werden."
         delete_and_block: "Löschen und diese E-Mail-Adresse und IP-Adresse <b>blockieren</b>"
         delete_dont_block: "Nur löschen"
         deleting_user: "Benutzer wird gelöscht …"
@@ -5372,15 +5378,15 @@ de:
           upload_csv: Lade eine CSV-Datei mit entweder den E-Mail-Adressen oder den Benutzernamen hoch
           aborted: Bitte lade eine CSV-Datei hoch, die entweder E-Mail-Adressen oder Benutzernamen enthält
           success: Deine CSV-Datei wurde empfangen und %{count} Benutzer werden in Kürze ihr Abzeichen erhalten.
-          csv_has_unmatched_users: "Die folgenden Einträge befinden sich in der CSV-Datei, konnten jedoch nicht mit vorhandenen Benutzern abgeglichen werden und erhalten daher das Abzeichen nicht:"
+          csv_has_unmatched_users: "Die folgenden Einträge befinden sich in der CSV-Datei, konnten jedoch nicht mit vorhandenen Benutzern abgeglichen werden (entsprechend wird ihnen kein Abzeichen verliehen):"
           csv_has_unmatched_users_truncated_list: "Es gab %{count} Einträge in der CSV-Datei, die nicht vorhandenen Benutzern zugeordnet werden konnten und daher das Abzeichen nicht erhalten. Aufgrund der großen Anzahl nicht übereinstimmender Einträge werden nur die ersten 100 angezeigt:"
           replace_owners: Entferne das Abzeichen von vorherigen Eigentümern
-          grant_existing_holders: Gewähre weiteren Abzeichen an bestehende Abzeicheninhaber
+          grant_existing_holders: Weitere Abzeichen an bestehende Abzeicheninhaber verleihen
       emoji:
         title: "Emoji"
-        help: "Füge neue Emojis hinzu, die für alle verfügbar sind. Ziehe mehrere Dateien gleichzeitig per Drag & Drop, ohne einen Namen einzugeben, um Emojis mit ihren Dateinamen zu erstellen. Die ausgewählte Gruppe wird für alle Dateien verwendet, die gleichzeitig hinzugefügt werden. Du kannst auch auf „Neues Emoji hinzufügen“ klicken, um die Dateiauswahl zu öffnen."
+        help: "Füge neue Emojis hinzu, die für alle verfügbar sind. Bewege mehrere Dateien gleichzeitig per Drag-and-drop, ohne einen Namen einzugeben, um Emojis mit den entsprechenden Dateinamen zu erstellen. Die ausgewählte Gruppe wird für alle Dateien verwendet, die gleichzeitig hinzugefügt werden. Du kannst auch auf „Neues Emoji hinzufügen“ klicken, um die Dateiauswahl zu öffnen."
         add: "Neues Emoji hinzufügen"
-        choose_files: "Wähle Dateien"
+        choose_files: "Dateien auswählen"
         uploading: "Wird hochgeladen …"
         name: "Name"
         group: "Gruppe"
@@ -5390,7 +5396,7 @@ de:
       embedding:
         get_started: "Wenn du Discourse in einer anderen Website einbetten möchtest, beginne mit dem Hinzufügen des Hosts."
         confirm_delete: "Möchtest du wirklich diesen Host löschen?"
-        sample: "Verwende den folgenden HTML-Code auf deiner Website, um Discourse-Themen zu erstellen und einzubetten. Ersetze <b>REPLACE_ME</b> mit der URL der Seite, auf der du ihn einbettest."
+        sample: "Verwende den folgenden HTML-Code auf deiner Website, um Discourse-Themen zu erstellen und einzubetten. Ersetze <b>REPLACE_ME</b> mit der URL der Seite, auf der du den Inhalt einbettest."
         title: "Einbettung"
         host: "Erlaubte Hosts"
         class_name: "Klassenname"
@@ -5441,12 +5447,12 @@ de:
           replace: "Ersetzen"
   wizard_js:
     wizard:
-      jump_in: "Spring rein!"
+      jump_in: "Leg los!"
       finish: "Installation verlassen"
       back: "Zurück"
       next: "Nächstes"
-      configure_more: "Konfigurieren Mehr..."
-      step-text: "Schrittweite"
+      configure_more: "Mehr konfigurieren …"
+      step-text: "Schritt"
       step: "%{current} von %{total}"
       upload: "Hochladen"
       uploading: "Wird hochgeladen …"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 3d2e9a192f..be7886d000 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -916,6 +916,8 @@ el:
       enable_defer: "Ενεργοποίηση αναβολής για επισήμανση θεμάτων ως μη αναγνωσμένων"
       experimental_sidebar:
         options: "Επιλογές"
+        navigation_section: "Πλοήγηση"
+        list_destination_default: "Προεπιλογή"
       change: "αλλαγή"
       featured_topic: "Επιλεγμένο θέμα"
       moderator: "Ο/Η %{user} είναι συντονιστής"
@@ -1063,8 +1065,6 @@ el:
         disable: "Απενεργοποίηση"
         save: "Αποθήκευση"
         edit: "Επεξεργασία"
-        enable_security_key_description: |
-          Όταν έχετε προετοιμάσει το <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">κλειδί ασφαλείας υλικού</a> , πατήστε το κουμπί Εγγραφή παρακάτω.
         totp:
           title: "Επαληθευτές βάσει τεκμηρίων"
           add: "Προσθήκη επαληθευτή"
@@ -1072,14 +1072,10 @@ el:
           name_and_code_required_error: "Πρέπει να δώσετε ένα όνομα και τον κωδικό από την εφαρμογή ελέγχου ταυτότητας."
         security_key:
           register: "Εγγραφή"
-          title: "Κλειδιά ασφαλείας"
-          add: "Προσθήκη κλειδιού ασφαλείας"
           default_name: "Κύριο κλειδί ασφαλείας"
           not_allowed_error: "Η διαδικασία καταχώρισης κλειδιού ασφαλείας είτε έληξε είτε ακυρώθηκε."
           already_added_error: "Έχετε ήδη καταχωρίσει αυτό το κλειδί ασφαλείας. Δε χρειάζεται να το καταχωρίσετε ξανά."
-          edit: "Επεξεργασία κλειδιού ασφαλείας"
           save: "Αποθήκευση"
-          edit_description: "Όνομα κλειδιού ασφαλείας"
           name_required_error: "Πρέπει να δώσετε ένα όνομα για το κλειδί ασφαλείας σας."
       change_about:
         title: "Άλλαξε τα «σχετικά με εμένα»"
@@ -1494,7 +1490,6 @@ el:
       second_factor_backup: "Συνδεθείτε χρησιμοποιώντας έναν εφεδρικό κωδικό"
       second_factor_backup_description: "Παρακαλώ εισαγάγετε έναν από τους εφεδρικούς κωδικούς σας:"
       second_factor: "Συνδεθείτε χρησιμοποιώντας την εφαρμογή Authenticator"
-      security_key_description: "Όταν έχετε προετοιμάσει το φυσικό κλειδί ασφαλείας σας, πατήστε το κουμπί «Έλεγχος ταυτότητας με κλειδί ασφαλείας» παρακάτω."
       security_key_alternative: "Δοκιμάστε με έναν άλλο τρόπο"
       security_key_authenticate: "Έλεγχος ταυτότητας με κλειδί ασφαλείας"
       security_key_not_allowed_error: "Η διαδικασία ελέγχου ταυτότητας κλειδιού ασφαλείας είτε έληξε είτε ακυρώθηκε."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 7e8ec888fc..71c278df63 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -193,7 +193,7 @@ es:
     themes:
       default_description: "Por defecto"
       broken_theme_alert: "Puede que tu sitio no funcione, un tema o componente está causando errores."
-      error_caused_by: "Causado por '%{name}'. <a target='blank' href='%{path}'>Haz clic aquí</a> para actualizar, reconfigurar o update, reconfigure or desctivar."
+      error_caused_by: "Causado por «%{name}». <a target='blank' href='%{path}'>Haz clic aquí</a> para actualizar, reconfigurar o desctivar."
       only_admins: "(este mensaje solo lo ven los administradores del sitio)"
     broken_decorator_alert: "Puede que las publicaciones no se muestren correctamente porque uno de los decoradores de publicaciones de tu sitio está causando errores."
     s3:
@@ -970,6 +970,7 @@ es:
     user_fields:
       none: "(selecciona una opción)"
       required: 'Introduce un valor para «%{name}»'
+      same_as_password: 'Tu contraseña no debe repetirse en otros campos.'
     user:
       said: "%{username}:"
       profile: "Perfil"
@@ -1068,6 +1069,9 @@ es:
       no_notifications_title: "No tienes ninguna notificación todavía"
       no_notifications_body: >
         En esta pestaña te avisaremos sobre actividad relevante para ti incluyendo respuestas a tus temas y mensajes, <b>@menciones</b> o citas, y respuestas a los temas que estés siguiendo. También te notificaremos por correo electrónico si hace tiempo que no te conectas.<br><br>A través del icono %{icon} puedes decidir sobre qué temas, categorías y etiquetas quieres que te avisemos. Ve a tus <a href='%{preferencesUrl}'>preferencias de notificaciones</a> para más detalles.
+      no_other_notifications_title: "Todavía no tienes otras notificaciones"
+      no_other_notifications_body: >
+        En este panel se te notificará otro tipo de actividad que puede ser relevante para ti, por ejemplo, cuando alguien enlaza o edita una de tus publicaciones.
       no_notifications_page_title: "Todavía no tienes notificaciones"
       no_notifications_page_body: >
         Te notificaremos de actividad relevante para ti, como cuando alguien responda a tus temas o mensajes, te <b>@mencione</b> o cite, y también cuando alguien responda a temas que estés vigilando. Además, te mandaremos las notificaciones a tu correo electrónico cuando no te hayamos visto por aquí en un tiempo. <br><br>Busca el icono %{icon} para decidir las categorías o etiquetas sobre las que quieres que mandemos notificaciones. Para más ajustes, pásate por tus <a href='%{preferencesUrl}'>preferencias de notificaciones</a>.
@@ -1097,7 +1101,6 @@ es:
       enable_quoting: "Activar respuesta citando el texto seleccionado"
       enable_defer: "Activar diferir para marcar temas no leídos"
       experimental_sidebar:
-        enable: "Activar la barra lateral experimental"
         options: "Opciones"
         categories_section: "Sección de categorías"
         categories_section_instruction: "Las categorías que elijas aparecerán en esta categoría de la barra lateral."
@@ -1273,8 +1276,6 @@ es:
         edit: "Editar"
         edit_title: "Editar autenticador"
         edit_description: "Nombre del autenticador"
-        enable_security_key_description: |
-          Cuando tengas tu <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">clave de seguridad</a> preparada, pulsa el botón de Registrar más abajo.
         totp:
           title: "Autenticación basada en tokens"
           add: "Añadir autentificador"
@@ -1282,14 +1283,10 @@ es:
           name_and_code_required_error: "Debes introducir un nombre y un código de tu aplicación de autentificación."
         security_key:
           register: "Registrar"
-          title: "Claves de seguridad"
-          add: "Añadir clave de seguridad"
           default_name: "Clave de seguridad principal"
           not_allowed_error: "El proceso de registro de clave de seguridad se canceló o se agotó el tiempo."
           already_added_error: "Ya registraste esta clave de seguridad. No tienes que registrarla de nuevo."
-          edit: "Editar clave de seguridad"
           save: "Guardar"
-          edit_description: "Nombre de la clave de seguridad"
           name_required_error: "Debes introducir un nombre para tu clave de seguridad."
       change_about:
         title: "Cambiar «Acerca de mí»"
@@ -1641,6 +1638,9 @@ es:
         title: "Icono"
         none: "(ninguno)"
         instructions: "icono que se muestra junto a tu foto de perfil"
+      status:
+        title: "Estado personalizado"
+        not_set: "No establecido"
       primary_group:
         title: "Grupo principal"
         none: "(ninguno)"
@@ -1656,6 +1656,15 @@ es:
       set_custom_status: "Escribir estado personalizado"
       what_are_you_doing: "¿Qué estás haciendo?"
       remove_status: "Quitar estado"
+    popup:
+      primary: "¡Entendido!"
+      secondary: "no mostrarme estos consejos"
+      first_notification:
+        title: "¡Tu primera notificación!"
+        content: "Las notificaciones se utilizan para mantenerte al día de lo que ocurre en la comunidad."
+      topic_timeline:
+        title: "Cronología del tema"
+        content: "Desplázate rápidamente por una publicación utilizando la cronología del tema."
     loading: "Cargando..."
     errors:
       prev_page: "mientras se intentaba cargar"
@@ -1688,6 +1697,8 @@ es:
       enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar me gusta no están disponibles por ahora."
       login_disabled: "No se puede iniciar sesión mientras el foro se encuentre en modo de solo lectura."
       logout_disabled: "No se puede cerrar sesión mientras el sitio se encuentre en modo de solo lectura."
+    staff_writes_only_mode:
+      enabled: "Este sitio está en modo solo para el personal. Sigue navegando, pero las respuestas, los «me gusta» y otras acciones están limitadas solo a los miembros del personal."
     too_few_topics_and_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Solo los miembros del equipo pueden ver este mensaje.
     too_few_topics_notice_MF: >-
@@ -1719,6 +1730,7 @@ es:
       hide_forever: "no, gracias"
       hidden_for_session: "Vale, te preguntamos mañana. También puedes darle a «Iniciar sesión» para crear tu cuenta."
       intro: "¡Hola! Parece que estás disfrutando del tema, pero no has creado una cuenta todavía."
+      value_prop: "¿Cansado de recorrer las mismas publicaciones? Si creas una cuenta, siempre volverás al punto donde lo dejaste. Con una cuenta también puedes recibir notificaciones de nuevas respuestas, guardar marcadores y utilizar los «me gusta» para dar las gracias a los demás. Podemos trabajar todos juntos para hacer grande esta comunidad :heart:"
     summary:
       enabled_description: "Estás viendo un resumen de este tema: las publicaciones más interesantes de acuerdo a la comunidad."
       description:
@@ -1745,7 +1757,7 @@ es:
       remove_allowed_group: "¿Quieres quitar a %{name} de este mensaje?"
       leave: "Abandonar"
       remove_group: "Quitar grupo"
-      remove_user: "Eliminar usuario"
+      remove_user: "Quitar usuario"
     email: "Correo electrónico"
     username: "Nombre de usuario"
     last_seen: "Visto por última vez"
@@ -1801,7 +1813,6 @@ es:
       second_factor_backup_title: "Código de respaldo de la autenticación de dos factores"
       second_factor_backup_description: "Introduce uno de los códigos de respaldo:"
       second_factor: "Iniciar sesión utilizando la aplicación de autenticación"
-      security_key_description: "Cuando tengas tu clave de seguridad física preparada, presiona el botón de autenticar con clave de seguridad que se encuentra debajo."
       security_key_alternative: "Probar de otra manera"
       security_key_authenticate: "Autenticar con clave de seguridad"
       security_key_not_allowed_error: "La autenticación de la clave de seguridad fue cancelada o se agotó el tiempo."
@@ -1887,7 +1898,7 @@ es:
       categories_only: "Solo categorías"
       categories_with_featured_topics: "Categorías con temas destacados"
       categories_and_latest_topics: "Categorías y temas recientes"
-      categories_and_latest_topics_created_date: "Categorías y últimos temas (ordenar por la fecha de creación de los temas)"
+      categories_and_latest_topics_created_date: "Categorías y temas más recientes (ordenar por fecha de creación del tema)"
       categories_and_top_topics: "Categorías y temas destacados"
       categories_boxes: "Cajas con subcategorías"
       categories_boxes_with_topics: "Cajas con temas destacados"
@@ -2381,12 +2392,29 @@ es:
         likes_with_unread:
           one: "Me gusta - %{count} me gusta sin leer"
           other: "Me gusta - %{count} me gusta sin leer"
+        watching: "Temas observados"
+        watching_with_unread:
+          one: "Temas observados - %{count} tema observado no leído"
+          other: "Temas observados - %{count} temas observados no leídos"
         messages: "Mensajes personales"
+        messages_with_unread:
+          one: "Mensajes personales - %{count} mensaje no leído"
+          other: "Mensajes personales - %{count} mensajes no leídos"
         bookmarks: "Marcadores"
+        bookmarks_with_unread:
+          one: "Marcadores - %{count} marcador no leído"
+          other: "Marcadores - %{count} marcadores no leídos"
         review_queue: "Cola de revisión"
+        review_queue_with_unread:
+          one: "Cola de revisión - %{count} elemento necesita revisión"
+          other: "Cola de revisión - %{count} elementos necesitan revisión"
         other_notifications: "Otras notificaciones"
+        other_notifications_with_unread:
+          one: "Otras notificaciones - %{count} notificación no leída"
+          other: "Otras notificaciones - %{count} notificaciones no leídas"
         profile: "Perfil"
       reviewable:
+        view_all: "ver todos los artículos de revisión"
         queue: "Cola"
         deleted_user: "(usuario eliminado)"
         deleted_post: "(publicación eliminada)"
@@ -3038,6 +3066,10 @@ es:
         confirm:
           one: "¿Seguro que quieres eliminar esa publicación?"
           other: "¿Seguro de que quieres eliminar esas %{count} publicaciones?"
+      merge:
+        confirm:
+          one: "¿Seguro que quieres fusionar estas publicaciones?"
+          other: "¿Seguro que quieres fusionar estas %{count} publicaciones?"
       revisions:
         controls:
           first: "Primera edición"
@@ -3143,6 +3175,7 @@ es:
       name: "Nombre de la categoría"
       description: "Descripción"
       logo: "Imagen (logo) para la categoría"
+      logo_dark: "Imagen del logotipo de la categoría en modo oscuro"
       background_image: "Imagen de fondo de la categoría"
       badge_colors: "Colores de las insignias"
       background_color: "Color de fondo"
@@ -3719,7 +3752,7 @@ es:
       topics:
         none:
           unread: "No tienes temas sin leer."
-          unseen: "No te queda ningún mensaje sin leer."
+          unseen: "Has visto todos los temas."
           new: "No tienes temas nuevos."
           read: "Todavía no has leído ningún tema."
           posted: "Todavía no has publicado en ningún tema."
@@ -3768,6 +3801,7 @@ es:
       no_activity_body: "¡Te damos la bienvenida a la comunidad! Acabas de llegar, por lo que todavía no has participado. Como primer paso, visita los <a href='%{topUrl}'>Destacados</a> o las <a href='%{categoriesUrl}'>Categorías</a> y empieza a leer. Dale al botón %{heartIcon} en las publicaciones que te gusten o sobre las que quieras saber más. Aquí verás tu actividad una vez empieces a participar."
       no_replies_title: "Todavía no has respondido a ningún tema"
       no_replies_title_others: "%{username} todavía no ha respondido a ningún tema"
+      no_replies_body: "Cuando <a href='%{searchUrl}'>descubras</a> una conversación interesante a la que quieras contribuir, pulsa el botón <kbd>Responder</kbd> directamente debajo de cualquier mensaje para empezar a responder a ese mensaje específico. O, si prefieres responder al tema en general en lugar de a un mensaje o a una persona en particular, busca el botón <kbd>Responder</kbd> en la parte inferior del tema, o debajo de la cronología del tema."
       no_drafts_title: "Todavía no has empezado ningún borrador"
       no_drafts_body: "¿Todavía no quieres publicarlo? Vamos a guardar un borrador automáticamente y lo pondremos aquí cuando vayas a empezar a escribir un tema, respuesta o mensaje personal. Dale al botón de cancelar para descartarlo o guardar el borrador y seguir luego."
       no_likes_title: "Todavía no le has dado a me gusta en ningún tema"
@@ -3857,7 +3891,6 @@ es:
               pending_count: "%{count} pendiente(s)"
     welcome_topic_banner:
       title: "Crea tu tema de bienvenida"
-      description: 'Tu tema de bienvenid es lo primero que la gente nueva leerá al llegar. Piensa en este párrafo como si fuera un "discurso breve" o una "declaración de motivos"'
       button_title: "Empezar a editar"
     until: "Hasta:"
   admin_js:
@@ -4107,7 +4140,7 @@ es:
             badges:
               create: Crear nuevas medallas.
               show: Obtener información sobre las medallas.
-              update: Editar medallas.
+              update: Actualizar una medalla.
               delete: Eliminar medallas.
               list_user_badges: Listar las medallas de los usuarios.
               assign_badge_to_user: Dar medallas a los usuarios.
@@ -4429,6 +4462,7 @@ es:
           install_create: "Crear nuevo"
           duplicate_remote_theme: "El componente de tema «%{name}» ya está instalado, ¿seguro que quieres instalar otra copia?"
           force_install: "No se ha podido instalar el tema porque su repositorio Git no es accesible. ¿Seguro que quieres continuar con la instalación?"
+          create_placeholder: "Crear marcador de posición"
           about_theme: "Acerca de"
           license: "Licencia"
           version: "Versión:"
@@ -4609,6 +4643,7 @@ es:
         last_seen_user: "Último usuario visto:"
         no_result: "No se han encontrado resultados para el resumen."
         reply_key: "Clave de respuesta"
+        post_link_with_smtp: "Detalles de publicación y SMTP"
         skipped_reason: "Omitir motivo"
         incoming_emails:
           from_address: "De"
@@ -4860,6 +4895,7 @@ es:
           upload: "Añadir desde archivo"
           upload_successful: "Subida completada. Las palabras se han añadido."
           case_sensitivity_label: "Distingue entre mayúsculas y minúsculas"
+          case_sensitivity_description: "Solo palabras con caracteres coincidentes"
         test:
           button_label: "Prueba"
           modal_title: "%{action}: Prueba de palabras vigiladas"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 23c27d787a..0626494d76 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -788,6 +788,8 @@ et:
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       experimental_sidebar:
         options: "Võimalused"
+        navigation_section: "Navigatsioon"
+        list_destination_default: "Vaikimisi"
       change: "muuda"
       featured_topic: "Esile tõstetud teema"
       moderator: "%{user} on moderaator"
@@ -915,6 +917,8 @@ et:
         edit: "Muuda"
         security_key:
           register: "Registreeru"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           save: "Salvesta"
       change_about:
         title: "Muuda minu andmeid"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 7e79d83511..0adfc9aba3 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -629,6 +629,8 @@ fa_IR:
         reset_to_default: "بازگردانی به پیش‌فرض"
       group:
         all: "همه گروه‌ها"
+      sort:
+        label: "مرتب‌سازی براساس %{criteria}"
     group_histories:
       actions:
         change_group_setting: "تغییر تنظیمات گروه"
@@ -1000,6 +1002,9 @@ fa_IR:
       no_bookmarks_title: "شما هنوز چیزی را نشانه‌گذاری نکرده‌اید"
       no_bookmarks_search: "هیچ نشانکی با درخواست جستجوی شده یافت نشد."
       no_notifications_title: "شما هنوز هیچ اطلاعیه‌ای ندارید"
+      no_other_notifications_title: "شما هنوز هیچ آگاه‌سازی دیگری ندارید"
+      no_other_notifications_body: >
+        در این پنل در مورد سایر فعالیت‌هایی که ممکن است به شما مرتبط باشند - به عنوان مثال، زمانی که شخصی به یکی از نوشته‌های شما پیوند می‌دهد یا ویرایش می‌کند، به شما اطلاع داده می‌شود.
       no_notifications_page_title: "شما هنوز هیچ آگاه‌سازی ندارید"
       first_notification: "اولین پیام اطلاع‌رسانی شما! برای شروع آن‌را انتخاب کنید."
       dynamic_favicon: "نمایش تعداد در ایکون بروسر"
@@ -1023,12 +1028,15 @@ fa_IR:
       enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده"
       enable_defer: "تاخیر را برای علامت زدن مباحث به عنوان خوانده نشده فعال کن"
       experimental_sidebar:
-        enable: "فعال کردن نوار کناری آزمایشی"
+        enable: "فعال کردن نوار کناری"
         options: "تنظیمات"
         categories_section: "بخش دسته‌بندی‌ها"
         categories_section_instruction: "دسته‌بندی‌های انتخاب شده در بخش دسته‌بندی نوار کناری نمایش داده می‌شود."
         tags_section: "بخش برچسب‌ها"
         tags_section_instruction: "برچسب‌های انتخاب شده در بخش برچسب‌ها نوار کناری نمایش داده می‌شود."
+        navigation_section: "ناوبری"
+        list_destination_default: "پیش‌فرض"
+        list_destination_unread_new: "جدید/خوانده نشده"
       change: "تغییر"
       featured_topic: "مبحث برجسته"
       moderator: "%{user} یک مدیر است"
@@ -1187,13 +1195,15 @@ fa_IR:
           name_and_code_required_error: "شما باید یک نام، و کد برنامه احراز هویت خود را ارائه کنید."
         security_key:
           register: "ثبت‌نام"
-          title: "کلیدهای امنیتی"
-          add: "افزودن کلید امنیتی"
+          title: "کلیدهای امنیتی فیزیکی"
+          add: "افزودن کلیدهای امنیتی فیزیکی"
           default_name: "کلید امنیتی اصلی"
+          iphone_default_name: "آیفون"
+          android_default_name: "اندروید"
           not_allowed_error: "روند ثبت کلید امنیتی به پایان رسیده است یا لغو شده است."
-          edit: "کلید امنیتی را ویرایش کنید"
+          edit: "ویرایش کلیدهای امنیتی فیزیکی"
           save: "ذخیره"
-          edit_description: "نام کلید امنیتی"
+          edit_description: "نام کلیدهای امنیتی فیزیکی"
           name_required_error: "شما باید یک نام برای کلید امنیتی خود انتخاب کنید."
       change_about:
         title: "تغییر «درباره‌ی من»"
@@ -1522,6 +1532,9 @@ fa_IR:
       flair:
         none: "(هیچی)"
         instructions: "آیکون نمایش داده شده در کنار تصویر پروفایل شما"
+      status:
+        title: "وضعیت سفارشی"
+        not_set: "تنظیم نشده"
       primary_group:
         title: "گروه اصلی"
         none: "(هیچی)"
@@ -1537,6 +1550,15 @@ fa_IR:
       set_custom_status: "تنظیم وضعیت سفارشی"
       what_are_you_doing: "داری چیکار می‌کنی؟"
       remove_status: "حذف وضعیت"
+    popup:
+      primary: "فهمیدم!"
+      secondary: "این نکات را به من نشان نده"
+      first_notification:
+        title: "اولین آگاه‌سازی شما!"
+        content: "آگاه‌سازی‌ها برای این است که هر آنچه در انجمن اتفاق می‌افتد را به شما اطلاع بدهد، مورد استفاده قرار می‌گیرد."
+      topic_timeline:
+        title: "جدول زمانی موضوع"
+        content: "با استفاده از جدول زمانی موضوع، به سرعت در یک نوشته پیمایش کنید."
     loading: "بارگذاری..."
     errors:
       prev_page: "هنگام تلاش برای بارگذاری"
@@ -1672,7 +1694,6 @@ fa_IR:
       second_factor_backup_title: "پشتیبانگیری از ورود دو مرحله ای"
       second_factor_backup_description: "لطفا یکی از کدهای پشتیبان را وارد کنید:"
       second_factor: "ورود از طریق اپ کدساز"
-      security_key_description: "وقتی کلید امنیتی فیزیکی خود را آماده کردید٬ دکمه تایید اعتبار زیر را فشار دهید."
       security_key_alternative: "روش دیگری را امتحان کنید"
       security_key_authenticate: "تأیید اعتبار با کلید امنیتی"
       security_key_not_allowed_error: "روند تأیید اعتبار کلید امنیتی به پایان رسیده است یا لغو شده است."
@@ -2611,6 +2632,7 @@ fa_IR:
       gap:
         one: "%{count} پاسخ پنهان را مشاهده کنید"
         other: "%{count} پاسخ پنهان را مشاهده کنید"
+      sr_reply_to: "پاسخ به نوشته #%{post_number} توسط @%{username}"
       notice:
         new_user: "اولین بار است که %{user} پست ارسال می کند - بیایید ورودش به انجمن را خوشامد بگوییم!"
       unread: "نوشته‌ی خوانده نشده"
@@ -3323,11 +3345,13 @@ fa_IR:
           click_to_get_started: "برای شروع اینجا را کلیک کنید."
           header_link_text: "برچسب"
           header_action_title: "برچسب‌های نوار کناری خود را ویرایش کنید"
+          configure_defaults: "تنظیمات پیش‌فرض"
         categories:
           none: "شما هنوز هیچ دسته‌بندی اضافه نکرده‌اید."
           click_to_get_started: "برای شروع اینجا را کلیک کنید."
           header_link_text: "دسته‌بندی‌ها"
           header_action_title: "دسته‌بندی‌های نوار کناری خود را ویرایش کنید"
+          configure_defaults: "تنظیمات پیش‌فرض"
         community:
           header_link_text: "انجمن"
           header_action_title: "ایجاد موضوع جدید"
@@ -4349,6 +4373,7 @@ fa_IR:
           search: "جستجو"
           groups: "گروه‌ها"
           dashboard: "پیشخوان"
+          sidebar: "نوار کناری"
         default_categories:
           modal_yes: "بله"
       badges:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 0e6440cd9d..2eca72e888 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -1200,8 +1200,6 @@ fi:
         edit: "Muokkaa"
         edit_title: "Muokkaa todentajaa"
         edit_description: "Todentajan nimi"
-        enable_security_key_description: |
-          Kun <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">tunnistautumislaite</a> on valmiina, paina alla olevaa Rekisteröi-painiketta.
         totp:
           title: "Tunnuksiin perustuvat todentajat"
           add: "Lisää todentaja"
@@ -1209,14 +1207,10 @@ fi:
           name_and_code_required_error: "Anna nimi sekä todentajasovelluksesta löytyvä koodi."
         security_key:
           register: "Rekisteröi"
-          title: "Tunnistautumislaite"
-          add: "Lisää tunnistautumislaite"
           default_name: "Päätunnistautumislaite"
           not_allowed_error: "Tunnistautumislaitteen rekisteröintiprosessi joko vanheni tai peruutettiin."
           already_added_error: "Olet jo rekisteröinyt tämän tunnistautumislaitteen. Sitä ei tarvitse rekisteröidä uudelleen."
-          edit: "Muokkaa tunnistautumislaitetta"
           save: "Tallenna"
-          edit_description: "Tunnistautumislaitteen nimi"
           name_required_error: "Tunnistautumislaite tarvitsee nimen."
       change_about:
         title: "Muokkaa kuvaustasi"
@@ -1707,7 +1701,6 @@ fi:
       second_factor_backup_title: "Kaksivaiheinen vara"
       second_factor_backup_description: "Syötä yksi varakoodeistasi:"
       second_factor: "Kirjaudu todentajasovelluksella"
-      security_key_description: "Kun fyysinen tunnistautumislaite on kätesi ulottuvilla, klikkaa alla olevaa \"Tunnistaudu tunnistautumislaitteella\" -painiketta."
       security_key_alternative: "Kokeile muuta tapaa"
       security_key_authenticate: "Tee todennus tunnistautumislaitteella"
       security_key_not_allowed_error: "Tunnistautumislaitteen todennusprosessi joko vanheni tai peruutettiin."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 8a8e75670c..81ec94d6c5 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -1097,7 +1097,6 @@ fr:
       enable_quoting: "Proposer de citer le texte sélectionné"
       enable_defer: "Activer le bouton pour reporter des sujets à plus tard en les marquant comme non lus"
       experimental_sidebar:
-        enable: "Activer la barre latérale expérimentale"
         options: "Options"
         categories_section: "Section Catégories"
         categories_section_instruction: "Les catégories sélectionnées seront affichées dans la section Catégories de la barre latérale."
@@ -1273,8 +1272,6 @@ fr:
         edit: "Modifier"
         edit_title: "Gérer l'application d'authentification"
         edit_description: "Nom de l'application d'authentification"
-        enable_security_key_description: |
-          Dès que votre <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">clé de sécurité physique</a> est prête, appuyez sur le bouton « Enregistrer » ci-dessous.
         totp:
           title: "Applications d'authentification basées sur les jetons"
           add: "Ajouter une application d'authentification"
@@ -1282,14 +1279,10 @@ fr:
           name_and_code_required_error: "Vous devez donner le nom et le code de votre application d'authentification."
         security_key:
           register: "Enregistrer"
-          title: "Clés de sécurité"
-          add: "Ajouter une clé de sécurité"
           default_name: "Clé de sécurité principale"
           not_allowed_error: "La procédure d'enregistrement de la clé de sécurité a expiré ou a été annulée."
           already_added_error: "Vous avez déjà enregistré cette clé de sécurité. Vous n'avez pas besoin de le faire à nouveau."
-          edit: "Modifier la clé de sécurité"
           save: "Enregistrer"
-          edit_description: "Nom de la clé de sécurité"
           name_required_error: "Vous devez donner un nom à votre clé de sécurité."
       change_about:
         title: "Modifier la rubrique « À propos de moi »"
@@ -1800,7 +1793,6 @@ fr:
       second_factor_backup_title: "Authentification à deux facteurs (code de secours)"
       second_factor_backup_description: "Veuillez saisir un de vos codes de secours :"
       second_factor: "Se connecter avec une application"
-      security_key_description: "Dès que votre clé de sécurité physique est prête, appuyez sur le bouton « S'authentifier avec une clé de sécurité » ci-dessous."
       security_key_alternative: "Essayer une autre méthode"
       security_key_authenticate: "S'authentifier avec une clé de sécurité"
       security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index b9a510dafd..71b7a52499 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -991,6 +991,8 @@ gl:
       enable_defer: "Activar a opción de diferir para marcar os temas como non lidos"
       experimental_sidebar:
         options: "Opcións"
+        navigation_section: "Navegación"
+        list_destination_default: "Predeterminado"
       change: "cambiar"
       featured_topic: "Tema de actualidade"
       moderator: "%{user} é moderador"
@@ -1153,8 +1155,6 @@ gl:
         edit: "Editar"
         edit_title: "Editar autenticador"
         edit_description: "Nome do autenticador"
-        enable_security_key_description: |
-          Cando teña a súa <a href="https://www.google.com/search?q=hardware+security+key" target="_blank"> clave de equipo seguro</a> preparada, prema o botón Rexistrarse, a seguir.
         totp:
           title: "Autenticadores que usan códigos"
           add: "Engadir autenticador"
@@ -1162,14 +1162,12 @@ gl:
           name_and_code_required_error: "Debe escribir un nome e o código da app autenticadora."
         security_key:
           register: "Rexistrarse"
-          title: "Clave de seguranza"
-          add: "Engadir clave de seguranza"
           default_name: "Clave de seguranza principal"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "O proceso de rexistro da clave de seguranza esgotou o tempo ou foi anulado."
           already_added_error: "Xa rexistrou esta clave de seguranza. Non precisa volver rexistrala."
-          edit: "Editar clave de seguranza"
           save: "Gardar"
-          edit_description: "Nome da clave de seguranza"
           name_required_error: "Debe escribir un nome para a clave de seguranza."
       change_about:
         title: "Cambiar «Verbo de min»"
@@ -1648,7 +1646,6 @@ gl:
       second_factor_backup_title: "Copia de seguranza de dobre paso"
       second_factor_backup_description: "Escriba un dos códigos de copia de seguranza:"
       second_factor: "Iniciar sesión cunha app autenticadora"
-      security_key_description: "Cando teña a clave de seguranza preparada, prema no botón Autenticar con clave de seguranza que se amosa a continuación."
       security_key_alternative: "Tentalo doutro xeito"
       security_key_authenticate: "Autenticar con clave de seguranza"
       security_key_not_allowed_error: "O proceso de autenticación da clave de seguranza esgotou o tempo ou foi cancelado."
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 154ace24d0..08a5381f8d 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -760,6 +760,8 @@ he:
         reset_to_default: "איפוס לבררת מחדל"
       group:
         all: "כל הקבוצות"
+      sort:
+        label: "מיון לפי %{criteria}"
     group_histories:
       actions:
         change_group_setting: "שינוי הגדרות קבוצה"
@@ -1183,6 +1185,7 @@ he:
       no_notifications_title: "אין לך התראות עדיין"
       no_notifications_body: >
         בלוח הזה תופענה התראות על פעילות שקשורה ישירות אליך, כולל תגובות לנושאים ולפוסטים שלך, כש<b>@מאזכרים</b> או מצטטים אותך או מגיבים לנושאים ברשימת המעקב שלך. כמו כן, התראות תישלחנה לכתובת הדוא״ל שלך כשלא נכנסת למערכת למשך זמן מה. <br><br> יש לחפש אחר %{icon} כדי להחליט עבור אילו נושאים, קטגוריות ותגיות ברצונך לקבל התראות. למידע נוסף, ניתן לגשת אל <a href='%{preferencesUrl}'>העדפות ההתראות</a> שלך.
+      no_other_notifications_title: "אין לך התראות נוספות עדיין"
       no_notifications_page_title: "אין לך התראות עדיין"
       no_notifications_page_body: >
         תישלחנה אליך התראות על פעילות שקשורה ישירות אליך, כולל תגובות לנושאים ולפוסטים שלך, כש<b>@מאזכרים</b> או מצטטים אותך או מגיבים לנושאים ברשימת המעקב שלך. כמו כן, התראות תישלחנה לכתובת הדוא״ל שלך כשלא נכנסת למערכת למשך זמן מה. <br><br> יש לחפש אחר %{icon} כדי להחליט עבור אילו נושאים, קטגוריות ותגיות ברצונך לקבל התראות. למידע נוסף, ניתן לגשת אל <a href='%{preferencesUrl}'>העדפות ההתראות</a> שלך.
@@ -1212,12 +1215,16 @@ he:
       enable_quoting: "הפעלת תגובת ציטוט לטקסט מסומן"
       enable_defer: "הפעלת דחייה לאחר כך כדי לסמן נושאים כלא נקראו"
       experimental_sidebar:
-        enable: "הפעלת סרגל צד ניסיוני"
+        enable: "הפעלת סרגל צד"
         options: "אפשרויות"
         categories_section: "סעיף קטגוריות"
         categories_section_instruction: "הקטגוריות הנבחרות תוצגנה תחת סעיף הקטגוריות של סרגל הצד."
         tags_section: "סעיף תגיות"
         tags_section_instruction: "התגיות הנבחרות תוצגנה תחת סעיף התגיות של סרגל הצד."
+        navigation_section: "ניווט"
+        list_destination_instruction: "לחיצה על קישור רשימת נושאים עם נושאים חדשים או כאלו שלא נקראו בסרגל הצד, לקחת אותי אל"
+        list_destination_default: "ברירת מחדל"
+        list_destination_unread_new: "חדש/לא נקרא"
       change: "שנה"
       featured_topic: "נושא מומלץ"
       moderator: "ל־%{user} יש תפקיד פיקוח"
@@ -1395,7 +1402,7 @@ he:
         edit_title: "עריכת מאמת"
         edit_description: "שם המאמת"
         enable_security_key_description: |
-          כאשר <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">מפתח האבטחה החומרתי</a> שלך מוכן, יש ללחוץ על כפתור הרישום שלהלן.
+          כאשר <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">מפתח האבטחה החומרתי</a> או המכשיר הנייד התואם שלך מוכן, יש ללחוץ על כפתור הרישום שלהלן.
         totp:
           title: "מאמתים מבוססי אסימונים"
           add: "הוספת מאמת"
@@ -1403,14 +1410,16 @@ he:
           name_and_code_required_error: "עליך לספק שם וקוד מיישומון האימות שלך."
         security_key:
           register: "הרשמה"
-          title: "מפתחות אבטחה"
-          add: "הוספת מפתח אבטחה"
+          title: "מפתחות אבטחה פיזיים"
+          add: "הוספת מפתח אבטחה פיזי"
           default_name: "מפתח אבטחה עיקרי"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "זמן תהליך רישום מפתח האבטחה פג או שבוטל."
           already_added_error: "כבר רשמת את מפתח האבטחה הזה. אין צורך לרשום אותו שוב."
-          edit: "עריכת מפתח אבטחה"
+          edit: "עריכת מפתח אבטחה פיזי"
           save: "שמירה"
-          edit_description: "שם מפתח אבטחה"
+          edit_description: "שם מפתח אבטחה פיזי"
           name_required_error: "עליך לציין שם למפתח האבטחה שלך."
       change_about:
         title: "שינוי בנוגע אליי"
@@ -1784,6 +1793,9 @@ he:
         title: "סמלון"
         none: "(ללא)"
         instructions: "סמל המוצג לצד תמונת הפרופיל שלך"
+      status:
+        title: "מצב משלך"
+        not_set: "לא מוגדר"
       primary_group:
         title: "קבוצה ראשית"
         none: "(ללא)"
@@ -1799,6 +1811,15 @@ he:
       set_custom_status: "הגדרת מצב משלך"
       what_are_you_doing: "מה מעלליך?"
       remove_status: "הסרת מצב"
+    popup:
+      primary: "הבנתי!"
+      secondary: "לא להציג יותר את העצות האלה"
+      first_notification:
+        title: "ההתראה הראשונה שלך!"
+        content: "התראות משמשות לעדכן אותך במה שקורה בקהילה."
+      topic_timeline:
+        title: "ציר הזמן של הנושא"
+        content: "אפשר לגלול במהירות על פני הפוסט באמצעות ציר הזמן של הנושא."
     loading: "טוען..."
     errors:
       prev_page: "בזמן הניסיון לטעון"
@@ -1951,7 +1972,7 @@ he:
       second_factor_backup_title: "גיבוי אימות דו־שלבי"
       second_factor_backup_description: "נא להקליד אחד מהקודים לגיבוי שלך:"
       second_factor: "כניסה עם יישומון אימות"
-      security_key_description: "כשמפתח האבטחה הפיזי שלך מוכן יש ללחוץ על כפתור האימות עם מפתח האבטחה שלהלן."
+      security_key_description: "כשמפתח האבטחה הפיזי או המכשיר הנייד התואם שלך מוכן יש ללחוץ על כפתור האימות עם מפתח האבטחה שלהלן."
       security_key_alternative: "לנסות דרך אחרת"
       security_key_authenticate: "אימות עם מפתח אבטחה"
       security_key_not_allowed_error: "זמן תהליך אימות מפתח האבטחה פג או שבוטל."
@@ -4167,11 +4188,13 @@ he:
           click_to_get_started: "ללחוץ כאן כדי להתחיל."
           header_link_text: "תגיות"
           header_action_title: "לערוך את תגיות סרגל הצד שלך"
+          configure_defaults: "הגדרת ברירות מחדל"
         categories:
           none: "עדיין לא הוספת קטגוריות."
           click_to_get_started: "ללחוץ כאן כדי להתחיל."
           header_link_text: "קטגוריות"
           header_action_title: "לערוך את קטגוריות סרגל הצד שלך"
+          configure_defaults: "הגדרת ברירות מחדל"
         community:
           header_link_text: "קהילה"
           header_action_title: "יצירת נושא חדש"
@@ -4210,7 +4233,6 @@ he:
               pending_count: "%{count} ממתינים"
     welcome_topic_banner:
       title: "כאן ניתן ליצור את נושא קבלת הפנים שלך"
-      description: 'נושא קבלת הפנים שלך הוא הדבר הראשון שמצטרפים חדשים יקראו. אפשר לחשוב על זה כעל „נאום מעלית” או „הצהרת כוונות” במשפט אחד'
       button_title: "להתחיל לערוך"
     until: "עד:"
   admin_js:
@@ -4816,6 +4838,7 @@ he:
           has_overwritten_history: "גרסת ערכת העיצוב הנוכחית אינה קיימת עוד כיוון שהיסטוריית ה־Git שוכתבה על ידי דחיפה כפויה (force push)."
           add: "הוספה"
           theme_settings: "הגדרות ערכת עיצוב"
+          overriden_settings_explanation: "הגדרות שנדרסו מסומנות בנקודה ומודגשות. כדי לאפס את ההגדרות האלו לערך ברירת המחדל, יש ללחוץ על כפתור האיפוס שלצידן."
           no_settings: "לערכת עיצוב זו אין הגדרות."
           theme_translations: "תרגומים של ערכות עיצוב"
           empty: "אין פריטים"
@@ -5624,6 +5647,7 @@ he:
           search: "חיפוש"
           groups: "קבוצות"
           dashboard: "לוח בקרה"
+          sidebar: "סרגל צד"
         secret_list:
           invalid_input: "שדות הקלט לא יכולים להישאר ריקים או להכיל תווים של קווים אנכיים."
         default_categories:
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index 031f6691a0..c250306e6e 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -1149,8 +1149,9 @@ hr:
       enable_quoting: "Omogući citirani odgovor označenoj teksta"
       enable_defer: "Uključi odgodu označavanja nepročitanih tema"
       experimental_sidebar:
-        enable: "Omogući eksperimentalnu bočnu traku"
         options: "Mogućnosti"
+        navigation_section: "Navigacija"
+        list_destination_default: "Zadano"
       change: "promijeni"
       featured_topic: "Istaknuta tema"
       moderator: "%{user} je moderator"
@@ -1324,8 +1325,6 @@ hr:
         edit: "Izmijeni"
         edit_title: "Uredi autentifikator"
         edit_description: "Ime autentifikatora"
-        enable_security_key_description: |
-          Kada pripremite <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardverski sigurnosni ključ</a> , pritisnite tipku Registracija u nastavku.
         totp:
           title: "Autentifikatori temeljeni na Tokenu"
           add: "Dodaj provjeru autentičnosti"
@@ -1333,14 +1332,12 @@ hr:
           name_and_code_required_error: "Morate navesti ime i kôd iz aplikacije za provjeru autentičnosti."
         security_key:
           register: "Registracija"
-          title: "Sigurnosni ključevi"
-          add: "Dodaj sigurnosni ključ"
           default_name: "Glavni sigurnosni ključ"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Postupak registracije sigurnosnog ključa ili je vremenski ograničen ili je otkazan."
           already_added_error: "Već ste registrirali ovaj sigurnosni ključ. Ne morate ga ponovno registrirati."
-          edit: "Uredi sigurnosni ključ"
           save: "Spremi"
-          edit_description: "Naziv sigurnosnog ključa"
           name_required_error: "Morate navesti ime za svoj sigurnosni ključ."
       change_about:
         title: "Promijeni O meni"
@@ -1861,7 +1858,6 @@ hr:
       second_factor_backup_title: "Sigurnosna kopija od dva faktora"
       second_factor_backup_description: "Unesite jedan od vaših rezervnih kodova:"
       second_factor: "Prijavite se pomoću aplikacije Authenticator"
-      security_key_description: "Kada pripremite svoj fizički sigurnosni ključ, pritisnite gumb Autentifikacija sa sigurnosnim ključem u nastavku."
       security_key_alternative: "Pokušaj na drugi način"
       security_key_authenticate: "Autentifikacija sa sigurnosnim ključem"
       security_key_not_allowed_error: "Proces provjere autentičnosti sigurnosnog ključa je istekao ili je otkazan."
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d002927456..46a05fefc8 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -1096,6 +1096,8 @@ hu:
       enable_defer: "A témák olvasatlannak jelölésének engedélyezése"
       experimental_sidebar:
         options: "Beállítások"
+        navigation_section: "Navigáció"
+        list_destination_default: "Alapértelmezett"
       change: "módosítás"
       featured_topic: "Kiemelt téma"
       moderator: "%{user} egy moderátor"
@@ -1265,8 +1267,6 @@ hu:
         edit: "Szerkesztés"
         edit_title: "Hitelesítő szerkesztése"
         edit_description: "Hitelesítő neve"
-        enable_security_key_description: |
-          Ha előkészítette a <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardveres biztonsági kulcsát</a>, nyomja meg a lenti Regisztráció gombot.
         totp:
           title: "Token alapú hitelesítők"
           add: "Hitelesítő hozzáadása"
@@ -1274,14 +1274,10 @@ hu:
           name_and_code_required_error: "Meg kell adnia egy nevet, és egy kódot a hitelesítő alkalmazásból."
         security_key:
           register: "Regisztráció"
-          title: "Biztonsági kulcsok"
-          add: "Biztonsági kulcs hozzáadása"
           default_name: "Elsődleges biztonsági kulcs"
           not_allowed_error: "A biztonsági hardverkulcs regisztrációs folyamata során időtúllépés történt, vagy megszakították."
           already_added_error: "Már regisztrálta ezt a biztonsági kulcsot. Nem kell újraregisztrálnia."
-          edit: "Biztonsági kulcs szerkesztése"
           save: "Mentés"
-          edit_description: "Biztonsági kulcs neve"
           name_required_error: "Meg kell adnia a biztonsági kulcs nevét."
       change_about:
         title: "Névjegy módosítása"
@@ -1789,7 +1785,6 @@ hu:
       second_factor_backup_title: "Kétfaktoros biztonsági kód"
       second_factor_backup_description: "Írja be valamelyik biztonsági kódját:"
       second_factor: "Bejelentkezés hitelesítő alkalmazással"
-      security_key_description: "Ha előkészítette a fizikai biztonsági kulcsot, nyomja meg a lenti „Hitelesítés biztonsági kulccsal” gombot."
       security_key_alternative: "Próbálkozás más módon"
       security_key_authenticate: "Hitelesítés biztonsági kulccsal"
       security_key_not_allowed_error: "A biztonsági hardverkulcsos hitelesítési folyamata során időtúllépés történt, vagy megszakították."
@@ -3450,7 +3445,6 @@ hu:
               title: "áttekintés"
     welcome_topic_banner:
       title: "Hozzon létre üdvözlő témát"
-      description: 'Az üdvözlő téma az első, amit az újonnan érkezők olvasnak. Gondoljon rá úgy mint egy bekezdésnyi bemutatkozóra vagy „küldetésnyilatkozatra”.'
       button_title: "Szerkesztés megkezdése"
     until: "Eddig:"
   admin_js:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 6966d7fe2d..2ed5cf8d24 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -839,6 +839,8 @@ hy:
       enable_defer: "Սեղմել <<Հետաձգում>> կոճակը, նշելով որպես չընթերցված թեմաներ "
       experimental_sidebar:
         options: "Տարբերակներ"
+        navigation_section: "Նավիգացիա"
+        list_destination_default: "Լռելյայն"
       change: "փոխել"
       featured_topic: "Հանրահայտ թեմա"
       moderator: "%{user}-ը մոդերատոր է"
@@ -983,14 +985,12 @@ hy:
           name_and_code_required_error: "Դուք պետք է նշեք նույնականացման հավելվածի կոդը և անվանումը:"
         security_key:
           register: "Գրանցվել"
-          title: "Անվտանգության Բանալիներ"
-          add: "Ավելացնել Անվտանգության Բանալին"
           default_name: "Անվտանգության Գլխավոր Բանալին"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
           already_added_error: "Դուք արդեն գրանցել եք այս անվտանգության բանալին: Պետք չէ այն նորից գրանցել:"
-          edit: "Խմբագրել Անվտանգության Բանալին"
           save: "Պահպանել"
-          edit_description: "Անվտանգության Բանալիների անվանումը"
           name_required_error: "Դուք պետք է նշեք անվտանգության բանալու անվանումը "
       change_about:
         title: "Փոփոխել Իմ Մասին բաժինը"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 29086beaa9..ef3d911995 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -935,6 +935,8 @@ id:
       enable_quoting: "Aktifkan balasan kutipan untuk teks yang disorot"
       experimental_sidebar:
         options: "Pilihan"
+        navigation_section: "Navigasi"
+        list_destination_default: "Asal"
       change: "ubah"
       featured_topic: "Topik Unggulan"
       moderator: "%{user} adalah moderator"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 1ec2d9e7b1..ae9759c1c7 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -135,7 +135,7 @@ it:
       next_month: "Mese Prossimo"
       placeholder: data
       from_placeholder: "dalla data"
-      to_placeholder: "ad oggi"
+      to_placeholder: "a oggi"
     share:
       topic_html: 'Argomento: <span class="topic-title">%{topicTitle}</span>'
       post: "messaggio n°%{postNumber} di @%{username}"
@@ -146,7 +146,7 @@ it:
       url: "Copia e condividi l'URL"
     action_codes:
       public_topic: "ha reso questo argomento pubblico %{when}"
-      open_topic: "Convertito in un argomento %{when}"
+      open_topic: "Convertito in un argomento il %{when}"
       private_topic: "ha reso questo argomento un messaggio personale %{when}"
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "ha invitato %{who} %{when}"
@@ -189,6 +189,7 @@ it:
       other: "Per rendere più facile il lancio del nuovo sito, sei in modalità bootstrap. A tutti i nuovi utenti verrà concesso il livello di attendibilità 1 e verranno attivate le email di riepilogo giornaliere. Questa modalità verrà disattivata automaticamente quando %{count} utenti si saranno uniti."
     bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
     bootstrap_invite_button_title: "Manda Inviti"
+    bootstrap_wizard_link_title: "Completa la configurazione guidata"
     themes:
       default_description: "Predefinito"
       broken_theme_alert: "Il sito potrebbe non funzionare a causa di errori in un tema / componente."
@@ -314,7 +315,7 @@ it:
       not_bookmarked: "aggiungi messaggio ai segnalibri"
       remove_reminder_keep_bookmark: "Rimuovi il promemoria e mantieni il segnalibro"
       created_with_reminder: "Hai aggiunto ai segnalibri questo messaggio con un promemoria %{date}. %{name}"
-      created_with_reminder_generic: "L'hai aggiunto ai segnalibri con un promemoria %{date}. %{name}"
+      created_with_reminder_generic: "L'hai aggiunto ai segnalibri con un promemoria per il %{date}. %{name}"
       remove: "Rimuovi Segnalibro"
       delete: "Cancella Segnalibro"
       confirm_delete: "Vuoi eliminare questo segnalibro? Anche il promemoria verrà eliminato."
@@ -328,7 +329,7 @@ it:
         label: "Dopo aver ricevuto una notifica"
         never: "Mantieni segnalibro"
         when_reminder_sent: "Cancella segnalibro"
-        on_owner_reply: "Elimina il segnalibro, una volta che ho risposto"
+        on_owner_reply: "Elimina il segnalibro, dopo la mia risposta"
         clear_reminder: "Mantieni il segnalibro e cancella il promemoria"
       search_placeholder: "Cerca nei segnalibri per nome, titolo dell'argomento o contenuto del messaggio"
       search: "Cerca"
@@ -408,7 +409,7 @@ it:
         placeholder: "digita qui il titolo del messaggio, l'URL o l'id"
     review:
       order_by: "Ordina per"
-      date_filter: "Pubblicato tra"
+      date_filter: "Pubblicazione tra"
       in_reply_to: "in risposta a"
       explain:
         why: "spiega perché questo oggetto è stato aggiunto alla coda"
@@ -969,6 +970,7 @@ it:
     user_fields:
       none: "(scegli un'opzione)"
       required: 'Inserisci un valore per "%{name}"'
+      same_as_password: 'La tua password non deve essere ripetuta in altri campi.'
     user:
       said: "%{username}:"
       profile: "Profilo"
@@ -1056,7 +1058,7 @@ it:
       dismiss_notifications: "Ignora tutti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
       dismiss_bookmarks_tooltip: "Contrassegna tutti i promemoria dei segnalibri non letti come già letti"
-      dismiss_messages_tooltip: "Segna come lette tutte le notifiche di messaggi personali non letti"
+      dismiss_messages_tooltip: "Contrassegna tutte le notifiche di messaggi personali non letti come già letti"
       no_messages_title: "Non hai messaggi"
       no_messages_body: >
         Hai la necessità di avere una conversazione privata con qualcuno? Invia un messaggio selezionando l'avatar e utilizzando il pulsante del messaggio %{icon}<br><br> Se hai bisogno di aiuto, puoi <a href='%{aboutUrl}'>inviare un messaggio a un membro dello staff</a>.
@@ -1067,9 +1069,12 @@ it:
       no_notifications_title: "Non hai ancora notifiche"
       no_notifications_body: >
         Riceverai una notifica in questo pannello sulle attività che ti riguardano direttamente, quali risposte ai tuoi argomenti e messaggi. quando qualcuno ti <b>@menziona</b> o ti cita e risponde agli argomenti che stai osservando. Le notifiche verranno inviate anche alla tua e-mail quando non hai effettuato l'accesso per un po' di tempo. <br><br> Cerca %{icon} per decidere su quali argomenti, categorie ed etichette essere informato. Per ulteriori informazioni, consulta le tue <a href='%{preferencesUrl}'>preferenze di notifica</a>.
+      no_other_notifications_title: "Non hai ancora altre notifiche"
+      no_other_notifications_body: >
+        Riceverai una notifica in questo pannello su altri tipi di attività che potrebbero essere rilevanti per te, ad esempio quando qualcuno aggiunge un link a uno dei tuoi messaggi o lo modifica.
       no_notifications_page_title: "Non hai ancora notifiche"
       no_notifications_page_body: >
-        Riceverai una notifica sulle attività rilevanti per te, fra cui le risposte ai tuoi argomenti e messaggi, quando qualcuno ti <b>@menziona</b> o ti cita, e le risposte agli argomenti che osservi. Le notifiche ti saranno inviate anche per e-mail quando è un po' che non ti colleghi al forum. <br><br> Cerca l'%{icon} per decidere per quali specifici argomenti, categorie ed etichette vuoi ricevere le notifiche. Per maggiori opzioni, vai alle tue <a href='%{preferencesUrl}'>preferenze di notifica</a>.
+        Riceverai una notifica sulle attività rilevanti per te, fra cui le risposte ai tuoi argomenti e messaggi, quando qualcuno ti <b>@menziona</b> o ti cita, e risponde agli argomenti che osservi. Le notifiche ti saranno inviate anche per e-mail quando è un po' che non accedi al forum. <br><br> Cerca l'icona %{icon} per decidere per quali specifici argomenti, categorie ed etichette vuoi ricevere le notifiche. Per altre opzioni, vai alle tue <a href='%{preferencesUrl}'>preferenze di notifica</a>.
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       dynamic_favicon: "Mostra il contatore sull'icona del browser"
       skip_new_user_tips:
@@ -1096,11 +1101,10 @@ it:
       enable_quoting: "Abilita \"rispondi citando\" il testo evidenziato"
       enable_defer: "Abilita opzione di contrassegnare gli argomenti da leggere in seguito"
       experimental_sidebar:
-        enable: "Abilita la barra laterale sperimentale"
         options: "Opzioni"
         categories_section: "Sezione Categorie"
         categories_section_instruction: "Le categorie selezionate saranno visualizzate nella sezione Categorie della barra laterale."
-        tags_section: "Sezione Tag"
+        tags_section: "Sezione etichette"
         tags_section_instruction: "Le etichette selezionate appariranno nella sezione Etichette della barra laterale."
       change: "cambia"
       featured_topic: "Argomento in primo piano"
@@ -1187,11 +1191,11 @@ it:
         unread: "Non letti"
         unread_with_count:
           one: "Non letto (%{count})"
-          other: "Non letto (%{count})"
-        new: "Nuovi"
+          other: "Non letti (%{count})"
+        new: "Nuovo"
         new_with_count:
           one: "Nuovo (%{count})"
-          other: "Nuovo (%{count})"
+          other: "Nuovi (%{count})"
         archive: "Archiviati"
         groups: "I Miei Gruppi"
         move_to_inbox: "Sposta nella posta in arrivo"
@@ -1201,7 +1205,9 @@ it:
         all_tags: "Tutte le Etichette"
         warnings: "Avvertimenti ufficiali"
         read_more_in_group: "Vuoi continuare a leggere? Sfoglia altri messaggi in %{groupLink}."
-        read_more: "Vuoi saperne di più? Leggi altri messaggi in <a href='%{basePath}/u/%{username}/messages'>messaggi personali</a>."
+        read_more: "Vuoi continuare a leggere? Sfoglia altri messaggi in <a href='%{basePath}/u/%{username}/messages'>messaggi personali</a>."
+        read_more_group_pm_MF: "{ UNREAD, plural, =0 {} one { C'è<a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># messaggio non letto</a> } other { Ci sono <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># messaggi non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {c'è } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># nuovo</a> messaggio} other { {BOTH, select, true{e } false {ci sono} other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># nuovi</a> messaggi} } rimanenti, oppure sfoglia altri messaggi in {groupLink}"
+        read_more_personal_pm_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='{basePath}/u/{username}/messages/unread'># messaggio non letto</a> } other { Ci sono <a href='{basePath}/u/{username}/messages/unread'># messaggi non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {c'è } other{}} <a href='{basePath}/u/{username}/messages/new'># nuovo</a> messaggio} other { {BOTH, select, true{e } false {ci sono } other{}} <a href='{basePath}/u/{username}/messages/new'># nuovi</a> messaggi} } rimanenti, o sfoglia altri <a href='{basePath}/u/{username}/messages'>messaggi personali</a>"
       preferences_nav:
         account: "Account"
         security: "Sicurezza"
@@ -1270,8 +1276,6 @@ it:
         edit: "Modifica"
         edit_title: "Modifica Authenticator"
         edit_description: "Nome Authenticator"
-        enable_security_key_description: |
-          Quando <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">la chiave di sicurezza hardware</a> è pronta, premi il pulsante Registra di seguito.
         totp:
           title: "Authenticator basati su Token"
           add: "Aggiungi Authenticator"
@@ -1279,14 +1283,10 @@ it:
           name_and_code_required_error: "Devi fornire un nome e il codice dalla tua app di autenticazione."
         security_key:
           register: "Registra"
-          title: "Chiave di Sicurezza"
-          add: "Aggiungi Chiave di Sicurezza"
           default_name: "Chiave di Sicurezza principale"
           not_allowed_error: "Il processo di registrazione della Chiave di Sicurezza è scaduto o è stato annullato."
           already_added_error: "Hai già registrato questa Chiave di Sicurezza. Non è necessario registrarla di nuovo."
-          edit: "Modifica Chiave di Sicurezza"
           save: "Salva"
-          edit_description: "Nome Chiave di Sicurezza"
           name_required_error: "Devi fornire un nome per la Chiave di Sicurezza"
       change_about:
         title: "Modifica i dati personali"
@@ -1451,7 +1451,7 @@ it:
         every_month: "ogni mese"
         every_six_months: "ogni sei mesi"
       email_level:
-        title: "Inviami un'e-mail quando sono citato, ricevo una risposta, il mio @nomeutente è menzionato, o quando c'è una nuova attività nelle categorie, nei tag o negli argomenti che osservo"
+        title: "Inviami un'e-mail quando sono citato, ricevo una risposta, o il mio @nomeutente è menzionato, oppure quando c'è una nuova attività nelle categorie, nelle etichette o negli argomenti che osservo"
         always: "sempre"
         only_when_away: "solo quando non collegato"
         never: "mai"
@@ -1541,7 +1541,7 @@ it:
           show_advanced: "Mostra Opzioni Avanzate"
           hide_advanced: "Nascondi opzioni avanzate"
           restrict: "Limita a"
-          restrict_email: "Limita all'e-mail"
+          restrict_email: "Limita alle e-mail"
           restrict_domain: "Limita al dominio"
           email_or_domain_placeholder: "nome@esempio.com o esempio.com"
           max_redemptions_allowed: "Limite max di utilizzi"
@@ -1550,7 +1550,7 @@ it:
           expires_at: "Scadenza:"
           custom_message: "Messaggio personale facoltativo"
           send_invite_email: "Salva e invia Email"
-          send_invite_email_instructions: "Limita l'invito all'e-mail per inviare un'e-mail di invito"
+          send_invite_email_instructions: "Limita l'invito alle e-mail per inviare un'e-mail di invito"
           save_invite: "Salva invito"
           invite_saved: "Invito salvato."
         bulk_invite:
@@ -1576,7 +1576,7 @@ it:
         title: "Riepilogo"
         stats: "Statistiche"
         time_read: "tempo di lettura"
-        time_read_title: "%{duration} (da sempre)"
+        time_read_title: "%{duration} (sempre)"
         recent_time_read: "orario di lettura recente"
         recent_time_read_title: "%{duration} (negli ultimi 60 giorni)"
         topic_count:
@@ -1685,6 +1685,8 @@ it:
       enabled: "Questo sito è in modalità di sola lettura. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono per il momento disabilitate."
       login_disabled: "L'accesso è disabilitato quando il sito è in modalità di sola lettura."
       logout_disabled: "La disconnessione è disabilitata quando il sito è in modalità di sola lettura."
+    staff_writes_only_mode:
+      enabled: "Questo sito è in modalità di sola lettura per lo staff. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono limitate ai soli membri dello staff."
     too_few_topics_and_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono <strong>#</strong> argomenti}} e {currentPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. I visitatori hanno bisogno d'altro per leggere e rispondere: consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}} e {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
     too_few_topics_notice_MF: >-
@@ -1716,6 +1718,7 @@ it:
       hide_forever: "no grazie"
       hidden_for_session: "OK, te lo chiederemo domani. Puoi sempre utilizzare \"Accedi\" anche per creare un account."
       intro: "Ciao! Sembra che la discussione ti interessi, ma non hai ancora registrato un account."
+      value_prop: "Non ti piace dover scorrere gli stessi messaggi? Quando crei un account, riprenderai sempre dall'ultimo messaggio letto. Potrai anche ricevere notifiche di nuove risposte, salvare segnalibri e usare i \"mi piace\" per ringraziare gli altri. Possiamo lavorare tutti insieme per rendere questa community un posto fantastico. :heart:"
     summary:
       enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti."
       description:
@@ -1725,7 +1728,7 @@ it:
       enable: "Riassumi Questo Argomento"
       disable: "Mostra Tutti i Messaggi"
       short_label: "Riassumi"
-      short_title: "Mostra un riassunto di questo argomento: i messaggi più interessanti secondo gli utenti"
+      short_title: "Mostra un riassunto di questo argomento: i messaggi più interessanti secondo la community"
     deleted_filter:
       enabled_description: "Questo argomento contiene messaggi eliminati, che sono quindi nascosti."
       disabled_description: "I messaggi eliminati di questo argomento sono ora visibili."
@@ -1741,6 +1744,7 @@ it:
       remove_allowed_user: "Vuoi davvero rimuovere %{name} da questo messaggio?"
       remove_allowed_group: "Vuoi davvero rimuovere %{name} da questo messaggio?"
       leave: "Abbandona"
+      remove_group: "Rimuovi gruppo"
       remove_user: "Rimuovi utente"
     email: "Email"
     username: "Nome utente"
@@ -1760,7 +1764,7 @@ it:
       title: "Reimposta Password"
       action: "Ho dimenticato la password"
       invite: "Inserisci il nome utente o l'indirizzo email. Ti manderemo un'email per reimpostare la password."
-      invite_no_username: "Inserisci il tuo indirizzo di posta elettronica e ti spediremo un'e-mail per reimpostare la password."
+      invite_no_username: "Inserisci il tuo indirizzo di posta elettronica e riceverai un'e-mail per reimpostare la password."
       reset: "Reimposta Password"
       complete_username: "Se un account corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con le istruzioni per ripristinare la tua password."
       complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email contenente le istruzioni per ripristinare la password."
@@ -1797,7 +1801,6 @@ it:
       second_factor_backup_title: "Backup per l'Autenticazione a Due Fattori"
       second_factor_backup_description: "Inserisci uno dei tuoi codici di backup:"
       second_factor: "Accedi utilizzando l'app Authenticator"
-      security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Chiave di Sicurezza qui sotto."
       security_key_alternative: "Prova in un altro modo"
       security_key_authenticate: "Autentica con Chiave di Sicurezza"
       security_key_not_allowed_error: "Il processo di autenticazione con Chiave di Sicurezza è scaduto o è stato annullato."
@@ -1883,7 +1886,7 @@ it:
       categories_only: "Solo Categorie"
       categories_with_featured_topics: "Categorie con argomenti in evidenza"
       categories_and_latest_topics: "Categorie e Argomenti Recenti"
-      categories_and_latest_topics_created_date: "Categorie e Recenti (in ordine di data di creazione)"
+      categories_and_latest_topics_created_date: "Categorie e argomenti recenti (in ordine di data di creazione)"
       categories_and_top_topics: "Categorie e Argomenti Popolari"
       categories_boxes: "Riquadri con sottocategorie"
       categories_boxes_with_topics: "Riquadri con Argomenti in evidenza"
@@ -1906,7 +1909,7 @@ it:
         one: "+ %{count} sottocategoria"
         other: "+ %{count} sottocategorie"
     select_kit:
-      delete_item: "Cancella %{name} account"
+      delete_item: "Cancella %{name}"
       filter_by: "Filtra per: %{name}"
       select_to_filter: "Seleziona un valore da filtrare"
       default_header_text: Selezione...
@@ -1973,6 +1976,7 @@ it:
       edit_conflict: "modifica conflitto"
       esc: "esc"
       esc_label: "Clicca o premi Esc per chiudere"
+      ok_proceed: "Ok, procedi"
       group_mentioned_limit:
         one: "<b>Attenzione!</b> Hai menzionato <a href='%{group_link}'>%{group}</a>, tuttavia questo gruppo ha più membri rispetto al limite di %{count} menzione di utente configurato dall'amministratore. Non ci saranno notifiche."
         other: "<b>Attenzione!</b> Hai menzionato <a href='%{group_link}'>%{group}</a>, tuttavia questo gruppo ha più membri rispetto al limite di %{count} menzioni di utenti configurato dall'amministratore. Non ci saranno notifiche."
@@ -1983,10 +1987,10 @@ it:
         category: "Hai menzionato %{username} ma non riceverà alcuna notifica perché non ha accesso a questa categoria. Dovrai aggiungerlo ad un gruppo che ha accesso a questa categoria."
         private: "Hai menzionato %{username} ma non riceverà alcuna notifica perché non ha accesso a questo messaggio privato. Dovrai invitarlo a questo messaggio privato."
         muted_topic: "Hai menzionato @%{username} ma non riceverà alcuna notifica perché ha silenziato questo argomento."
-        not_allowed: "Hai menzionato @%{username} ma non riceverà alcuna notifica perché ha silenziato questo argomento."
+        not_allowed: "Hai menzionato @%{username} ma non riceverà alcuna notifica perché non è stato invitato a questo argomento."
       here_mention:
-        one: "Menzionando <b>@%{here}</b>, verrà inviata una notifica a %{count} utente – confermi?"
-        other: "Menzionando <b>@%{here}</b>, verrà inviata una notifica a %{count} utenti – confermi?"
+        one: "Menzionando <b>@%{here}</b>, verrà inviata una notifica a %{count} utente: confermi?"
+        other: "Menzionando <b>@%{here}</b>, verrà inviata una notifica a %{count} utenti: confermi?"
       duplicate_link: "Sembra che il tuo collegamento a <b>%{domain}</b> sia già stato pubblicato in questo argomento da <b>@%{username}</b> in <a href='%{post_url}'>una risposta di %{ago}</a> - sei sicuro di volerlo pubblicare ancora?"
       reference_topic_title: "RE: %{title}"
       error:
@@ -2075,6 +2079,9 @@ it:
         body: "Per ora il messaggio sarà inviato solo a te stesso!"
       slow_mode:
         error: "Questo argomento è in modalità lenta. Hai già pubblicato qualcosa di recente, potrai scrivere di nuovo tra %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "La persona a cui stai inviando messaggi, <b>%{usernames}</b>, non si fa vedere qui da molto tempo: %{time_ago}. Potrebbe non ricevere il tuo messaggio. Prova a usare metodi alternativi per contattare %{usernames}."
+        multiple: "Le seguenti persone a cui stai inviando messaggi: <b>%{usernames}</b>, non si fanno vedere qui da molto tempo: %{time_ago}. Potrebbero non ricevere il tuo messaggio. Prova a usare metodi alternativi per contattarli."
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
       composer_actions:
         reply: Rispondi
@@ -2126,7 +2133,7 @@ it:
       post_approved: "Il tuo messaggio è stato approvato"
       reviewable_items: "elementi in attesa di revisione"
       watching_first_post_label: "Nuovo Argomento"
-      user_moved_post: "%{username} spostato"
+      user_moved_post: "Utente %{username} spostato"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2141,8 +2148,8 @@ it:
         other: "<span class='multi-user'>%{username}, %{username2} e altri %{count}</span> %{description}"
       liked_by_2_users: "%{username}, %{username2}"
       liked_by_multiple_users:
-        one: "%{username}, %{username2} e %{count} altri"
-        other: "%{username}, %{username2} e %{count} altri"
+        one: "%{username}, %{username2} e %{count} altro"
+        other: "%{username}, %{username2} e altri %{count}"
       liked_consolidated_description:
         one: "ha messo \"mi piace\" a %{count} dei tuoi messaggi"
         other: "ha messo \"mi piace\" a %{count} dei tuoi messaggi"
@@ -2167,11 +2174,14 @@ it:
       dismiss_confirmation:
         body:
           default:
-            one: "Sei sicuro/a? Hai %{count} notifica importante."
-            other: "Sei sicuro? Hai %{count} notifiche importanti."
+            one: "Vuoi procedere? Hai %{count} notifica importante."
+            other: "Vuoi procedere? Hai %{count} notifiche importanti."
+          bookmarks:
+            one: "Procedere? Hai %{count} promemoria per segnalibri non letto."
+            other: "Sei sicuro? Hai %{count} promemoria per segnalibri non letti."
           messages:
-            one: "Sei sicuro/a? Hai %{count} messaggio personale non letto."
-            other: "Sei sicuro/a? Hai %{count} messaggi personali non letti."
+            one: "Vuoi procedere? Hai %{count} messaggio personale non letto."
+            other: "Vuoi procedere? Hai %{count} messaggi personali non letti."
         dismiss: "Ignora"
         cancel: "Annulla"
       group_message_summary:
@@ -2230,7 +2240,7 @@ it:
       clear_all: "Cancella Tutto"
       too_short: "La tua chiave di ricerca è troppo corta."
       open_advanced: "Apri ricerca avanzata"
-      clear_search: "Azzera ricerca"
+      clear_search: "Annulla ricerca"
       sort_or_bulk_actions: "Ordina o seleziona in blocco i risultati"
       result_count:
         one: "<span>%{count} risultato per</span><span class='term'>%{term}</span>"
@@ -2255,7 +2265,7 @@ it:
       in_this_topic: "in questo argomento"
       in_this_topic_tooltip: "passa alla ricerca di tutti gli argomenti"
       in_messages: "nei messaggi"
-      in_messages_tooltip: "passa alla ricerca di tutti gli argomenti"
+      in_messages_tooltip: "passa alla ricerca degli argomenti normali"
       in_topics_posts: "in tutti gli argomenti e i messaggi"
       enter_hint: "o premi Invio"
       in_posts_by: "nei messaggi di @%{username}"
@@ -2278,7 +2288,7 @@ it:
         category_tag: "filtra per categoria o etichetta"
         author: "filtra per autore del messaggio"
         in: "filtra per metadati (per es. in:title, in:personal, in:pinned)"
-        status: "filtra per status dell'argomento"
+        status: "filtra per stato dell'argomento"
         full_search: "avvia la ricerca a pagina intera"
         full_search_key: "%{modifier} + Invio"
       advanced:
@@ -2343,7 +2353,7 @@ it:
           placeholder: massimo
           aria_label: filtra per visualizzazioni massime
         additional_options:
-          label: "Filtra per numero di post e visualizzazioni dell'argomento"
+          label: "Filtra per numero di messaggi e visualizzazioni dell'argomento"
     hamburger_menu: "menu"
     new_item: "nuovo"
     go_back: "indietro"
@@ -2352,20 +2362,53 @@ it:
     view_all: "visualizza tutto in %{tab}"
     user_menu:
       generic_no_items: "Non ci sono elementi in questo elenco."
+      sr_menu_tabs: "Schede del menu utente"
       view_all_notifications: "visualizza tutte le notifiche"
       view_all_bookmarks: "visualizza tutti i segnalibri"
       view_all_messages: "visualizza tutti i messaggi personali"
       tabs:
+        all_notifications: "Tutte le notifiche"
         replies: "Risposte"
+        replies_with_unread:
+          one: "Risposte : %{count} risposta non letta"
+          other: "Risposte : %{count} risposte non lette"
         mentions: "Menzioni"
-        likes: "Mi piace - Assegnati"
+        mentions_with_unread:
+          one: "Menzioni: %{count} menzione non letta"
+          other: "Menzioni: %{count} menzioni non lette"
+        likes: "Mi piace"
+        likes_with_unread:
+          one: "Mi piace: %{count} Mi piace non letto"
+          other: "Mi piace: %{count} Mi piace non letti"
+        watching: "Argomenti osservati"
+        watching_with_unread:
+          one: "Argomenti osservati: %{count} argomento osservato non letto"
+          other: "Argomenti osservati: %{count} argomenti osservati non letti"
+        messages: "Messaggi personali"
+        messages_with_unread:
+          one: "Messaggi personali: %{count} messaggio non letto"
+          other: "Messaggi personali: %{count} messaggi non letti"
         bookmarks: "Segnalibri"
+        bookmarks_with_unread:
+          one: "Segnalibri: %{count} segnalibro non letto"
+          other: "Segnalibri: %{count} segnalibri non letti"
+        review_queue: "Coda di revisione"
+        review_queue_with_unread:
+          one: "Coda di revisione: %{count} elemento necessita di revisione"
+          other: "Coda di revisione: %{count} elementi necessitano di revisione"
+        other_notifications: "Altre notifiche"
+        other_notifications_with_unread:
+          one: "Altre notifiche: %{count} notifica non letta"
+          other: "Altre notifiche: %{count} notifiche non lette"
         profile: "Profilo"
       reviewable:
+        view_all: "visualizza tutti gli elementi da rivedere"
         queue: "Coda"
         deleted_user: "(utente cancellato)"
+        deleted_post: "(messaggio cancellato)"
         post_number_with_topic_title: "messaggio #%{post_number} - %{title}"
         new_post_in_topic: "nuovo messaggio in %{title}"
+        user_requires_approval: "%{username} richiede l'approvazione"
         default_item: "elemento da rivedere #%{reviewable_id}"
     topics:
       new_messages_marker: "ultima visita"
@@ -2673,8 +2716,8 @@ it:
         instructions: "Condividi un link a questo argomento:"
         copied: "Link all'argomento copiato."
         restricted_groups:
-          one: "Visibile solo ai membri del gruppo %{groupNames}"
-          other: "Visibile solo ai membri dei gruppi %{groupNames}"
+          one: "Visibile solo ai membri del gruppo: %{groupNames}"
+          other: "Visibile solo ai membri dei gruppi: %{groupNames}"
         invite_users: "Invita"
       print:
         title: "Stampa"
@@ -2871,7 +2914,7 @@ it:
         other: "Questo messaggio ha %{count} risposte. Clicca per espandere"
       expand_collapse: "espandi/comprimi"
       sr_below_embedded_posts_description: "risposte al messaggio n°%{post_number}"
-      sr_embedded_reply_description: "risposta da @%{username} al messaggio n°%{post_number}"
+      sr_embedded_reply_description: "risposta di @%{username} al messaggio n°%{post_number}"
       locked: "un membro dello Staff ha bloccato le modifiche a questo messaggio"
       gap:
         one: "visualizza %{count} risposta nascosta"
@@ -2895,6 +2938,9 @@ it:
       sr_post_like_count_button:
         one: "Questo messaggio è piaciuto a %{count} persona. Clicca per sapere chi è"
         other: "Questo messaggio è piaciuto a %{count} persone. Clicca per sapere chi sono"
+      sr_post_read_count_button:
+        one: "%{count} persona ha letto questo messaggio. Clicca per sapere chi è"
+        other: "%{count} persone hanno letto questo messaggio. Clicca per sapere chi sono"
       filtered_replies_hint:
         one: "Visualizza questo messaggio e la sua risposta"
         other: "Visualizza questo messaggio e le sue %{count} risposte"
@@ -2909,7 +2955,7 @@ it:
         upload: "Spiacenti, si è verificato un errore durante il caricamento del file. Prova di nuovo."
         file_too_large: "Spiacenti, ma questo file è troppo grande (la dimensione massima è %{max_size_kb}kb). Perché non lo carichi su un servizio di cloud sharing per poi incollarne qui il collegamento?"
         file_size_zero: "Spiacenti, sembra che qualcosa sia andato storto, il file che stai tentando di caricare è di 0 byte. Per favore riprova."
-        file_too_large_humanized: "Purtroppo questo file è troppo grande (la dimensione massima consentita è %{max_size}). Perché non carichi il file su un servizio di condivisione in cloud e poi incolli qui il collegamento?"
+        file_too_large_humanized: "Purtroppo questo file è troppo grande (la dimensione massima consentita è %{max_size}). Prova a caricare il file su un servizio di condivisione in cloud e poi copia qui il link."
         too_many_uploads: "Spiacenti, puoi caricare un solo file per volta."
         too_many_dragged_and_dropped_files:
           one: "Spiacenti, puoi caricare solo %{count} file alla volta."
@@ -2953,7 +2999,7 @@ it:
             other: "Sì, e tutte le %{count} risposte"
           just_the_post: "No, solo questo messaggio"
         admin: "azioni post-amministrazione"
-        permanently_delete: "Elimina Definitivamente"
+        permanently_delete: "Elimina definitivamente"
         permanently_delete_confirmation: "Sicuro di voler eliminare definitivamente questo messaggio? Non sarà possibile recuperarlo."
         wiki: "Rendi Wiki"
         unwiki: "Rimuovi Wiki"
@@ -3008,6 +3054,10 @@ it:
         confirm:
           one: "Vuoi davvero eliminare il messaggio?"
           other: "Vuoi davvero eliminare questi %{count} messaggi?"
+      merge:
+        confirm:
+          one: "Vuoi unire questi messaggi?"
+          other: "Vuoi unire questi %{count} messaggi?"
       revisions:
         controls:
           first: "Prima revisione"
@@ -3100,7 +3150,7 @@ it:
         description: "Richiedi che i nuovi argomenti abbiano etichette dai seguenti gruppi:"
         delete: "Cancella"
         add: "Aggiungi il gruppo di etichette richiesto"
-        placeholder: "seleziona il gruppo di etichette"
+        placeholder: "seleziona il gruppo di etichette..."
       topic_featured_link_allowed: "Consenti collegamenti in primo piano in questa categoria"
       delete: "Elimina Categoria"
       create: "Crea Categoria"
@@ -3113,6 +3163,7 @@ it:
       name: "Nome Categoria"
       description: "Descrizione"
       logo: "Immagine Categoria"
+      logo_dark: "Immagine del logo della categoria Modalità scura"
       background_image: "Immagine di sfondo della categoria"
       badge_colors: "Colori dei distintivi"
       background_color: "Colore di sfondo"
@@ -3313,7 +3364,7 @@ it:
     posts: "Messaggi"
     pending_posts:
       label: "In attesa"
-      label_with_count: "In sospeso (%{count})"
+      label_with_count: "In attesa (%{count})"
     posts_likes_MF: |
       Questo argomento ha {count, plural, one {# risposta} other {# risposte}} {ratio, select,
         low {con un'alta percentuale di 'mi piace' sulle risposte}
@@ -3379,7 +3430,7 @@ it:
       unseen:
         title: "Non visualizzati"
         lower_title: "non visualizzati"
-        help: "nuovi argomenti, e argomenti che stai osservando o seguendo contenenti messaggi non letti"
+        help: "nuovi argomenti e argomenti che stai osservando o seguendo contenenti messaggi non letti"
       new:
         lower_title_with_count:
           one: "%{count} nuovo"
@@ -3424,7 +3475,8 @@ it:
         this_week: "Settimana"
         today: "Oggi"
         other_periods: "vedi argomenti popolari:"
-    browser_update: 'Purtroppo, <a href="https://www.discourse.org/faq/#browser">il tuo browser non è supportato</a>. Per visualizzare i contenuti multimediali, <a href="https://browsehappy.com">passa a un browser supportato </a>, fai il login e rispondi.'
+    browser_update: 'Purtroppo, <a href="https://www.discourse.org/faq/#browser">il tuo browser non è supportato</a>. Per visualizzare i contenuti multimediali, <a href="https://browsehappy.com">passa a un browser supportato</a>, accedi e rispondi.'
+    safari_13_warning: Questo sito a breve non supporterà più iOS e Safari nelle versioni 13 e precedenti. Rimarrà disponibile una versione semplificata a sola lettura. (<a href="https://meta.discourse.org/t/224747">Altre informazioni</a>)
     permission_types:
       full: "Crea / Rispondi / Visualizza"
       create_post: "Rispondi / Visualizza"
@@ -3574,6 +3626,7 @@ it:
       google: "Google Calendar"
       ics: "ICS"
     tagging:
+      all_tags: "Tutte le etichette"
       other_tags: "Altre Etichette"
       selector_all_tags: "tutte le etichette"
       selector_no_tags: "nessuna etichetta"
@@ -3584,8 +3637,8 @@ it:
         one: "seleziona almeno %{count} etichetta..."
         other: "seleziona almeno %{count} etichette..."
       choose_for_topic_required_group:
-        one: "seleziona %{count} tag da '%{name}'..."
-        other: "seleziona %{count} tag da '%{name}'..."
+        one: "seleziona %{count} etichetta da '%{name}'..."
+        other: "seleziona %{count} etichette da '%{name}'..."
       info: "Info"
       default_info: "Questa etichetta non è limitata a nessuna categoria e non ha sinonimi."
       staff_info: "Per aggiungere restrizioni, metti questa etichetta in un <a href=%{basePath}/tag_groups>gruppo di etichette</a>"
@@ -3733,23 +3786,24 @@ it:
       unsupported_file_picked: "Hai scelto un file non supportato. Tipi di file supportati: %{types}."
     user_activity:
       no_activity_title: "Ancora nessuna attività"
-      no_activity_body: "Ti diamo il benvenuto nella nostra comunità! Sei nuovo/a e non hai ancora contribuito a nessuna discussione. Per cominciare, clicca su <a href='%{topUrl}'>Popolari</a> o <a href='%{categoriesUrl}'>Categorie</a> e inizia a leggere! Seleziona %{heartIcon} sui post che ti piacciono o che vuoi approfondire. A mano a mano che partecipi, le tue attività saranno elencate qui."
+      no_activity_body: "Ti diamo il benvenuto nella nostra comunità! Sei un nuovo utente e non hai ancora contribuito a nessuna discussione. Per cominciare, clicca su <a href='%{topUrl}'>Popolari</a> o <a href='%{categoriesUrl}'>Categorie</a> e inizia a leggere! Seleziona %{heartIcon} sui messaggi che ti piacciono o che vuoi approfondire. A mano a mano che partecipi, le tue attività saranno elencate qui."
       no_replies_title: "Non hai ancora risposto a nessun argomento"
       no_replies_title_others: "%{username} non ha ancora risposto a nessun argomento"
+      no_replies_body: "Quando <a href='%{searchUrl}'>trovi</a> una conversazione interessante a cui vorresti contribuire, premi il pulsante <kbd>Rispondi</kbd> posto subito sotto ogni messaggio per iniziare a rispondere a quel messaggio specifico. Oppure, se preferisci rispondere all'argomento generale piuttosto che a persone o messaggi singoli, cerca il pulsante <kbd>Rispondi</kbd> che si trova nella parte inferiore in chiusura dell'argomento o nella cronologia dell'argomento stesso."
       no_drafts_title: "Non hai iniziato nessuna bozza"
-      no_drafts_body: "Non sei ancora pronto/a a pubblicare? Salveremo automaticamente una nuova bozza e la elencheremo qui ogni volta che inizierai a scrivere un argomento, una risposta o un messaggio personale. Seleziona il pulsante Annulla per eliminare o salvare la bozza e continuare a scrivere più avanti."
+      no_drafts_body: "Non vuoi ancora pubblicare qualcosa? Salveremo automaticamente una nuova bozza e la elencheremo qui ogni volta che inizierai a scrivere un argomento, una risposta o un messaggio personale. Seleziona il pulsante Annulla per eliminare o salvare la bozza e continuare a scrivere più avanti."
       no_likes_title: "Non hai ancora messo \"mi piace\" a nessun argomento"
       no_likes_title_others: "%{username} non ha ancora messo Mi piace a nessun argomento"
-      no_likes_body: "Un ottimo modo per iniziare a contribuire è mettersi a leggere le conversazioni già avvenute e assegnare un %{heartIcon} ai post che ti piacciono!"
+      no_likes_body: "Un ottimo modo per iniziare a contribuire è mettersi a leggere le conversazioni già avvenute e assegnare un %{heartIcon} ai messaggi che ti piacciono!"
       no_topics_title: "Non hai ancora avviato nessun argomento"
-      no_topics_body: "È sempre meglio <a href='%{searchUrl}'>cercare</a> argomenti di conversazione già esistenti prima di iniziarne uno nuovo, ma se sei sicuro che l'argomento che desideri non sia già presente, procedi a creare un nuovo argomento tutto tuo. Cerca il pulsante <kbd>+ Nuovo Argomento</kbd> vicino all'elenco di argomenti, categorie o etichette per iniziare a creare un nuovo argomento in quell'area."
+      no_topics_body: "È sempre meglio <a href='%{searchUrl}'>cercare</a> argomenti di conversazione già esistenti prima di iniziarne uno nuovo, ma se pensi che l'argomento che desideri non sia già presente, procedi a crearne uno nuovo tutto tuo. Cerca il pulsante <kbd>+ Nuovo Argomento</kbd> in alto a destra dell'elenco di argomenti, categorie o etichette per iniziare a creare un nuovo argomento in quell'area."
       no_topics_title_others: "%{username} non ha ancora iniziato nessun argomento"
       no_read_topics_title: "Non hai ancora letto nessun argomento"
       no_read_topics_body: "Una volta che avrai iniziato a leggere discussioni, ne vedrai un elenco qui. Per cominciare a leggere, cerca argomenti di tuo interesse alle pagine <a href='%{topUrl}'>Popolari</a> o <a href='%{categoriesUrl}'>Categorie</a>; oppure effettua una ricerca per parola chiave %{searchIcon}"
     no_group_messages_title: "Nessun messaggio di gruppo trovato"
     topic_entrance:
-      sr_jump_top_button: "Vai al primo post"
-      sr_jump_bottom_button: "Vai all'ultimo post"
+      sr_jump_top_button: "Vai al primo messaggio"
+      sr_jump_bottom_button: "Vai all'ultimo messaggio"
     fullscreen_table:
       expand_btn: "Espandi Tabella"
     second_factor_auth:
@@ -3761,12 +3815,13 @@ it:
       new_count:
         one: "%{count} nuovo"
         other: "%{count} nuovi"
-      toggle_section: "inverti sezione"
+      toggle_section: "attiva/disattiva sezione"
       more: "Altro"
       all_categories: "Tutte le categorie"
+      all_tags: "Tutte le etichette"
       sections:
         about:
-          header_link_text: "Informazioni su"
+          header_link_text: "Informazioni"
         messages:
           header_link_text: "Messaggi"
           header_action_title: "crea un messaggio personale"
@@ -3774,9 +3829,9 @@ it:
             inbox: "Posta in arrivo"
             sent: "Inviati"
             new: "Nuovi"
-            new_with_count: "Nuovo (%{count})"
+            new_with_count: "Nuovi (%{count})"
             unread: "Non letti"
-            unread_with_count: "Non letto (%{count})"
+            unread_with_count: "Non letti (%{count})"
             archive: "Archiviati"
         tags:
           none: "Non hai aggiunto nessuna etichetta."
@@ -3789,13 +3844,13 @@ it:
           header_link_text: "Categorie"
           header_action_title: "modifica le categorie nella barra laterale"
         community:
-          header_link_text: "Comunità"
+          header_link_text: "Community"
           header_action_title: "crea un nuovo argomento"
           links:
             about:
-              content: "Informazioni su"
+              content: "Informazioni"
             admin:
-              content: "Amministrazione"
+              content: "Amministratore"
             badges:
               content: "Distintivi"
             everything:
@@ -3804,7 +3859,7 @@ it:
             faq:
               content: "FAQ"
             tracked:
-              content: "Seguite"
+              content: "Seguiti"
               title: "Tutti gli argomenti seguiti"
             groups:
               content: "Gruppi"
@@ -3959,6 +4014,7 @@ it:
               description: "Gli amministratori possono vedere tutti i gruppi."
             members_visibility_levels:
               title: "Chi può vedere i membri di questo gruppo?"
+              description: "Gli amministratori possono vedere i membri di tutti i gruppi. Flair è visibile a tutti gli utenti."
             publish_read_state: "Pubblica lo stato di lettura del gruppo nei messaggi di gruppo"
           membership:
             automatic: Automatico
@@ -4072,12 +4128,12 @@ it:
               receive_emails: Combina questo ambito con il destinatario della posta per elaborare le email in arrivo.
             badges:
               create: Crea un nuovo distintivo.
-              show: Informazioni su un distintivo.
+              show: Ottieni informazioni su un distintivo.
               update: Aggiorna un distintivo.
               delete: Cancella un distintivo.
               list_user_badges: Elenca i distintivi dell'utente.
-              assign_badge_to_user: Assegna un distintivo ad un utente.
-              revoke_badge_from_user: Revoca un distintivo ad un utente.
+              assign_badge_to_user: Assegna un distintivo a un utente.
+              revoke_badge_from_user: Revoca un distintivo a un utente.
             wordpress:
               publishing: Necessario per le funzionalità di pubblicazione del plug-in WP Discourse (richiesto).
               commenting: Necessario per le funzionalità di commento del plug-in WP Discourse.
@@ -4394,7 +4450,7 @@ it:
           install_git_repo: "Da un archivio git"
           install_create: "Crea nuovo"
           duplicate_remote_theme: "Il componente del tema «%{name}» è già installato, sei sicuro di volerne installare un'altra copia?"
-          force_install: "Il tema non può essere installato perché il repository Git è inaccessibile. Sei sicuro di voler continuare l'installazione?"
+          force_install: "Il tema non può essere installato perché l'archivio Git è inaccessibile. Vuoi continuare l'installazione?"
           create_placeholder: "Crea Segnaposto"
           about_theme: "Informazioni su"
           license: "Licenza"
@@ -4457,7 +4513,7 @@ it:
               Si consiglia di assegnare un prefisso ai nomi delle proprietà per evitare conflitti con i plugin e/o il kernel.
           head_tag:
             text: "Intestazione"
-            title: "L'HTML sarà inserito prima dell'etichetta di intestazione"
+            title: "HTML che sarà inserito prima dell'etichetta di intestazione"
           body_tag:
             text: "Corpo"
             title: "HTML che sarà inserito prima dell'etichetta del corpo"
@@ -4929,6 +4985,7 @@ it:
         suspended: "Sospeso?"
         staged: "Temporaneo?"
         show_admin_profile: "Amministratore"
+        manage_user: "Gestisci utente"
         show_public_profile: "Mostra Profilo Pubblico"
         impersonate: "Impersona utente"
         action_logs: "Log Azioni"
@@ -4981,9 +5038,9 @@ it:
           confirmation:
             title: "Elimina tutti i messaggi di @%{username}"
             description: |
-              <p>Vuoi davvero eliminare <b>%{post_count}</b> post di @%{username}?
+              <p>Vuoi davvero eliminare <b>%{post_count}</b> messaggi di @%{username}?
 
-              <p><b>Questa decisione non può essere annullata!</b></p>
+              <p><b>Questa operazione non può essere annullata!</b></p>
 
               <p>Per continuare, digita: <code>%{text}</code></p>
             text: "elimina messaggi di @%{username}"
@@ -5315,7 +5372,7 @@ it:
           grant_existing_holders: Assegna distintivi aggiuntivi ai titolari di distintivi già esistenti
       emoji:
         title: "Emoji"
-        help: "Aggiungi nuovi emoji che saranno disponibili per tutti. Trascina e rilascia più file alla volta senza inserire un nome per creare emoji usando i nomi dei file. Il gruppo selezionato verrà utilizzato per tutti i file aggiunti. Puoi anche fare clic su \"Aggiungi nuovo emoji\" per aprire il selettore di file."
+        help: "Aggiungi nuove emoji che saranno disponibili per tutti. Trascina più file alla volta senza inserire un nome per creare emoji usando i nomi dei loro file. Il gruppo selezionato verrà utilizzato per tutti i file aggiunti. Puoi anche fare clic su \"Aggiungi nuova emoji\" per aprire il selettore di file."
         add: "Aggiungi Nuovo Emoji"
         choose_files: "Scegli file"
         uploading: "In caricamento..."
@@ -5327,7 +5384,7 @@ it:
       embedding:
         get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungendo il nome dell'host."
         confirm_delete: "Sicuro di voler cancellare questo host?"
-        sample: "Incolla il seguente codice HTML nel tuo sito per creare e incorporare argomenti Discourse. Sostituire <b>REPLACE_ME</b> con l'URL canonico della pagina su cui si sta incorporando."
+        sample: "Incolla il seguente codice HTML nel tuo sito per creare e incorporare argomenti Discourse. Sostituire <b>REPLACE_ME</b> con l'URL canonico della pagina su cui stai eseguendo l'operazione."
         title: "Integrato"
         host: "Host Abilitati"
         class_name: "Nome Classe"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 1c09e691dc..267849169c 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -80,6 +80,10 @@ ja:
           other: "%{count} ヶ月"
         about_x_years:
           other: "約%{count} 年"
+        over_x_years:
+          other: "%{count} 年以上"
+        almost_x_years:
+          other: "ほぼ %{count} 年"
         date_year: "'YY 年 MMM D 日"
       medium_with_ago:
         x_minutes:
@@ -106,6 +110,7 @@ ja:
       to_placeholder: "日付"
     share:
       topic_html: 'トピック: <span class="topic-title">%{topicTitle}</span>'
+      post: "%{username} の投稿 #%{postNumber}"
       close: "閉じる"
       twitter: "Twitter で共有"
       facebook: "Facebook で共有"
@@ -113,6 +118,7 @@ ja:
       url: "URL をコピーして共有"
     action_codes:
       public_topic: "トピックを公開しました: %{when}"
+      open_topic: "これをトピックに変換しました: %{when}"
       private_topic: "このトピックを個人メッセージにしました: %{when}"
       split_topic: "このトピックを分割しました: %{when}"
       invited_user: "%{who} を招待しました: %{when}"
@@ -146,6 +152,7 @@ ja:
     topic_admin_menu: "トピックの操作"
     skip_to_main_content: "メインコンテンツにスキップ"
     emails_are_disabled: "メールの送信は管理者によって無効化されています。メール通知は一切送信されません。"
+    emails_are_disabled_non_staff: "スタッフ以外のユーザーの送信メールは無効になっています。"
     software_update_prompt:
       message: "このサイトを更新したので、<span>再読み込みしてください</span>。再読み込みしない場合、予期しない動作が発生する可能性があります。"
       dismiss: "閉じる"
@@ -153,8 +160,13 @@ ja:
       other: "新しいサイトを簡単に立ち上げられるように、ブートストラップモードになっています。すべての新規ユーザーの信頼レベルは 1 となり、要約メールを毎日受け取るように設定されています。この設定は %{count} 名のユーザーが参加すると自動的に無効になります。"
     bootstrap_mode_disabled: "ブートストラップモードは 24 時間以内に無効になります。"
     bootstrap_invite_button_title: "招待を送信"
+    bootstrap_wizard_link_title: "セットアップウィザードを終了"
     themes:
       default_description: "デフォルト"
+      broken_theme_alert: "テーマ/コンポーネントにエラーがあるため、サイトが動作しない可能性があります。"
+      error_caused_by: "原因は '%{name}' です。<a target='blank' href='%{path}'>ここをクリック</a>して、更新、再構成、または無効にしてください。"
+      only_admins: "（このメッセージはサイト管理者にのみ表示されます）"
+    broken_decorator_alert: "サイトのいずれかの投稿コンテンツデコレータでエラーが発生したため、投稿が正しく表示されない可能性があります。"
     s3:
       regions:
         ap_northeast_1: "アジア・太平洋 (東京)"
@@ -265,11 +277,13 @@ ja:
         unbookmark_with_reminder: "クリックしてこのトピック内のすべてのブックマークとリマインダーを削除します。"
     bookmarks:
       created: "この投稿をブックマークしました。%{name}"
+      created_generic: "これをブックマークしました。%{name}"
       create: "ブックマークを作成"
       edit: "ブックマークを編集"
       not_bookmarked: "この投稿をブックマークする"
       remove_reminder_keep_bookmark: "リマインダーを削除してブックマークを保持"
       created_with_reminder: "%{date} のリマインダー付きでこの投稿をブックマークしました。%{name}"
+      created_with_reminder_generic: "%{date} のリマインダー付きでこれをブックマークしました。%{name}"
       remove: "ブックマークを削除"
       delete: "ブックマークを削除"
       confirm_delete: "このブックマークを削除してもよろしいですか？リマインダーも削除されます。"
@@ -280,7 +294,11 @@ ja:
       list_permission_denied: "このユーザーのブックマークを表示する権限がありません。"
       no_user_bookmarks: "ブックマークした投稿はありません。ブックマークを使用すると、特定の投稿を素早く参照できます。"
       auto_delete_preference:
+        label: "通知を受けた後"
+        never: "ブックマークを保持する"
         when_reminder_sent: "ブックマークを削除"
+        on_owner_reply: "返信したら、ブックマークを削除する"
+        clear_reminder: "ブックマークを保持してリマインダーをクリアする"
       search_placeholder: "名前、トピックタイトル、または投稿コンテンツでブックマークを検索する"
       search: "検索"
       reminders:
@@ -290,6 +308,8 @@ ja:
         existing_reminder: "このブックマークに %{at_date_time} に送信されるリマインダーが設定されています"
     copy_codeblock:
       copied: "コピーしました！"
+      copy: "コードをクリップボードにコピー"
+      fullscreen: "コードを全画面で表示"
     drafts:
       label: "下書き"
       label_with_count: "下書き（%{count}）"
@@ -321,6 +341,7 @@ ja:
     saved: "保存しました！"
     upload: "アップロード"
     uploading: "アップロード中..."
+    processing: "処理中..."
     uploading_filename: "アップロード中: %{filename}…"
     processing_filename: "処理中: %{filename}..."
     clipboard: "クリップボード"
@@ -335,6 +356,7 @@ ja:
     switch_to_anon: "匿名モードを開始"
     switch_from_anon: "匿名モードを終了"
     banner:
+      close: "このバナーを閉じる"
       edit: "編集"
     pwa:
       install_banner: "<a href>このデバイスに %{title} をインストール</a>しますか？"
@@ -518,7 +540,10 @@ ja:
       relative: "相対"
     time_shortcut:
       now: "今"
+      in_one_hour: "1 時間以内"
+      in_two_hours: "2 時間以内"
       later_today: "今日の後程"
+      two_days: "2 日"
       next_business_day: "翌営業日"
       tomorrow: "明日"
       post_local_date: "投稿の日付"
@@ -582,6 +607,8 @@ ja:
         reset_to_default: "デフォルトにリセット"
       group:
         all: "すべてのグループ"
+      sort:
+        label: "%{criteria} で並べ替え"
     group_histories:
       actions:
         change_group_setting: "グループの設定を変更"
@@ -659,6 +686,7 @@ ja:
             title: "設定"
             allow_unknown_sender_topic_replies: "不明な送信者によるトピックの返信を許可します。"
             allow_unknown_sender_topic_replies_hint: "不明な送信者がグループトピックに返信できるようにします。これが有効になっていない場合、トピックに招待されていないメールアドレスからの返信があった場合は、新しいトピックを作成します。"
+            from_alias: "送信者のエイリアス"
           mailboxes:
             synchronized: "同期メールボックス"
             none_found: "このメールアカウントにはメールボックスが見つかりませんでした。"
@@ -1175,8 +1203,6 @@ ja:
         edit: "編集"
         edit_title: "認証アプリの編集"
         edit_description: "認証アプリ名"
-        enable_security_key_description: |
-          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">ハードウェアセキュリティキー</a>を準備したら、下の [登録] ボタンを押します。
         totp:
           title: "トークンベースの認証アプリ"
           add: "認証アプリを追加"
@@ -1184,14 +1210,10 @@ ja:
           name_and_code_required_error: "認証アプリから名前とコードを入力する必要があります。"
         security_key:
           register: "登録"
-          title: "セキュリティキー"
-          add: "セキュリティキーを追加"
           default_name: "メインセキュリティキー"
           not_allowed_error: "セキュリティキーの登録プロセスがタイムアウトしたかキャンセルされました。"
           already_added_error: "このセキュリティキーはすでに登録されています。再度登録する必要はありません。"
-          edit: "セキュリティキーを編集"
           save: "保存"
-          edit_description: "セキュリティキー名"
           name_required_error: "セキュリティキーの名前を入力する必要があります。"
       change_about:
         title: "自己紹介を変更"
@@ -1681,7 +1703,6 @@ ja:
       second_factor_backup_title: "二要素バックアップ"
       second_factor_backup_description: "バックアップコードの 1 つを入力してください。"
       second_factor: "認証アプリを使用してログインする"
-      security_key_description: "物理的なセキュリティキーの準備ができたら、[セキュリティキーで認証] ボタンを押します。"
       security_key_alternative: "別の方法を試してください"
       security_key_authenticate: "セキュリティキーで認証"
       security_key_not_allowed_error: "セキュリティキーの認証プロセスがタイムアウトしたかキャンセルされました。"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 5b49c86f0f..22d92b102f 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -1013,6 +1013,8 @@ ko:
       enable_defer: "주제를 읽지 않은 상태로 표시하도록 연기 활성화"
       experimental_sidebar:
         options: "옵션"
+        navigation_section: "내비게이션"
+        list_destination_default: "기본"
       change: "변경"
       featured_topic: "추천 주제"
       moderator: "%{user} 님은 운영자입니다"
@@ -1175,8 +1177,6 @@ ko:
         edit: "편집"
         edit_title: "인증 편집"
         edit_description: "인증 이름"
-        enable_security_key_description: |
-          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">하드웨어 보안 키</a>가 준비되었다면 아래의 등록 버튼을 누르세요.
         totp:
           title: "토큰 기반 인증"
           add: "인증 추가"
@@ -1184,14 +1184,12 @@ ko:
           name_and_code_required_error: "인증 앱의 이름과 코드를 제공해야 합니다."
         security_key:
           register: "등록"
-          title: "보안 키"
-          add: "보안 키 추가"
           default_name: "기본 보안 키"
+          iphone_default_name: "아이폰"
+          android_default_name: "안드로이드"
           not_allowed_error: "보안 키 등록 프로세스가 시간 초과되었거나 취소되었습니다."
           already_added_error: "이 보안 키는 이미 등록되어 있으므로 다시 등록하지 않아도 됩니다."
-          edit: "보안 키 편집"
           save: "저장"
-          edit_description: "보안 키 이름"
           name_required_error: "보안 키의 이름을 제공해야 합니다."
       change_about:
         title: "내 정보 변경"
@@ -1680,7 +1678,6 @@ ko:
       second_factor_backup_title: "2단계 백업"
       second_factor_backup_description: "백업 코드 중 하나를 입력하세요."
       second_factor: "인증 앱으로 로그인"
-      security_key_description: "실제 보안 키가 준비되면 보안 키와 함께 아래의 인증 버튼을 누르세요."
       security_key_alternative: "다른 방법으로 시도"
       security_key_authenticate: "보안 키로 인증"
       security_key_not_allowed_error: "보안 키 인증 프로세스가 시간 초과되었거나 취소되었습니다."
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 1ec923cca9..0d11e45743 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -1056,6 +1056,8 @@ lt:
       enable_defer: "Įgalinti atidėjimą, kad pažymėtumėte temas kaip neskaitytas"
       experimental_sidebar:
         options: "Nustatymai"
+        navigation_section: "Navigacija"
+        list_destination_default: "Numatytasis"
       change: "pakeisti"
       featured_topic: "Įpatinga tema"
       moderator: "%{user} yra moderatorius"
@@ -1219,14 +1221,12 @@ lt:
           name_and_code_required_error: "Turite nurodyti vardą ir kodą iš savo autentifikavimo programos."
         security_key:
           register: "Registruokis"
-          title: "Saugos raktai"
-          add: "Pridėti saugos raktą"
           default_name: "Pagrindinis saugos raktas"
+          iphone_default_name: "iPhone"
+          android_default_name: "„Android“"
           not_allowed_error: "Saugos rakto registravimo procesas baigėsi arba buvo atšauktas."
           already_added_error: "Jūs jau užregistravote šį saugos raktą. Jums nereikia jo užregistruoti dar kartą."
-          edit: "Redaguoti saugos raktą"
           save: "Saugoti"
-          edit_description: "Saugos rakto pavadinimas"
           name_required_error: "Turite nurodyti saugos rakto pavadinimą."
       change_about:
         title: "Keisti Apie Mane"
@@ -1695,7 +1695,6 @@ lt:
       second_factor_backup_title: "Dviejų veiksnių atsarginė kopija"
       second_factor_backup_description: "Įveskite vieną iš atsarginių kodų:"
       second_factor: "Prisijunkite naudodami autentifikavimo programą"
-      security_key_description: "Kai paruošite fizinį saugos raktą, paspauskite žemiau esantį mygtuką Autentifikuoti naudojant saugos raktą."
       security_key_alternative: "Išbandykite kitą būdą"
       security_key_authenticate: "Autentifikuoti su saugos raktu"
       security_key_not_allowed_error: "Saugos rakto registravimo procesas baigėsi arba buvo atšauktas."
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index a40ea0daa3..0dc115fc7e 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -978,6 +978,8 @@ lv:
       enable_defer: "Iespējot atlikšanu, lai atzīmētu tēmas kā nelasītas"
       experimental_sidebar:
         options: "Iespējas"
+        navigation_section: "Pārvietošanās"
+        list_destination_default: "Noklusējums"
       change: "mainīt"
       featured_topic: "Piedāvātā tēma"
       moderator: "%{user} ir moderators"
@@ -1139,8 +1141,6 @@ lv:
         edit: "Labot"
         edit_title: "Rediģēt autentifikatoru"
         edit_description: "Autentifikatora nosaukums"
-        enable_security_key_description: |
-          Kad esat <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">aparatūras drošības atslēgu</a> , nospiediet zemāk esošo pogu Reģistrēties.
         totp:
           title: "Token balstīti autentifikatori"
           add: "Pievienot autentifikatoru"
@@ -1148,14 +1148,10 @@ lv:
           name_and_code_required_error: "Jums ir jānorāda vārds un kods no autentifikatora lietotnes."
         security_key:
           register: "Reģistrēties"
-          title: "Drošības atslēgas"
-          add: "Pievienojiet drošības atslēgu"
           default_name: "Galvenā drošības atslēga"
           not_allowed_error: "Drošības atslēgas reģistrācijas procesam iestājās noildze vai tas tika atcelts."
           already_added_error: "Jūs jau esat reģistrējis šo drošības atslēgu. Jums tā nav jāreģistrē vēlreiz."
-          edit: "Rediģēt drošības atslēgu"
           save: "Saglabāt"
-          edit_description: "Drošības atslēgas nosaukums"
           name_required_error: "Jums ir jānorāda drošības atslēgas nosaukums."
       change_about:
         title: "Mainīt aprakstu par mani"
@@ -1600,7 +1596,6 @@ lv:
       second_factor_backup_title: "Divu faktoru dublēšana"
       second_factor_backup_description: "Lūdzu, ievadiet vienu no saviem rezerves kodiem:"
       second_factor: "Piesakieties, izmantojot lietotni Autentifikators"
-      security_key_description: "Kad esat sagatavojis savu fiziskās drošības atslēgu, nospiediet tālāk esošo pogu Autentificēt ar drošības atslēgu."
       security_key_alternative: "Izmēģiniet citu veidu"
       security_key_authenticate: "Autentificēties, izmantojot drošības atslēgu"
       security_key_not_allowed_error: "Drošības atslēgas autentifikācijas procesam iestājās noildze vai tas tika atcelts."
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 526524b912..48f41071ef 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -1029,6 +1029,8 @@ nb_NO:
       enable_defer: "Aktiver utsettelse for å merke emner ulest"
       experimental_sidebar:
         options: "Alternativer"
+        navigation_section: "Navigasjon"
+        list_destination_default: "Forvalg"
       change: "Endre"
       featured_topic: "Utvalgte emne"
       moderator: "%{user} er en moderator"
@@ -1189,8 +1191,6 @@ nb_NO:
         edit: "Rediger"
         edit_title: "Rediger autentisering"
         edit_description: "Autentiserings navn"
-        enable_security_key_description: |
-          Når du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">maskinvaresikkerhetsnøkkel</a> klargjort, trykk på Registrer knappen nedenfor.
         totp:
           title: "Token-baserte autentiseringer"
           add: "Legg til autentisering"
@@ -1198,14 +1198,10 @@ nb_NO:
           name_and_code_required_error: "Du må angi et navn og koden fra din autentiseringsapp."
         security_key:
           register: "Registrer"
-          title: "Sikkerhetsnøkler"
-          add: "Legg til sikkerhetsnøkkel"
           default_name: "Hoved sikkerhetsnøkkel"
           not_allowed_error: "Sikkerhetsnøkkelens prosess ble enten tidsavbrutt eller kansellert."
           already_added_error: "Du har allerede registrert denne sikkerhetsnøkkelen. Du trenger ikke å registrere den igjen."
-          edit: "Rediger sikkerhetsnøkkel"
           save: "Lagre"
-          edit_description: "Navn på sikkerhetsnøkkel"
           name_required_error: "Du må angi et navn for sikkerhetsnøkkelen."
       change_about:
         title: "Rediger om meg"
@@ -1693,7 +1689,6 @@ nb_NO:
       second_factor_backup_title: "To-faktor sikkerhetskopiering"
       second_factor_backup_description: "Vennligst skriv en av reservekodene dine:"
       second_factor: "Logg inn med Authenticator-app"
-      security_key_description: "Når du har din fysiske sikkerhetsnøkkel klargjort trykk på autentiseringen med sikkerhetsnøkkelknappen nedenfor."
       security_key_alternative: "Prøv en annen måte"
       security_key_authenticate: "Autentiser med sikkerhetsnøkkel"
       security_key_not_allowed_error: "Autentiseringsprosessen for sikkerhetsnøkkelen ble enten tidsavbrutt eller kansellert."
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 38457846d0..ed8f3d7c3e 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -1033,6 +1033,8 @@ nl:
       enable_defer: "Negeren voor markeren van topics als ongelezen inschakelen"
       experimental_sidebar:
         options: "Opties"
+        navigation_section: "Navigatie"
+        list_destination_default: "Standaard"
       change: "wijzigen"
       featured_topic: "Aanbevolen topic"
       moderator: "%{user} is een moderator"
@@ -1198,8 +1200,6 @@ nl:
         edit: "Bewerken"
         edit_title: "Authenticator bewerken"
         edit_description: "Naam van authenticator"
-        enable_security_key_description: |
-          Druk wanneer u uw <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardwarebeveiligingssleutel</a> gereed hebt op de onderstaande knop Registreren.
         totp:
           title: "Op tokens gebaseerde authenticators"
           add: "Authenticator toevoegen"
@@ -1207,14 +1207,12 @@ nl:
           name_and_code_required_error: "U moet een naam en de code van uw authenticator-app opgeven."
         security_key:
           register: "Registreren"
-          title: "Beveiligingssleutels"
-          add: "Beveiligingssleutel toevoegen"
           default_name: "Hoofdbeveiligingssleutel"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Het registratieproces van de beveiligingssleutel had een time-out of is geannuleerd."
           already_added_error: "U hebt deze beveiligingssleutel al geregistreerd. U hoeft deze niet opnieuw te registreren."
-          edit: "Beveiligingssleutel bewerken"
           save: "Opslaan"
-          edit_description: "Naam van beveiligingssleutel"
           name_required_error: "U moet een naam voor uw beveiligingssleutel opgeven."
       change_about:
         title: "Over mij wijzigen"
@@ -1702,7 +1700,6 @@ nl:
       second_factor_backup_title: "Tweefactor-back-up"
       second_factor_backup_description: "Voer één van uw back-upcodes in:"
       second_factor: "Aanmelden met authenticator-app"
-      security_key_description: "Houd uw fysieke beveiligingssleutel gereed en klik op de onderstaande knop Authenticeren met beveiligingssleutel."
       security_key_alternative: "Andere manier proberen"
       security_key_authenticate: "Authenticeren met beveiligingssleutel"
       security_key_not_allowed_error: "Het authenticatieproces van de beveiligingssleutel had een time-out of is geannuleerd."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index a791733e56..8f0e5a3c4a 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -1207,12 +1207,13 @@ pl_PL:
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       experimental_sidebar:
-        enable: "Włącz eksperymentalny pasek boczny"
         options: "Opcje"
         categories_section: "Sekcja kategorii"
         categories_section_instruction: "Wybrane kategorie będą wyświetlane w sekcji kategorii paska bocznego."
         tags_section: "Sekcja tagów"
         tags_section_instruction: "Wybrane tagi będą wyświetlane w sekcji tagów paska bocznego."
+        navigation_section: "Nawigacja"
+        list_destination_default: "Domyślny"
       change: "zmień"
       featured_topic: "Wyróżniony temat"
       moderator: "%{user} jest moderatorem"
@@ -1390,8 +1391,6 @@ pl_PL:
         edit: "Edytuj"
         edit_title: "Edytuj Authenticator"
         edit_description: "Nazwa Authenticator"
-        enable_security_key_description: |
-          Po przygotowaniu <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">sprzętowego klucza bezpieczeństwa</a> naciśnij przycisk Zarejestruj poniżej.
         totp:
           title: "Uwierzytelnianie oparte na tokenach"
           add: "Dodaj Authenticator"
@@ -1399,14 +1398,12 @@ pl_PL:
           name_and_code_required_error: "Musisz podać nazwę i kod z aplikacji uwierzytelniającej."
         security_key:
           register: "Zarejestruj"
-          title: "Klucze bezpieczeństwa"
-          add: "Dodaj klucz bezpieczeństwa"
           default_name: "Główny klucz bezpieczeństwa"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Upłynął limit czasu procesu rejestracji klucza bezpieczeństwa lub został on anulowany."
           already_added_error: "Ten klucz bezpieczeństwa został już zarejestrowany. Nie musisz go ponownie rejestrować."
-          edit: "Edytuj Klucz Bezpieczeństwa"
           save: "Zapisz"
-          edit_description: "Nazwa klucza bezpieczeństwa"
           name_required_error: "Musisz podać nazwę swojego klucza bezpieczeństwa."
       change_about:
         title: "Zmień O mnie"
@@ -1941,7 +1938,6 @@ pl_PL:
       second_factor_backup_title: "Kod zapasowy weryfikacji dwuskładnikowej"
       second_factor_backup_description: "Proszę wprowadź jeden ze swoich zapasowych kodów:"
       second_factor: "Zaloguj się przy użyciu aplikacji Authenticator"
-      security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Uwierzytelnij za pomocą klucza bezpieczeństwa poniżej."
       security_key_alternative: "Spróbuj w inny sposób"
       security_key_authenticate: "Uwierzytelnij się za pomocą klucza bezpieczeństwa"
       security_key_not_allowed_error: "Upłynął limit czasu procesu uwierzytelniania klucza bezpieczeństwa lub został on anulowany."
@@ -4158,7 +4154,6 @@ pl_PL:
               title: "sprawdź"
     welcome_topic_banner:
       title: "Stwórz swój temat powitalny"
-      description: 'Twój temat powitalny jest pierwszą rzeczą, którą przeczytają nowicjusze. Postaraj się w jednym akapicie wyrazić najważniejsze informacje, jakie chcesz przekazać nowym użytkownikom forum.'
       button_title: "Rozpocznij edycję"
     until: "Aż do:"
   admin_js:
@@ -5564,6 +5559,7 @@ pl_PL:
           search: "Wyszukaj"
           groups: "Grupy"
           dashboard: "Panel"
+          sidebar: "Pasek boczny"
         secret_list:
           invalid_input: "Pola tekstowe nie mogą być puste ani zawierać znaku pionowej kreski."
         default_categories:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index e13dfb637a..6374339d30 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -1048,6 +1048,8 @@ pt:
       enable_defer: "Ativar adiamento para marcar tópicos não lidos"
       experimental_sidebar:
         options: "Opções"
+        navigation_section: "Navegação"
+        list_destination_default: "Predefinição"
       change: "alterar"
       featured_topic: "Tópico em Destaque"
       moderator: "%{user} é um moderador"
@@ -1215,8 +1217,6 @@ pt:
         edit: "Editar"
         edit_title: "Editar Autenticador"
         edit_description: "Nome do Autenticador"
-        enable_security_key_description: |
-          Quando tiver a sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança de hardware</a> preparada, pressione o botão abaixo de Registar.
         totp:
           title: "Autenticadores Baseados em Tokens"
           add: "Adicionar Autenticador"
@@ -1224,14 +1224,10 @@ pt:
           name_and_code_required_error: "Tem de fornecer um nome e o código da sua aplicação de autenticação."
         security_key:
           register: "Registar"
-          title: "Chaves de Segurança"
-          add: "Adicionar Chave de Segurança"
           default_name: "Chave de Segurança Principal"
           not_allowed_error: "O processo de registo da chave de segurança atingiu o tempo limite ou foi cancelado."
           already_added_error: "Já registou esta chave de segurança. Não precisa de a registar novamente."
-          edit: "Editar Chave de Segurança"
           save: "Guardar"
-          edit_description: "Nome da Chave de Segurança"
           name_required_error: "Tem de fornecer um nome para a sua chave de segurança."
       change_about:
         title: "Modificar Sobre Mim"
@@ -1707,7 +1703,6 @@ pt:
       second_factor_backup_title: "Backup de Dois Fatores"
       second_factor_backup_description: "Por favor introduza um dos seus códigos de reserva:"
       second_factor: "Efetue login usando o aplicativo Authenticator"
-      security_key_description: "Quando você tiver sua chave de segurança física preparada, pressione o botão Autenticar com Chave de Segurança abaixo."
       security_key_alternative: "Tente de outra forma"
       security_key_authenticate: "Autenticar com Chave de Segurança"
       security_key_not_allowed_error: "O processo de autenticação da chave de segurança atingiu o tempo limite ou foi cancelado."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index b2c0fb3d14..90aa8d319f 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -1094,7 +1094,6 @@ pt_BR:
       enable_quoting: "Ativar resposta citando o texto destacado"
       enable_defer: "Ativar adiamento para marcar tópicos como não lidos"
       experimental_sidebar:
-        enable: "Ativar barra lateral experimental"
         options: "Opções"
         categories_section: "Seção de Categorias"
         categories_section_instruction: "As categorias selecionadas serão exibidas na seção de categorias do painel lateral."
@@ -1270,8 +1269,6 @@ pt_BR:
         edit: "Editar"
         edit_title: "Editar autenticador"
         edit_description: "Nome do autenticador"
-        enable_security_key_description: |
-          Quando sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança física</a> estiver preparada, pressione o botão Registrar abaixo.
         totp:
           title: "Autenticadores baseados em token"
           add: "Adicionar autenticador"
@@ -1279,14 +1276,10 @@ pt_BR:
           name_and_code_required_error: "Você deve informar um nome e o código do seu aplicativo autenticador."
         security_key:
           register: "Registrar"
-          title: "Chaves de segurança"
-          add: "Adicionar chave de segurança"
           default_name: "Chave de segurança principal"
           not_allowed_error: "O processo de registro da chave de segurança atingiu o tempo limite ou foi cancelado."
           already_added_error: "Você já registrou esta chave de segurança.\nVocê não precisa registrá-la novamente."
-          edit: "Editar chave de segurança"
           save: "Salvar"
-          edit_description: "Nome da chave de segurança"
           name_required_error: "Você deve informar um nome para sua chave de segurança."
       change_about:
         title: "Alterar Sobre mim"
@@ -1797,7 +1790,6 @@ pt_BR:
       second_factor_backup_title: "Backup de dois fatores"
       second_factor_backup_description: "Insira um dos seus códigos de backup:"
       second_factor: "Fazer login usando um aplicativo de autenticação"
-      security_key_description: "Quando você tiver sua chave física de segurança preparada, pressione o botão Autenticar com chave de segurança abaixo."
       security_key_alternative: "Tentar de outra maneira"
       security_key_authenticate: "Autenticar com chave de segurança"
       security_key_not_allowed_error: "O processo de autenticação com chave de segurança atingiu o limite de tempo ou foi cancelado."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 217274f00c..c9ff527dfc 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1016,6 +1016,8 @@ ro:
       enable_defer: "Activează afișarea subiectelor necitite"
       experimental_sidebar:
         options: "Opțiuni"
+        navigation_section: "Navigare"
+        list_destination_default: "Implicit"
       change: "Schimbă"
       featured_topic: "Subiect recomandat"
       moderator: "%{user} este moderator"
@@ -1144,11 +1146,8 @@ ro:
         edit: "Editează"
         security_key:
           register: "Înregistrare"
-          title: "Chei de securitate"
-          add: "Adaugă cheie de securitate"
           default_name: "Cheie de securitate principală"
           save: "Salvează"
-          edit_description: "Nume cheie de securitate"
           name_required_error: "Trebuie să oferi un nume pentru cheia de securitate."
       change_about:
         title: "Schimbare date personale"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index b9125af0bf..4af0e1aabf 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -760,6 +760,8 @@ ru:
         reset_to_default: "Сбросить на значения по умолчанию"
       group:
         all: "Все группы"
+      sort:
+        label: "Сортировать по %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Настроить группу"
@@ -1183,6 +1185,9 @@ ru:
       no_notifications_title: "У вас пока нет уведомлений"
       no_notifications_body: >
         На этой странице будут отображаться уведомления о любой активности на форуме, имеющей прямое отношение к вам, включая: ответы на ваши темы и сообщения, <b>@упоминание</b> или цитирование вас в сообщениях, ответы на темы, которые вы отслеживаете. Уведомления будут отправляться на вашу электронную почту, если вы какое-то время не входили в систему. <br><br> Используйте иконку %{icon}, чтобы решить, о каких темах, категориях и тегах вы хотите получать уведомления. Дополнительные параметры доступны в <a href='%{preferencesUrl}'>настройках пользователя</a>.
+      no_other_notifications_title: "У вас пока нет других уведомлений"
+      no_other_notifications_body: >
+        На этой панели вы будете уведомлены о других видах активности, которые могут иметь отношение к вам, например, когда кто-то ссылается на одно из ваших сообщений или редактирует их.
       no_notifications_page_title: "У вас пока нет уведомлений"
       no_notifications_page_body: >
         Вы будете получать уведомления о любой активности на форуме, имеющей отношение к вам, включая: ответы на темы, которые вы отслеживаете, <b>@упоминания</b> вас в сообщениях или ответы на ваши сообщения. Уведомления также будут отправляться на вашу электронную почту, если вы какое-то время не входили в систему. <br><br> Используйте иконку %{icon}, чтобы решить, за какими темами, категориями и тегами вы хотите наблюдать или следить, а какие наоборот - оставить без уведомлений. Дополнительные параметры уведомлений доступны в <a href='%{preferencesUrl}'>настройках пользователя</a>.
@@ -1192,7 +1197,7 @@ ru:
         description: "Не выдавать награды и не показывать советы новым пользователям"
         not_first_time: "Не в первый раз?"
         skip_link: "Пропустить эти советы"
-        read_later: "Прочитаю позже."
+        read_later: "Прочитаю позже"
       theme_default_on_all_devices: "Сделать эту тему темой по умолчанию на всех моих устройствах"
       color_scheme_default_on_all_devices: "Установить цветовую схему по умолчанию на всех моих устройствах"
       color_scheme: "Цветовая схема"
@@ -1212,12 +1217,16 @@ ru:
       enable_quoting: "Разрешить отвечать с цитированием выделенного текста"
       enable_defer: "Включить кнопку 'Отложить', чтобы помечать темы как непрочитанные"
       experimental_sidebar:
-        enable: "Включить экспериментальную боковую панель"
+        enable: "Включить боковую панель"
         options: "Настройки"
         categories_section: "Разделы"
         categories_section_instruction: "Выбранные разделы будут отображаться в соответствующей секции боковой панели."
         tags_section: "Теги"
         tags_section_instruction: "Выбранные теги будут отображаться в соответствующей секции боковой панели."
+        navigation_section: "Навигация"
+        list_destination_instruction: "При нажатии на ссылку списка тем на боковой панели с новыми или непрочитанными темами открывать"
+        list_destination_default: "Домашнюю страницу"
+        list_destination_unread_new: "Новые/Непрочитанные темы"
       change: "изменить"
       featured_topic: "Избранная тема:"
       moderator: "%{user} — модератор"
@@ -1397,7 +1406,7 @@ ru:
         edit_title: "Изменить аутентификатор"
         edit_description: "Имя аутентификатора"
         enable_security_key_description: |
-          Когда вы подготовите свой <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">физический ключ безопасности</a>, нажмите на кнопку "Регистрация", расположенную  ниже.
+          Когда у вас будет подготовлен <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">аппаратный ключ защиты</a> или совместимое мобильное устройство, нажмите кнопку 'Зарегистрироваться'.
         totp:
           title: "Токен-аутентификация"
           add: "Добавить аутентификатор"
@@ -1405,14 +1414,16 @@ ru:
           name_and_code_required_error: "Вы должны указать имя и код из вашего приложения-аутентификатора."
         security_key:
           register: "Зарегистрироваться"
-          title: "Ключи безопасности"
-          add: "Добавить ключ безопасности"
+          title: "Физические ключи безопасности"
+          add: "Добавить физический ключ безопасности"
           default_name: "Главный ключ безопасности"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Время регистрации ключа безопасности истекло или регистрация была отменена."
           already_added_error: "Вы уже зарегистрировали этот ключ безопасности. Вам не нужно регистрировать его снова."
-          edit: "Изменить ключ безопасности"
+          edit: "Изменить физический ключ безопасности"
           save: "Сохранить"
-          edit_description: "Имя ключа безопасности"
+          edit_description: "Имя ключа физической безопасности"
           name_required_error: "Вы должны указать имя ключа безопасности"
       change_about:
         title: "Изменить информацию обо мне"
@@ -1784,6 +1795,9 @@ ru:
         title: "Флаер"
         none: "(нет)"
         instructions: "Иконка, появляющаяся в правой нижней части изображения вашего профиля"
+      status:
+        title: "Пользовательский статус"
+        not_set: "Не установлен"
       primary_group:
         title: "Основная группа"
         none: "(нет)"
@@ -1799,6 +1813,15 @@ ru:
       set_custom_status: "Поменять статус"
       what_are_you_doing: "Что вы сейчас делаете?"
       remove_status: "Удалить статус"
+    popup:
+      primary: "Понятно!"
+      secondary: "Не показывать советы"
+      first_notification:
+        title: "Ваше первое уведомление!"
+        content: "Уведомления используются для того, чтобы держать вас в курсе происходящего в сообществе."
+      topic_timeline:
+        title: "Шкала времени"
+        content: "Вы можете быстро прокрутить сообщение, используя шкалу времени."
     loading: "Загрузка..."
     errors:
       prev_page: "при попытке загрузки"
@@ -1951,7 +1974,7 @@ ru:
       second_factor_backup_title: "Вход с использованием резервного кода"
       second_factor_backup_description: "Введите один из ваших резервных кодов:"
       second_factor: "Войти с помощью программы аутентификации"
-      security_key_description: "Когда вы подготовите свой физический ключ безопасности, нажмите на кнопку 'Аутентификация при помощи ключа безопасности'."
+      security_key_description: "Подготовив физический ключ безопасности или совместимое мобильное устройство, нажмите на кнопку 'Аутентификация при помощи ключа безопасности'."
       security_key_alternative: "Попробуйте другой способ"
       security_key_authenticate: "Аутентификация при помощи ключа безопасности"
       security_key_not_allowed_error: "Время проверки подлинности ключа безопасности истекло или проверка была отменена."
@@ -3192,6 +3215,7 @@ ru:
         few: "Просмотреть %{count} скрытых ответа"
         many: "Просмотреть %{count} скрытых ответов"
         other: "Просмотреть %{count} скрытых ответов"
+      sr_reply_to: "Ответить на сообщение #%{post_number} от пользователя @%{username}"
       notice:
         new_user: "Это первая публикация %{user} — поприветствуем его в нашем сообществе!"
         returning_user: "Пользователь %{user} давно не появлялся — его последнее сообщение было %{time}."
@@ -4205,11 +4229,13 @@ ru:
           click_to_get_started: "Нажмите здесь, чтобы начать."
           header_link_text: "Теги"
           header_action_title: "Редактировать теги боковой панели"
+          configure_defaults: "Настроить значения по умолчанию"
         categories:
           none: "Вы не добавили ни одного раздела."
           click_to_get_started: "Нажмите здесь, чтобы начать."
           header_link_text: "Разделы"
           header_action_title: "Редактировать разделы боковой панели"
+          configure_defaults: "Настроить значения по умолчанию"
         community:
           header_link_text: "Сообщество"
           header_action_title: "Cоздать новую тему"
@@ -4248,7 +4274,7 @@ ru:
               pending_count: "В ожидании: %{count}"
     welcome_topic_banner:
       title: "Создать приветственную тему"
-      description: 'Ваша приветственная тема — это первое, что прочитают новички. Постарайтесь одним абзацем выразить наиболее важную информацию, которую вы хотите донести до новых пользователей форума.'
+      description: 'Ваша приветственная тема — это первое, что прочитают новички. Постарайтесь максимально коротко и ярко выразить в ней наиболее важную информацию, которую вы хотите донести до новых пользователей форума.'
       button_title: "Начать редактирование"
     until: "До:"
   admin_js:
@@ -4854,6 +4880,7 @@ ru:
           has_overwritten_history: "Текущая версия темы больше не существует, поскольку история Git-репозитория была принудительно перезаписана."
           add: "Добавить"
           theme_settings: "Настройки темы"
+          overriden_settings_explanation: "Переопределенные настройки отмечены точкой и выделены цветом. Чтобы сбросить эти настройки до значения по умолчанию, нажмите кнопку сброса рядом с ними."
           no_settings: "Эта тема не имеет настроек."
           theme_translations: "Перевод темы"
           empty: "Нет компонентов"
@@ -5654,6 +5681,7 @@ ru:
           search: "Поиск"
           groups: "Группы"
           dashboard: "Админка"
+          sidebar: "Боковая панель"
         secret_list:
           invalid_input: "Поля ввода не могут быть пустыми или содержать символ вертикальной черты."
         default_categories:
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 7e4bde9be6..3c44dae813 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -731,6 +731,8 @@ sk:
       enable_quoting: "Umožniť odpoveď s citáciou z označeného textu"
       experimental_sidebar:
         options: "Možnosti"
+        navigation_section: "Navigácia"
+        list_destination_default: "Predvolené"
       change: "zmeniť"
       moderator: "%{user} je moderátor"
       admin: "%{user} je administrátor"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index e3ca1e5e1f..d619528a9b 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -1021,6 +1021,8 @@ sl:
       enable_defer: "Omogoči preloži za označiti teme kot neprebrane"
       experimental_sidebar:
         options: "Možnosti"
+        navigation_section: "Navigacija"
+        list_destination_default: "Privzeto"
       change: "spremeni"
       featured_topic: "Izpostavljena tema"
       moderator: "%{user} je moderator"
@@ -1185,14 +1187,12 @@ sl:
           name_and_code_required_error: "Navesti morate ime in kodo iz aplikacije za preverjanje pristnosti."
         security_key:
           register: "Registracija"
-          title: "Varnostni ključi"
-          add: "Dodajte varnostni ključ"
           default_name: "Glavni varnostni ključ"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Postopek registracije varnostnega ključa je potekel ali pa je bil preklican."
           already_added_error: "Ta varnostni ključ ste že registrirali. Ni ga treba ponovno registrirati."
-          edit: "Uredi varnostni ključ"
           save: "Shrani"
-          edit_description: "Ime varnostnega ključa"
           name_required_error: "Navesti morate ime varnostnega ključa."
       change_about:
         title: "Spremeni O meni"
@@ -1660,7 +1660,6 @@ sl:
       second_factor_backup_title: "Rezervna potrditvena koda"
       second_factor_backup_description: "Vnesite eno od rezervnih potrditvenih kod:"
       second_factor: "Prijavite se z aplikacijo Authenticator"
-      security_key_description: "Ko imate pripravljen fizični varnostni ključ, pritisnite spodnji gumb Preveri pristnost z varnostnim ključem."
       security_key_alternative: "Poskusite na drug način"
       security_key_authenticate: "Preverite z varnostnim ključem"
       security_key_not_allowed_error: "Postopek preverjanja z varnostnim ključem je potekel ali pa je bil preklican."
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 3fadb847a4..d091a7f54c 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -553,6 +553,8 @@ sq:
       enable_quoting: "Aktivizo citimin në përgjigje për tekstin e përzgjedhur"
       experimental_sidebar:
         options: "Opsione"
+        navigation_section: "Shfletimi"
+        list_destination_default: "Paracaktuar"
       change: "ndrysho"
       moderator: "%{user} është moderator"
       admin: "%{user} është admin"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 8496a9f0f5..9eecb8f87c 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -696,6 +696,8 @@ sr:
       enable_quoting: "Omogući citirani odgovor označenog teksta"
       experimental_sidebar:
         options: "Opcije"
+        navigation_section: "Navigacija"
+        list_destination_default: "zadato"
       change: "promeni"
       moderator: "%{user} je moderator"
       admin: "%{user} je administrator"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index f041ac3500..2a43c7abb6 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -658,6 +658,8 @@ sv:
         reset_to_default: "Återställ till standard"
       group:
         all: "alla grupper"
+      sort:
+        label: "Sortera efter %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Ändra gruppinställningar"
@@ -970,7 +972,7 @@ sv:
     user_fields:
       none: "(välj ett alternativ)"
       required: 'Ange ett värde för "%{name}"'
-      same_as_password: 'Ditt lösenord ska inte upprepas i andra fält.'
+      same_as_password: 'Upprepa inte ditt lösenord i andra fält.'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -1069,6 +1071,9 @@ sv:
       no_notifications_title: "Du har inga aviseringar än"
       no_notifications_body: >
         Du kommer att aviseras i denna panel om aktivitet som är direkt relevant för dig, bland annat svar på dina ämnen och inlägg, när någon <b>@nämner</b> dig eller citerar dig och svarar på ämnen som du bevakar. Aviseringar kommer också att skickas till din e-postadress när du inte har loggat in på ett tag. <br><br> Leta efter %{icon} för att bestämma vilka specifika ämnen, kategorier och taggar som du vill aviseras om. Se mer i dina <a href='%{preferencesUrl}'>aviseringsinställningar</a>.
+      no_other_notifications_title: "Du har inga andra aviseringar än"
+      no_other_notifications_body: >
+        Du får aviseringar i den här panelen om andra typer av aktiviteter som kan vara relevanta för dig – till exempel när någon länkar till eller redigerar ett av dina inlägg.
       no_notifications_page_title: "Du har inga aviseringar än"
       no_notifications_page_body: >
         Du kommer att aviseras om aktivitet som är direkt relevant för dig, bland annat svar på dina ämnen och inlägg, när någon <b>@nämner</b> dig eller citerar dig och svarar på ämnen du tittar på. Aviseringar kommer också att skickas som e-post när du inte har loggat in på ett tag. <br><br> Leta efter %{icon} för att bestämma vilka specifika ämnen, kategorier och taggar du vill aviseras om. Se mer i dina <a href='%{preferencesUrl}'>aviseringsinställningar</a>.
@@ -1098,12 +1103,13 @@ sv:
       enable_quoting: "Aktivera citatsvar för markerad text"
       enable_defer: "Aktivera fördröjning för att markera ämnen som lästa"
       experimental_sidebar:
-        enable: "Aktivera experimentellt sidofält"
         options: "Alternativ"
         categories_section: "Sektion Kategorier"
         categories_section_instruction: "Valda kategorier kommer att visas under sidofältets kategorisektion."
         tags_section: "Sektion Taggar"
         tags_section_instruction: "Valda taggar kommer att visas under sidofältets tagg-sektion."
+        navigation_section: "Navigering"
+        list_destination_default: "Standard"
       change: "ändra"
       featured_topic: "Utvalt ämne"
       moderator: "%{user} är en moderator"
@@ -1274,8 +1280,6 @@ sv:
         edit: "Redigera"
         edit_title: "Redigera autentisering"
         edit_description: "Autentiseringsnamn"
-        enable_security_key_description: |
-          När du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">säkerhetsnyckel för hårdvara</a> till hands, tryck på registrera-knappen nedan.
         totp:
           title: "Bevisbaserad autentisering"
           add: "Lägg till autentisering"
@@ -1283,14 +1287,12 @@ sv:
           name_and_code_required_error: "Du måste ange ett namn samt koden från din app för autentisering."
         security_key:
           register: "Registrera"
-          title: "Säkerhetsnycklar"
-          add: "Lägg till säkerhetsnyckel"
           default_name: "Huvudsäkerhetsnyckel"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Registreringsprocessen för säkerhetsnyckel dröjde antingen för länge eller avbröts."
           already_added_error: "Du har redan registrerat denna säkerhetsnyckel.\nDu behöver inte registrera den igen."
-          edit: "Ändra säkerhetsnyckel"
           save: "Spara"
-          edit_description: "Namn på säkerhetsnyckel"
           name_required_error: "Du måste ge din säkerhetsnyckel ett namn."
       change_about:
         title: "Ändra Om mig"
@@ -1642,6 +1644,9 @@ sv:
         title: "Stil"
         none: "(ingen)"
         instructions: "ikon som visas bredvid din profilbild"
+      status:
+        title: "Anpassad status"
+        not_set: "Inte inställd"
       primary_group:
         title: "Primär grupp"
         none: "(ingen)"
@@ -1657,6 +1662,15 @@ sv:
       set_custom_status: "Ställ in anpassad status"
       what_are_you_doing: "Vad gör du?"
       remove_status: "Ta bort status"
+    popup:
+      primary: "Jag förstår!"
+      secondary: "visa mig inte dessa tips"
+      first_notification:
+        title: "Din första avisering!"
+        content: "Aviseringar används för att hålla dig uppdaterad med vad som händer i samhället."
+      topic_timeline:
+        title: "Ämnestidslinje"
+        content: "Bläddra snabbt genom ett inlägg med hjälp av ämnestidslinjen."
     loading: "Laddar..."
     errors:
       prev_page: "medan vi försökte ladda"
@@ -1805,7 +1819,6 @@ sv:
       second_factor_backup_title: "Tvåfaktorsreserv"
       second_factor_backup_description: "Ange en av dina reservkoder:"
       second_factor: "Logga in via autentiseringsappen"
-      security_key_description: "När du har din fysiska säkerhetsnyckel till hands, tryck på knappen Autentisera med säkerhetsnyckel här nedtill."
       security_key_alternative: "Prova ett annat sätt"
       security_key_authenticate: "Autentisera med säkerhetsnyckel"
       security_key_not_allowed_error: "Processen för autentiseringssäkerhetsnyckel dröjde antingen för länge eller avbröts."
@@ -3481,7 +3494,7 @@ sv:
         today: "Idag"
         other_periods: "se toppen för:"
     browser_update: 'Tyvärr stöds inte <a href="https://www.discourse.org/faq/#browser">din webbläsare</a>. Vänligen <a href="https://browsehappy.com">byt till en webbläsare som stöds</a> för att se innehåll, logga in och svara.'
-    safari_13_warning: Den här webbplatsens stöd för iOS och Safari i version 13 och äldre avlägsnas inom kort. En förenklad skrivskyddad version kommer att förbli tillgänglig. (<a href="https://meta.discourse.org/t/224747">mer information</a>)
+    safari_13_warning: Webbplatsen har fullt stöd för redigering av innehåll med webbläsare på iOS 12.5 och 13 till januari 2023. Därefter krävs iOS 14 eller senare. Äldre versioner av iOS kan då endast läsa förenklat innehåll. (<a href="https://meta.discourse.org/t/224747">mer information</a>)
     permission_types:
       full: "Skapa / svara / se"
       create_post: "Svara / se"
@@ -3884,7 +3897,7 @@ sv:
               pending_count: "%{count} väntande"
     welcome_topic_banner:
       title: "Skapa ditt välkomstämne"
-      description: 'Ditt välkomstämne är det första som nykomlingar läser. Tänk på det som din "snabbpresentation" eller "målbeskrivning" i ett enda stycke.'
+      description: 'Ditt välkomstämne är det första som nya medlemmar kommer att läsa. Tänk på det som din "snabbpresentation" eller "målbeskrivning". Låt alla veta vem den här gruppen är till för, vad de kan förvänta sig att hitta här och vad du vill att de ska göra först.'
       button_title: "Börja redigera"
     until: "T.o.m.:"
   admin_js:
@@ -4480,6 +4493,7 @@ sv:
           has_overwritten_history: "Nuvarande temaversion finns inte längre eftersom Git-historiken har skrivits över av en tvingad push."
           add: "Lägg till"
           theme_settings: "Inställningar för tema"
+          overriden_settings_explanation: "Ersatta inställningar markeras med en färgad punkt. Tryck på återställningsknappen för att återställa till standardvärden."
           no_settings: "Detta tema har inga inställningar."
           theme_translations: "Översättningar för tema"
           empty: "Inga objekt"
@@ -5276,6 +5290,7 @@ sv:
           search: "Sök"
           groups: "Grupper"
           dashboard: "Översiktspanel"
+          sidebar: "Sidofält"
         secret_list:
           invalid_input: "Inmatningsfältet kan inte vara tomt eller innehålla vertikalstreck."
         default_categories:
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 9652e7fa03..05ad3bd505 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -644,6 +644,8 @@ sw:
       enable_quoting: "Ruhusu jibu nukulu kwenye neno lenye angaza"
       experimental_sidebar:
         options: "Chaguo"
+        navigation_section: "Abiri"
+        list_destination_default: "Halisi"
       change: "badilisha"
       moderator: "%{mtumiaji} ni msimamizi"
       admin: "%{mtumiaji} ni kiongozi"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 53686a055e..2221a9dd15 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -414,6 +414,8 @@ te:
       enable_quoting: "హైలైట్ అయిన పాఠ్యానికి కోట్ జవాబు చేతనం చేయి"
       experimental_sidebar:
         options: "ఎంపికలు"
+        navigation_section: "నావిగేషను"
+        list_destination_default: "అప్రమేయ"
       change: "మార్చు"
       moderator: "%{user} ఒక నిర్వాహకుడు"
       admin: "%{user} ఒక అధికారి"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 8650943eeb..dfa311e31b 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -781,6 +781,8 @@ th:
       enable_quoting: "เปิดการตอบกลับการอ้างอิงโดยไฮไลท์ข้อความ"
       experimental_sidebar:
         options: "ตัวเลือก"
+        navigation_section: "การนำทาง"
+        list_destination_default: "ค่าเริ่มต้น"
       change: "เปลี่ยนแปลง"
       featured_topic: "กระทู้เด่น"
       moderator: "%{user} เป็นผู้ดูแลระบบ"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 6221c41b9f..6a71b2fc89 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -642,6 +642,8 @@ tr_TR:
         reset_to_default: "Varsayılana sıfırla"
       group:
         all: "tüm gruplar"
+      sort:
+        label: "%{criteria} kriterine göre sırala"
     group_histories:
       actions:
         change_group_setting: "Grup ayarlarını değiştir"
@@ -1049,6 +1051,9 @@ tr_TR:
       no_notifications_title: "Henüz herhangi bir bildiriminiz yok"
       no_notifications_body: >
         Konu ve iletilerinize verilen yanıtlar da dahil olmak üzere, doğrudan sizle alâkalı etkinlik olduğunda, birisi <b>@adınızı</b> belirttiğinde veya sizi alıntıladığında bu panelde bildirilecektir. Bir süredir giriş yapmadığınızda da bildirimler e-posta olarak gönderilecektir. <br><br> Hangi konular, kategoriler ve etiketler hakkında bilgilendirilmek istediğinize karar vermek için %{icon} simgesine bakın. Daha fazlası için <a href='%{preferencesUrl}'>bildirim tercihlerinize bakın</a>.
+      no_other_notifications_title: "Henüz başka bildiriminiz yok"
+      no_other_notifications_body: >
+        Bu panelde, sizinle ilgili olabilecek diğer etkinlik türleri hakkında bilgilendirileceksiniz - örneğin, biri gönderilerinizden birine bağlantı verdiğinde veya bunları düzenlediğinde.
       no_notifications_page_title: "Henüz herhangi bir bildiriminiz yok"
       no_notifications_page_body: >
         Konu ve iletilerinize verilen yanıtlar da dahil olmak üzere, doğrudan sizle ilgili etkinlik olduğunda, biri size <b>@mention</b> attığında veya sizi alıntıladığında bu panelde bildirilecektir. Bir süredir giriş yapmadığınızda da bildirimler e-posta olarak gönderilecektir. <br><br> Hangi konular, kategoriler ve etiketler hakkında bilgilendirilmek istediğinize karar vermek için %{icon} ikonuna bakın. Daha fazlası için <a href='%{preferencesUrl}'>bildirim tercihlerinize bakın</a>.
@@ -1078,8 +1083,12 @@ tr_TR:
       enable_quoting: "Bahsedilen konu için yanıtlama özelliğini etkinleştir"
       enable_defer: "Okunmamış konuları işaretlemek için ertelemeyi aktif edin"
       experimental_sidebar:
-        enable: "Deneysel kenar çubuğunu etkinleştir"
+        enable: "Kenar çubuğunu etkinleştir"
         options: "Seçenekler"
+        navigation_section: "Navigasyon"
+        list_destination_instruction: "Kenar çubuğunda yeni veya okunmamış konuların bulunduğu bir konu listesi bağlantısını tıkladığımda beni şuraya götür:"
+        list_destination_default: "Varsayılan"
+        list_destination_unread_new: "Yeni/Okunmamış"
       change: "değiştir"
       featured_topic: "Öne Çıkan Konu"
       moderator: "%{user} moderatördür"
@@ -1248,8 +1257,6 @@ tr_TR:
         edit: "Düzenle"
         edit_title: "Kimlik Doğrulayıcıyı Düzenle"
         edit_description: "Kimlik Doğrulayıcı Adı"
-        enable_security_key_description: |
-          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">donanım güvenlik anahtarınızı</a> hazırlattığınızda, aşağıdaki Kayıt düğmesine basın.
         totp:
           title: "Token Tabanlı Doğrulayıcılar"
           add: "Kimlik Doğrulayıcı Ekle"
@@ -1257,14 +1264,12 @@ tr_TR:
           name_and_code_required_error: "Kimlik doğrulayıcı uygulamanızdan bir ad ve kod girmeniz gerekir."
         security_key:
           register: "Kayıt Ol"
-          title: "Güvenlik Sözcükleri"
-          add: "Güvenlik Anahtarı Ekleyin"
           default_name: "Ana Güvenlik Anahtarı"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Güvenlik anahtarı kayıt işlemi zaman aşımına uğradı veya iptal edildi."
           already_added_error: "Bu güvenlik anahtarını daha önce kaydettiğiniz için yeniden kaydetmeniz gerekmez."
-          edit: "Güvenlik Anahtarını Düzenle"
           save: "Kaydet"
-          edit_description: "Güvenlik Anahtarı Adı"
           name_required_error: "Güvenlik anahtarınız için bir ad girmeniz gerekir."
       change_about:
         title: "\"Hakkımda\"yı Değiştir"
@@ -1610,6 +1615,9 @@ tr_TR:
         title: "Yetenek"
         none: "(hiçbiri)"
         instructions: "profil resminizin yanında görüntülenen simge"
+      status:
+        title: "Özel Durum"
+        not_set: "Ayarlanmamış"
       primary_group:
         title: "Ana Grup"
         none: "(hiçbiri)"
@@ -1625,6 +1633,15 @@ tr_TR:
       set_custom_status: "Özel bir durum ayarla"
       what_are_you_doing: "Ne yapıyorsun?"
       remove_status: "Durumu kaldır"
+    popup:
+      primary: "Anladım!"
+      secondary: "bana bu ipuçlarını gösterme"
+      first_notification:
+        title: "İlk bildiriminiz!"
+        content: "Bildirimler, sizi toplulukta olup bitenlerden haberdar etmek için kullanılır."
+      topic_timeline:
+        title: "Konu zaman çizelgesi"
+        content: "Konu zaman çizelgesini kullanarak bir gönderide hızla gezinin."
     loading: "Yükleniyor..."
     errors:
       prev_page: "şu adresi yüklemeye çalışırken:"
@@ -1770,7 +1787,6 @@ tr_TR:
       second_factor_backup_title: "İki Faktörlü Yedekleme"
       second_factor_backup_description: "Lütfen yedek kodlarından birini gir:"
       second_factor: "Authenticator uygulamasını kullanarak giriş yapın"
-      security_key_description: "Fiziksel güvenlik anahtarınızı hazırladığınızda, aşağıdaki Güvenlik Anahtarıyla Kimlik Doğrula düğmesine basın."
       security_key_alternative: "Başka bir yol dene"
       security_key_authenticate: "Güvenlik Anahtarı ile Kimlik Doğrulama"
       security_key_not_allowed_error: "Güvenlik anahtarı kimlik doğrulama işlemi zaman aşımına uğradı veya iptal edildi."
@@ -2838,6 +2854,7 @@ tr_TR:
       gap:
         one: "gizlenen %{count} yorumu gör"
         other: "gizlenen %{count} yorumu gör"
+      sr_reply_to: "@%{username} tarafından oluşturualn #%{post_number} numaralı gönderiye yanıt verin"
       notice:
         new_user: "%{user} ilk kez gönderi oluşturdu - haydi ona topluluğumuza hoşgeldin diyelim"
         returning_user: "%{user} kullanıcısını son göreli bayağı oldu — son gönderisi %{time} önce yapılmış."
@@ -3736,8 +3753,10 @@ tr_TR:
             archive: "Arşiv"
         tags:
           header_link_text: "Etiketler"
+          configure_defaults: "Varsayılanları ayarla"
         categories:
           header_link_text: "Kategoriler"
+          configure_defaults: "Varsayılanları ayarla"
         community:
           header_link_text: "Topluluk"
           header_action_title: "yeni konu oluştur"
@@ -3773,7 +3792,7 @@ tr_TR:
               title: "gözden geçirmeler"
     welcome_topic_banner:
       title: "Hoş Geldiniz konulu gönderinizi oluşturun"
-      description: 'Hoş geldiniz konulu gönderiniz, yeni katılanların okuyacağı ilk şeydir. Bunu bir paragraf “kısa bir sunum” veya “misyon anlatımınız” olarak düşünün'
+      description: 'Hoş geldiniz başlığınız yeni üyelerin okuyacağı ilk şeydir. Bunu "asansör konuşmanız" veya "misyon beyanınız" olarak düşünün. Onlara bu topluluğun kimler için olduğunu, burada neler bulabileceklerini ve ilk olarak ne yapmalarını istediğinizi söyleyin.'
       button_title: "Düzenlemeye Başla"
     until: "Şuna kadar:"
   admin_js:
@@ -5147,6 +5166,7 @@ tr_TR:
           search: "Arama"
           groups: "Gruplar"
           dashboard: "Gösterge Paneli"
+          sidebar: "Kenar çubuğu"
         secret_list:
           invalid_input: "Giriş alanları boş olamaz veya özel karakter içeremez."
         default_categories:
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index cd14086556..3606bbfbb2 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -1211,12 +1211,13 @@ uk:
       enable_quoting: "Увімкнути відповіді на цитати для виділеного тексту"
       enable_defer: "Увімкнути відкладання позначення тем непрочитаними"
       experimental_sidebar:
-        enable: "Увімкнути експериментальну бічну панель"
         options: "Налаштування"
         categories_section: "Розділ категорій"
         categories_section_instruction: "Вибрані категорії будуть відображатися у списку категорій бічної панелі."
         tags_section: "Розділ Теги"
         tags_section_instruction: "Вибрані теги відображатимуться в розділі тегів бічної панелі."
+        navigation_section: "Навігація"
+        list_destination_default: "За замовчуванням"
       change: "змінити"
       featured_topic: "Закріплені теми"
       moderator: "%{user} є модератором"
@@ -1395,8 +1396,6 @@ uk:
         edit: "Редагувати"
         edit_title: "Редагувати автентифікатор"
         edit_description: "Назва автентифікатора"
-        enable_security_key_description: |
-          Якщо у вас підготовлено <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">фізичний ключ безпеки</a> , натисніть кнопку "Зареєструвати" нижче.
         totp:
           title: "Автентифікатори на токенах"
           add: "Додати автентифікатор"
@@ -1404,14 +1403,12 @@ uk:
           name_and_code_required_error: "Ви повинні вказати ім'я та код з програми авторизації."
         security_key:
           register: "Зареєструватися"
-          title: "Ключі безпеки"
-          add: "Додати ключ безпеки"
           default_name: "Головний Ключ Безпеки"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Час реєстрації ключа безпеки минув, або він був скасований."
           already_added_error: "Ви вже зареєстрували цей ключ безпеки. Вам не потрібно реєструвати його знову."
-          edit: "Змінити Ключ Безпеки"
           save: "Зберегти"
-          edit_description: "Назва Ключа Безпеки"
           name_required_error: "Ви повинні вказати ім'я для вашого ключа безпеки."
       change_about:
         title: "Змінити інформацію про мене"
@@ -1947,7 +1944,6 @@ uk:
       second_factor_backup_title: "Двофакторний резервний код"
       second_factor_backup_description: "Введіть запасний код:"
       second_factor: "Увійти за допомогою програми аутентифікації"
-      security_key_description: "Коли ви підготуєте свій фізичний ключ безпеки, натисніть кнопку Аутентификация з ключем безпеки нижче."
       security_key_alternative: "Спробуйте інший спосіб"
       security_key_authenticate: "Аутентифікація з Ключем Безпеки."
       security_key_not_allowed_error: "Час перевірки автентичності ключа безпеки минув або було скасовано."
@@ -4236,7 +4232,6 @@ uk:
               title: "переглянути"
     welcome_topic_banner:
       title: "Створіть тему привітання"
-      description: 'Ваша привітальна тема – це перше, що прочитають новачки. Думайте про це як про «початкову презентацію» або «заяву про місію» з одного абзацу.'
       button_title: "Почати редагування"
     until: "До:"
   admin_js:
@@ -5650,6 +5645,7 @@ uk:
           search: "Пошук"
           groups: "Групи"
           dashboard: "Майстерня"
+          sidebar: "Бічна панель"
         secret_list:
           invalid_input: "поля введення не можуть бути порожніми, або містити символ вертикальної риски."
         default_categories:
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index da0d237c2c..91b490f1f2 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -1070,6 +1070,8 @@ ur:
       enable_defer: "ٹاپکس کو بغیر پڑھا نشان زد کرنے کیلئے ملتوی فعال کریں"
       experimental_sidebar:
         options: "اختیارات"
+        navigation_section: "نیویگیشن"
+        list_destination_default: "ڈِیفالٹ"
       change: "بدلیں"
       featured_topic: "نمایاں موضوع"
       moderator: "%{user} ایک ماڈریٹر ہے"
@@ -1237,8 +1239,6 @@ ur:
         edit: "ترمیم"
         edit_title: "تصدیق کنندہ میں ترمیم کریں"
         edit_description: "تصدیق کنندہ کا نام"
-        enable_security_key_description: |
-          جب آپ کے پاس اپنی <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">ہارڈ ویئر سیکیورٹی کی</a> تیار ہے تو نیچے رجسٹر بٹن دبائیں۔
         totp:
           title: "ٹوکن کی بنیاد پر تصديق کنندہ"
           add: "تصدیق کنندہ شامل کریں"
@@ -1246,14 +1246,12 @@ ur:
           name_and_code_required_error: "آپ کو اپنی تصدیق کنندہ ایپ سے ایک نام اور کوڈ فراہم کرنا ہوگا۔"
         security_key:
           register: "رجسٹر"
-          title: "سیکیورٹی کیز"
-          add: "سیکیورٹی کیز شامل کریں"
           default_name: "بنیادی سیکیورٹی کیز"
+          iphone_default_name: "آئی فون"
+          android_default_name: "اینڈرائیڈ"
           not_allowed_error: "سیکیورٹی کیز رجسٹریشن کا عمل یا تو ختم ہو گیا تھا یا منسوخ کردیا گیا تھا۔"
           already_added_error: "آپ نے پہلے ہی یہ سسیکیورٹی کیز رجسٹر کرلی ہے۔ آپ کو اسے دوبارہ رجسٹر کرنے کی ضرورت نہیں ہے۔"
-          edit: "سیکیورٹی کیز میں ترمیم کریں"
           save: "محفوظ کریں"
-          edit_description: "سیکیورٹی کی کا نام"
           name_required_error: "آپ کو اپنی سیکیورٹی کی کا نام دینا ضروری ہے۔"
       change_about:
         title: "\"میرے بارے میں\" تبدیل کریں"
@@ -1747,7 +1745,6 @@ ur:
       second_factor_backup_title: "دو عنصری بیک اپ"
       second_factor_backup_description: "براہ مہربانی اپنے بیک اپ کوڈز میں سے ایک درج کریں:"
       second_factor: "تصدیق کنندہ ایپ کا استعمال کرکے لاگ ان کریں"
-      security_key_description: "جب آپ کے پاس آپ کی سکیورٹی کی تیار ہوجائے تو نیچے سکیورٹی کی کے ساتھ تصدیق کریں کا بٹن دبائیں۔"
       security_key_alternative: "دوسرا راستہ آزمائیں"
       security_key_authenticate: "سیکیورٹی کی کے ساتھ تصدیق کریں"
       security_key_not_allowed_error: "سیکیورٹی کی, کی تصدیق کا عمل یا تو ختم ہو گیا تھا یا منسوخ کردیا گیا تھا۔"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index e070aecc05..709fee31f5 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -1035,12 +1035,13 @@ vi:
       enable_quoting: "Bật chế độ làm nổi bật chữ trong đoạn trích dẫn trả lời"
       enable_defer: "Cho phép trì hoãn để đánh dấu các chủ đề chưa đọc"
       experimental_sidebar:
-        enable: "Bật thanh bên thử nghiệm"
         options: "Lựa chọn"
         categories_section: "Phần danh mục"
         categories_section_instruction: "Các danh mục đã chọn sẽ được hiển thị trong phần danh mục của Thanh bên."
         tags_section: "Phần thẻ"
         tags_section_instruction: "Các thẻ đã chọn sẽ được hiển thị trong phần thẻ của Thanh bên."
+        navigation_section: "Điều hướng"
+        list_destination_default: "Mặc định"
       change: "thay đổi"
       featured_topic: "Chủ đề nổi bật"
       moderator: "%{user} trong ban quản trị"
@@ -1207,8 +1208,6 @@ vi:
         edit: "Sửa"
         edit_title: "Chỉnh sửa Authenticator"
         edit_description: "Tên người xác thực"
-        enable_security_key_description: |
-          Khi bạn đã có bạn <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">phần cứng chủ chốt an ninh</a> chuẩn bị, nhấn nút Đăng ký dưới đây.
         totp:
           title: "Trình xác thực dựa trên mã thông báo"
           add: "Thêm Authenticator"
@@ -1216,14 +1215,10 @@ vi:
           name_and_code_required_error: "Bạn phải cung cấp tên và mã từ ứng dụng xác thực của mình."
         security_key:
           register: "Đăng ký"
-          title: "Khóa bảo mật"
-          add: "Thêm khóa bảo mật"
           default_name: "Khóa bảo mật chính"
           not_allowed_error: "Quá trình đăng ký khóa bảo mật đã hết thời gian chờ hoặc đã bị hủy."
           already_added_error: "Bạn đã đăng ký khóa bảo mật này. Bạn không cần phải đăng ký lại."
-          edit: "Chỉnh sửa khóa bảo mật"
           save: "Lưu"
-          edit_description: "Tên khóa bảo mật"
           name_required_error: "Bạn phải cung cấp tên cho khóa bảo mật của mình."
       change_about:
         title: "Thay đổi thông tin về tôi"
@@ -1721,7 +1716,6 @@ vi:
       second_factor_backup_title: "Sao lưu hai yếu tố"
       second_factor_backup_description: "Vui lòng nhập một trong các mã dự phòng của bạn:"
       second_factor: "Đăng nhập bằng ứng dụng Authenticator"
-      security_key_description: "Khi bạn đã chuẩn bị khóa bảo mật vật lý, hãy nhấn nút Xác thực bằng Khóa bảo mật bên dưới."
       security_key_alternative: "Thử lại cách khác"
       security_key_authenticate: "Xác thực bằng Khóa bảo mật"
       security_key_not_allowed_error: "Quá trình xác thực khóa bảo mật đã hết thời gian chờ hoặc đã bị hủy."
@@ -4977,6 +4971,7 @@ vi:
           search: "Tìm kiếm"
           groups: "Nhóm"
           dashboard: "Bảng điều khiển"
+          sidebar: "Thanh bên"
         secret_list:
           invalid_input: "Các trường nhập không được để trống hoặc chứa ký tự thanh dọc."
         default_categories:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 642e36f4bf..f7e63f3688 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -107,10 +107,10 @@ zh_CN:
       next_month: "下个月"
       placeholder: 日期
       from_placeholder: "起始日期"
-      to_placeholder: "截至日期"
+      to_placeholder: "截止日期"
     share:
       topic_html: '话题：<span class="topic-title">%{topicTitle}</span>'
-      post: "%{username} 发布帖子 %{postNumber}"
+      post: "@%{username} 发布的帖子 #%{postNumber}"
       close: "关闭"
       twitter: "分享到 Twitter"
       facebook: "分享到 Facebook"
@@ -118,7 +118,7 @@ zh_CN:
       url: "复制并分享 URL"
     action_codes:
       public_topic: "%{when}将此话题设为公开"
-      open_topic: "将此转换为话题 %{when}"
+      open_topic: "%{when}将此转换为话题"
       private_topic: "%{when}将此话题转换为个人消息"
       split_topic: "%{when}拆分了此话题"
       invited_user: "%{when}邀请了 %{who}"
@@ -163,10 +163,10 @@ zh_CN:
     bootstrap_wizard_link_title: "完成设置向导"
     themes:
       default_description: "默认"
-      broken_theme_alert: "您的网站可能无法运行，因为主题/组件有错误。"
-      error_caused_by: "由 '%{name}' 引起。 <a target='blank' href='%{path}'>单击此处</a> 进行更新、重新配置或禁用。"
+      broken_theme_alert: "您的站点可能无法运行，因为主题/组件有错误。"
+      error_caused_by: "由 '%{name}' 引起。<a target='blank' href='%{path}'>点击此处</a>进行更新、重新配置或禁用。"
       only_admins: "（此消息仅向站点管理员显示）"
-    broken_decorator_alert: "帖子可能无法正确显示，因为您的站点上的其中一个帖子内容装饰器出现了错误。"
+    broken_decorator_alert: "帖子可能无法正确显示，因为您的站点上的其中一个帖子内容装饰器引发错误。"
     s3:
       regions:
         ap_northeast_1: "亚太地区（东京）"
@@ -180,7 +180,7 @@ zh_CN:
         cn_northwest_1: "中国（宁夏）"
         eu_central_1: "欧洲（法兰克福）"
         eu_north_1: "欧洲（斯德哥尔摩）"
-        eu_south_1: "欧盟(米兰)"
+        eu_south_1: "欧盟（米兰）"
         eu_west_1: "欧洲（爱尔兰）"
         eu_west_2: "欧洲（伦敦）"
         eu_west_3: "欧洲（巴黎）"
@@ -239,7 +239,7 @@ zh_CN:
     character_count:
       other: "%{count} 个字符"
     period_chooser:
-      aria_label: "按时间间隔筛选"
+      aria_label: "按期间筛选"
     related_messages:
       title: "相关消息"
       see_all: '查看来自 @%{username} 的<a href="%{path}">所有消息</a>…'
@@ -272,18 +272,18 @@ zh_CN:
       help:
         bookmark: "点击以将此话题的第一个帖子加入书签"
         edit_bookmark: "点击以编辑有关此话题的书签"
-        edit_bookmark_for_topic: "单击来为本主题编辑收藏"
+        edit_bookmark_for_topic: "点击以编辑此话题的书签"
         unbookmark: "点击以移除此话题中的所有书签"
         unbookmark_with_reminder: "点击以移除此话题中的所有书签和提醒。"
     bookmarks:
       created: "您已将此帖子加入书签。%{name}"
-      created_generic: "你已将此加入书签。 %{name}"
+      created_generic: "您已将此加入书签。%{name}"
       create: "创建书签"
       edit: "编辑书签"
       not_bookmarked: "将此帖子加入书签"
-      remove_reminder_keep_bookmark: "删除提醒并保留收藏"
+      remove_reminder_keep_bookmark: "移除提醒并保留书签"
       created_with_reminder: "您已将此帖子加入书签，并于 %{date}设置了一个提醒。%{name}"
-      created_with_reminder_generic: "你已收藏了该帖子并设置了一个提醒 %{date}。 %{name}"
+      created_with_reminder_generic: "您已将此加入书签并设置了一个提醒 %{date}。%{name}"
       remove: "移除书签"
       delete: "删除书签"
       confirm_delete: "确定要删除此书签吗？提醒也将一并删除。"
@@ -294,10 +294,10 @@ zh_CN:
       list_permission_denied: "您没有权限查看此用户的书签。"
       no_user_bookmarks: "您没有已加入书签的帖子；书签让您可以快速定位特定帖子。"
       auto_delete_preference:
-        label: "在你收到通知后"
+        label: "在您收到通知后"
         never: "保留书签"
         when_reminder_sent: "删除书签"
-        on_owner_reply: "删除书签，一旦我回复"
+        on_owner_reply: "在我回复后删除书签"
         clear_reminder: "保留书签并清除提醒"
       search_placeholder: "按名称、话题标题或帖子内容搜索书签"
       search: "搜索"
@@ -324,11 +324,11 @@ zh_CN:
         yes_value: "舍弃"
         no_value: "恢复编辑"
     topic_count_categories:
-      other: "查看 %{count} 个新或更新过的主题"
+      other: "查看 %{count} 个新的或更新过的话题"
     topic_count_latest:
       other: "查看 %{count} 个新的或更新的话题"
     topic_count_unseen:
-      other: "查看 %{count} 个新的或更新的话题"
+      other: "查看 %{count} 个新的或更新过的话题"
     topic_count_unread:
       other: "查看 %{count} 个未读话题"
     topic_count_new:
@@ -341,7 +341,7 @@ zh_CN:
     saved: "已保存！"
     upload: "上传"
     uploading: "正在上传…"
-    processing: "正在处理..."
+    processing: "正在处理…"
     uploading_filename: "正在上传：%{filename}…"
     processing_filename: "正在处理：%{filename}…"
     clipboard: "剪贴板"
@@ -356,7 +356,7 @@ zh_CN:
     switch_to_anon: "进入匿名模式"
     switch_from_anon: "退出匿名模式"
     banner:
-      close: "忽略此横幅"
+      close: "关闭此横幅"
       edit: "编辑"
     pwa:
       install_banner: "要<a href>在此设备上安装%{title}</a> 吗？"
@@ -540,7 +540,7 @@ zh_CN:
       relative: "相对"
     time_shortcut:
       now: "现在"
-      in_one_hour: "在一个小时内"
+      in_one_hour: "一小时内"
       in_two_hours: "两小时内"
       later_today: "今天晚些时候"
       two_days: "两天"
@@ -607,6 +607,8 @@ zh_CN:
         reset_to_default: "重置为默认值"
       group:
         all: "所有群组"
+      sort:
+        label: "按%{criteria}排序"
     group_histories:
       actions:
         change_group_setting: "更改群组设置"
@@ -684,8 +686,8 @@ zh_CN:
             title: "设置"
             allow_unknown_sender_topic_replies: "允许未知发件人回复话题。"
             allow_unknown_sender_topic_replies_hint: "允许未知发件人回复群组话题。如果未启用此功能，且从未被邀请至该话题的电子邮件地址回复，将创建一个新话题。"
-            from_alias: "来源的别名"
-            from_alias_hint: "发送群组 SMTP 邮件时使用的别名。 请注意，这可能不是所有邮件提供商都支持的，请查阅您的邮件提供商的文档。"
+            from_alias: "发件人别名"
+            from_alias_hint: "发送群组 SMTP 电子邮件时用作发件人地址的别名。请注意，并非所有邮件提供商都支持此功能，请查阅您的邮件提供商的文档。"
           mailboxes:
             synchronized: "已同步的邮箱"
             none_found: "未在此电子邮件帐户中找到任何邮箱。"
@@ -801,7 +803,7 @@ zh_CN:
         owner: "所有者"
         primary: "主要"
         forbidden: "您无权查看成员列表。"
-        no_filter_matches: "没有匹配该搜索的成员。"
+        no_filter_matches: "没有与该搜索匹配的成员。"
       topics: "话题"
       posts: "帖子"
       mentions: "提及"
@@ -913,7 +915,7 @@ zh_CN:
     user_fields:
       none: "（选择一个选项）"
       required: '请为“%{name}”输入一个值。'
-      same_as_password: '你的密码不应重复出现在其他字段中。'
+      same_as_password: '您的密码不应重复出现在其他字段中。'
     user:
       said: "%{username}："
       profile: "个人资料"
@@ -977,9 +979,9 @@ zh_CN:
       use_current_timezone: "使用当前时区"
       profile_hidden: "此用户的公开个人资料已被隐藏。"
       expand_profile: "展开"
-      sr_expand_profile: "展开个人资料详情"
+      sr_expand_profile: "展开个人资料详细信息"
       collapse_profile: "收起"
-      sr_collapse_profile: "收起个人资料详情"
+      sr_collapse_profile: "收起个人资料详细信息"
       bookmarks: "书签"
       bio: "自我介绍"
       timezone: "时区"
@@ -1001,20 +1003,23 @@ zh_CN:
       dismiss_notifications: "全部关闭"
       dismiss_notifications_tooltip: "将所有未读通知标记为已读"
       dismiss_bookmarks_tooltip: "将所有未读书签提醒标记为已读"
-      dismiss_messages_tooltip: "将所有未读的个人信息通知标记为已读"
+      dismiss_messages_tooltip: "将所有未读个人信息通知标记为已读"
       no_messages_title: "您没有任何消息"
       no_messages_body: >
         需要直接与某人对话而不是公开讨论？选择他的头像并点击 %{icon} 消息按钮，向他们发送消息。<br><br> 如果您需要帮助，可以<a href='%{aboutUrl}'>向管理人员发送消息</a>。
       no_bookmarks_title: "您还没有将任何内容加入书签"
       no_bookmarks_body: >
         使用 %{icon} 按钮开始将帖子加入书签，它们将出现在这里，便于参考。您也可以安排提醒！
-      no_bookmarks_search: "使用提供的搜索查询未找到收藏。"
+      no_bookmarks_search: "使用提供的搜索查询找不到书签。"
       no_notifications_title: "您还没有任何通知"
       no_notifications_body: >
         您将直接在此面板上收到与您相关的活动通知，包括对您的话题和帖子的回复，以及当有人<b>提及 (@)</b> 您或引用您以及回复您关注的话题时。当您有一段时间没有登录时，通知还将发送到您的电子邮件。<br><br>查找 %{icon} 以决定您想收到通知的具体话题、类别和标签。有关详情，请参阅您的<a href='%{preferencesUrl}'>通知偏好设置</a>。
+      no_other_notifications_title: "您还没有任何其他通知"
+      no_other_notifications_body: >
+        您将在此面板中收到可能与您相关的其他类型活动的通知 – 例如，当有人链接到或编辑您的帖子时。
       no_notifications_page_title: "您还没有任何通知"
       no_notifications_page_body: >
-        您将收到有关与您直接相关的活动的通知，其中包括对您的主题和帖子的回复、有人 <b>@提及</b> 您、引用您的帖子时，或者对您正在浏览的主题发出回复。当您有一段时间没有登录时，通知也会发送到您的邮箱。 <br><br> 寻找 %{icon} 来决定您希望通知哪些特定主题、类别和标签。有关更多信息，请参阅您的 <a href='%{preferencesUrl}'>通知选项</a>。
+        您将收到有关与您直接相关的活动的通知，其中包括对您的话题和帖子的回复、有人提及 <b>@</b> 您、引用您的帖子时，或者回复您正在关注的话题。当您有一段时间没有登录时，通知也会发送到您的电子邮箱。<br><br> 查找 %{icon} 以决定您希望收到哪些特定话题、类别和标签的通知。有关更多信息，请查看您的<a href='%{preferencesUrl}'>通知偏好设置</a>。
       first_notification: "您的第一个通知！选中它以开始。"
       dynamic_favicon: "在浏览器图标上显示数量"
       skip_new_user_tips:
@@ -1041,12 +1046,11 @@ zh_CN:
       enable_quoting: "为突出显示的文字启用引用回复"
       enable_defer: "启用延迟以将话题标记为未读"
       experimental_sidebar:
-        enable: "启用实验性侧边栏"
         options: "选项"
-        categories_section: "类别部分"
-        categories_section_instruction: "选定的类别将显示在侧边栏的类别部分下。"
-        tags_section: "标签部分"
-        tags_section_instruction: "选定的标签将显示在侧边栏的标签部分下。"
+        categories_section: "类别版块"
+        categories_section_instruction: "所选类别将显示在边栏的类别版块下。"
+        tags_section: "标签版块"
+        tags_section_instruction: "所选标签将显示在边栏的标签版块下。"
       change: "更改"
       featured_topic: "精选话题"
       moderator: "%{user} 是版主"
@@ -1124,7 +1128,7 @@ zh_CN:
         warnings_received: "警告"
         rejected_posts: "被拒绝的帖子"
       messages:
-        all: "所有收到的信息"
+        all: "所有收件箱"
         inbox: "收件箱"
         personal: "个人"
         latest: "最新"
@@ -1143,8 +1147,8 @@ zh_CN:
         tags: "标签"
         all_tags: "所有标签"
         warnings: "官方警告"
-        read_more_in_group: "想阅读更多？浏览%{groupLink}或中的其他话题。"
-        read_more: "想阅读更多内容？ 请在 <a href='%{basePath}/u/%{username}/messages/personal'>个人私信</a>中浏览其他消息。"
+        read_more_in_group: "想阅读更多？浏览 %{groupLink} 中的其他消息。"
+        read_more: "想阅读更多？在<a href='%{basePath}/u/%{username}/messages'>个人消息</a>中浏览其他消息。"
         read_more_group_pm_MF: "还有{ UNREAD, plural, =0 {} other { <a href='{basePath}/unread'># 个未读</a>} }{ NEW, plural, =0 {} other {{BOTH, select, true{和} false {} other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># 个新</a>消息} }，或者浏览{groupLink}的其他消息"
         read_more_personal_pm_MF: "还有{ UNREAD, plural, =0 {} other { <a href='{basePath}/u/{username}/messages/unread'># 个未读</a>} }{ NEW, plural, =0 {} other {{BOTH, select, true{和} false {} other{}} <a href='{basePath}/u/{username}/messages/new'># 个新</a>消息} }，或者浏览<a href='{basePath}/u/{username}/messages'>个人消息</a>"
       preferences_nav:
@@ -1158,7 +1162,7 @@ zh_CN:
         tags: "标签"
         interface: "界面"
         apps: "应用"
-        sidebar: "侧边栏"
+        sidebar: "边栏"
       change_password:
         success: "（电子邮件已发送）"
         in_progress: "（正在发送电子邮件）"
@@ -1213,8 +1217,6 @@ zh_CN:
         edit: "编辑"
         edit_title: "编辑身份验证器"
         edit_description: "身份验证器名称"
-        enable_security_key_description: |
-          准备好<a href="https://www.google.com/search?q=hardware+security+key" target="_blank">硬件安全密钥</a>后，请按下面的“注册”按钮。
         totp:
           title: "基于令牌的身份验证器"
           add: "添加身份验证器"
@@ -1222,14 +1224,10 @@ zh_CN:
           name_and_code_required_error: "您必须提供名称和身份验证器应用中的代码。"
         security_key:
           register: "注册"
-          title: "安全密钥"
-          add: "添加安全密钥"
           default_name: "主要安全密钥"
           not_allowed_error: "安全密钥注册过程已超时或被取消。"
           already_added_error: "您已注册此安全密钥，无需再次注册。"
-          edit: "编辑安全密钥"
           save: "保存"
-          edit_description: "安全密钥名称"
           name_required_error: "您必须为您的安全密钥提供一个名称。"
       change_about:
         title: "更改自我介绍"
@@ -1393,7 +1391,7 @@ zh_CN:
         every_month: "每月"
         every_six_months: "每六个月"
       email_level:
-        title: "当我被引用、回复、我的 @用户名 被提及或当我关注的类别、标签或主题有新的活动时给我发送电子邮件"
+        title: "当我被引用、回复、我的用户名被提及 (@) 或当我关注的类别、标签或话题有新的活动时给我发送电子邮件"
         always: "始终"
         only_when_away: "只在离开时"
         never: "从不"
@@ -1475,23 +1473,23 @@ zh_CN:
         invite:
           new_title: "创建邀请"
           edit_title: "编辑邀请"
-          instructions: "分享此链接可立即授予访问此站点的权限："
+          instructions: "分享此链接以立即授予访问此站点的权限："
           copy_link: "复制链接"
           expires_in_time: "于 %{time}过期"
           expired_at_time: "过期时间为 %{time}"
           show_advanced: "显示高级选项"
           hide_advanced: "隐藏高级选项"
-          restrict: "限制在"
+          restrict: "限制为"
           restrict_email: "仅限电子邮件"
           restrict_domain: "仅限网域"
           email_or_domain_placeholder: "name@example.com 或者 example.com"
           max_redemptions_allowed: "最大使用次数"
           add_to_groups: "添加到群组"
-          invite_to_topic: "直达此主题"
+          invite_to_topic: "直达话题"
           expires_at: "过期时间"
           custom_message: "可选个人信息"
           send_invite_email: "保存并发送电子邮件"
-          send_invite_email_instructions: "限制只允许电子邮件邀请并发送邀请邮件"
+          send_invite_email_instructions: "限制只允许电子邮件邀请并发送邀请电子邮件"
           save_invite: "保存邀请"
           invite_saved: "邀请已保存。"
         bulk_invite:
@@ -1517,9 +1515,9 @@ zh_CN:
         title: "摘要"
         stats: "统计信息"
         time_read: "阅读时间"
-        time_read_title: "%{duration} (所有时间)"
+        time_read_title: "%{duration}（所有时间）"
         recent_time_read: "最近阅读时间"
-        recent_time_read_title: "%{duration} (在过去60天内)"
+        recent_time_read_title: "%{duration}（过去 60 天）"
         topic_count:
           other: "创建的话题"
         post_count:
@@ -1571,6 +1569,9 @@ zh_CN:
         title: "资质"
         none: "（无）"
         instructions: "图标显示在您的个人资料照片旁边"
+      status:
+        title: "自定义状态"
+        not_set: "未设置"
       primary_group:
         title: "主要群组"
         none: "（无）"
@@ -1584,8 +1585,17 @@ zh_CN:
     user_status:
       save: "保存"
       set_custom_status: "设置自定义状态"
-      what_are_you_doing: "你在做什么？"
+      what_are_you_doing: "您在做什么？"
       remove_status: "移除状态"
+    popup:
+      primary: "知道了！"
+      secondary: "不要为我显示这些提示"
+      first_notification:
+        title: "您的第一个通知！"
+        content: "通知用于让您了解社区中发生的最新情况。"
+      topic_timeline:
+        title: "话题时间线"
+        content: "使用话题时间线快速滚动浏览帖子。"
     loading: "正在加载…"
     errors:
       prev_page: "无法加载"
@@ -1619,7 +1629,7 @@ zh_CN:
       login_disabled: "当站点处于只读模式时，登录被禁用。"
       logout_disabled: "当站点处于只读模式时，退出被禁用。"
     staff_writes_only_mode:
-      enabled: "本站点处于工作人员专用模式。请继续浏览，但回复、赞和其他操作仅限于管理人员。"
+      enabled: "此站点处于管理人员专用模式。请继续浏览，但回复、赞和其他操作仅限于管理人员。"
     too_few_topics_and_posts_notice_MF: >-
       让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">开始讨论</a>吧！现在有 {currentTopics, plural, one {<strong>#</strong> 个话题} other {<strong>#</strong> 个话题}}和 {currentPosts, plural, one {<strong>#</strong> 个帖子} other {<strong>#</strong> 个帖子}}。访客需要阅读和回复更多 - 我们建议至少 {requiredTopics, plural, one {<strong>#</strong> 个话题} other {<strong>#</strong> 个话题}}和 {requiredPosts, plural, one {<strong>#</strong> 个帖子} other {<strong>#</strong> 个帖子}}。只有管理人员可以看到此消息。
     too_few_topics_notice_MF: >-
@@ -1646,11 +1656,11 @@ zh_CN:
       other: 回复
     signup_cta:
       sign_up: "注册"
-      hide_session: "稍后再说"
+      hide_session: "以后再说"
       hide_forever: "不，谢谢"
       hidden_for_session: "好的，我们会在明天问您。您也可以随时使用“登录”来创建帐户。"
       intro: "您好！看起来您很喜欢讨论，但您还没有注册帐户。"
-      value_prop: "厌倦了每次从头浏览相同的帖子？当你注册后，总是可以从上次看到的位置继续阅读。有了账户，你还可以收到新回复通知、保存书签以及使用“赞”来感谢他人。我们可以一起努力，使这个社区变得更好。 :heart:"
+      value_prop: "厌倦了滚动浏览相同的帖子？当您创建帐户后，您将始终回到您离开的地方。使用帐户，您还可以收到新回复通知、保存书签，以及使用“赞”来感谢他人。我们可以共同努力，使这个社区变得更好。:heart:"
     summary:
       enabled_description: "您正在查看此话题的摘要：社区确定的最有趣的帖子。"
       description:
@@ -1658,8 +1668,8 @@ zh_CN:
       description_time_MF: "有 {replyCount, plural, one {<b>#</b> 个回复} other {<b>#</b> 个回复}}，预计阅读时间为 <b>{readingTime, plural,one {# 分钟}other {# 分钟}}</b>。"
       enable: "总结此话题"
       disable: "显示所有帖子"
-      short_label: "总结"
-      short_title: "显示此主题的摘要：社区确定的最有趣的帖子"
+      short_label: "摘要"
+      short_title: "显示此话题的摘要：由社区决定的最有趣的帖子"
     deleted_filter:
       enabled_description: "此话题包含已删除的帖子，它们已被隐藏。"
       disabled_description: "已显示话题中已删除的帖子。"
@@ -1690,7 +1700,7 @@ zh_CN:
       disclaimer: "注册，即表示您同意<a href='%{privacy_link}' target='blank'>隐私政策</a>和<a href='%{tos_link}' target='blank'>服务条款</a>。"
       title: "创建您的帐户"
       failed: "出了点问题，可能此电子邮件已被注册，试试点击忘记密码链接"
-      associate: "已经有账户？ <a href='%{associate_link}'>登录</a> 以关联你的 %{provider} 账户。"
+      associate: "已经有帐户？<a href='%{associate_link}'>登录</a>以关联您的 %{provider} 帐户。"
     forgot_password:
       title: "密码重置"
       action: "我忘记密码了"
@@ -1732,7 +1742,6 @@ zh_CN:
       second_factor_backup_title: "双重备份"
       second_factor_backup_description: "请输入您的备份代码之一："
       second_factor: "使用身份验证器应用登录"
-      security_key_description: "当您准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
       security_key_alternative: "尝试另一种方式"
       security_key_authenticate: "使用安全密钥进行身份验证"
       security_key_not_allowed_error: "安全密钥身份验证过程超时或被取消。"
@@ -1793,7 +1802,7 @@ zh_CN:
       second_factor_toggle:
         totp: "改用身份验证器应用"
         backup_code: "改用备份代码"
-        security_key: "改为使用安全密钥"
+        security_key: "改用安全密钥"
     invites:
       accept_title: "邀请"
       emoji: "信封表情符号"
@@ -1818,11 +1827,11 @@ zh_CN:
       categories_only: "仅类别"
       categories_with_featured_topics: "包含精选话题的类别"
       categories_and_latest_topics: "类别和最新话题"
-      categories_and_latest_topics_created_date: "类别和最新话题(按话题创建日期排序)"
+      categories_and_latest_topics_created_date: "类别和最新话题（按话题创建日期排序）"
       categories_and_top_topics: "类别和热门话题"
       categories_boxes: "带子类别的框"
       categories_boxes_with_topics: "带精选话题的框"
-      subcategories_with_featured_topics: "有特色主题的子类别"
+      subcategories_with_featured_topics: "包含精选话题的子类别"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1838,13 +1847,13 @@ zh_CN:
       plus_subcategories:
         other: "+ %{count} 个子类别"
     select_kit:
-      delete_item: "删除 %{name} 个"
+      delete_item: "删除 %{name}"
       filter_by: "筛选条件：%{name}"
       select_to_filter: "选择要筛选的值"
       default_header_text: 选择…
       no_content: 未找到匹配项
       results_count:
-        other: "%{count} 结果"
+        other: "%{count} 个结果"
       filter_placeholder: 搜索…
       filter_placeholder_with_any: 搜索或创建…
       create: "创建：'%{content}'"
@@ -1901,7 +1910,7 @@ zh_CN:
       drafts_offline: "离线草稿"
       edit_conflict: "编辑冲突"
       esc: "esc"
-      esc_label: "单击或按 Esc 忽略"
+      esc_label: "点击或按 Esc 关闭"
       ok_proceed: "好的，继续"
       group_mentioned_limit:
         other: "<b>警告</b>！您提及了 <a href='%{group_link}'> %{group} </a>，但是此群组的成员数量超过了管理员配置的 %{count} 个用户的最大可提及数量限制。没有人会收到通知。"
@@ -1910,10 +1919,10 @@ zh_CN:
       cannot_see_mention:
         category: "您提及了 @%{username}，但该用户无法访问此类别，因此不会收到通知。您需要将其添加到可以访问此类别的群组中。"
         private: "您提及了 @%{username}，但该用户无法访问此个人消息，因此不会收到通知。您需要邀请该用户加入此个人消息。"
-        muted_topic: "您提到了@%{username}，但该用户已将本话题设为免打扰，不会收到通知。"
-        not_allowed: "您提到了@%{username}，但该用户未被邀请至本话题，不会收到通知。"
+        muted_topic: "您提及了 @%{username}，但该用户已将此话题设为免打扰，因此不会收到通知。"
+        not_allowed: "您提及了 @%{username}，但该用户未被邀请加入此话题，因此不会收到通知。"
       here_mention:
-        other: "通过提及 <b>@%{here}</b>，您将要通知 %{count} 用户 – 您确定吗？"
+        other: "提及 <b>@%{here}</b>，即表示您将通知 %{count} 个用户 – 确定吗？"
       duplicate_link: "好像 <b>@%{username}</b> 在话题 <a href='%{post_url}'>%{ago}的回复</a>中已经发布 <b>%{domain}</b> 的链接 - 确定要再次发布吗？"
       reference_topic_title: "回复：%{title}"
       error:
@@ -1999,8 +2008,8 @@ zh_CN:
       slow_mode:
         error: "本话题处于慢速模式。您最近已经发帖；您可以在 %{timeLeft}后再次发帖。"
       user_not_seen_in_a_while:
-        single: "你正在向用户发送消息：<b>%{usernames}</b>，已经很久没来过了 —— %{time_ago}。他可能不会收到你的消息。你可能需要使用其它的方法来联系%{usernames}。"
-        multiple: "你正在向这些用户发送消息：<b>%{usernames}</b>，已经很久没来过了 —— %{time_ago}。他们可能不会收到你的消息。你可能需要使用其它的方法来联系他们。"
+        single: "您正在向其发送消息的人 <b>%{usernames}</b> 已经很长时间没有出现在这里了 – 上次还是 %{time_ago}。他们可能不会收到您的消息。您可能需要寻找其他方式来联系 %{usernames}。"
+        multiple: "您正在向其发送消息的人 <b>%{usernames}</b> 已经很长时间没有出现在这里了 – 上次还是 %{time_ago}。他们可能不会收到您的消息。您可能需要寻找其他方式来联系他们。"
       admin_options_title: "此话题的可选管理人员设置"
       composer_actions:
         reply: 回复
@@ -2033,7 +2042,7 @@ zh_CN:
       reload: "重新加载"
       ignore: "忽略"
       image_alt_text:
-        aria_label: 替代图片的文字
+        aria_label: 图片的替换文字
       delete_image_button: 删除图片
     notifications:
       tooltip:
@@ -2042,14 +2051,14 @@ zh_CN:
         message:
           other: "%{count} 条未读消息"
         high_priority:
-          other: "%{count} 个未读的高优先级通知"
+          other: "%{count} 个未读高优先级通知"
       title: "提及 (@) 您的用户名、回复您的帖子和话题、消息等的通知"
       none: "目前无法加载通知。"
       empty: "找不到通知。"
       post_approved: "您的帖子已被批准"
       reviewable_items: "需要审核的条目"
       watching_first_post_label: "新建话题"
-      user_moved_post: "%{username} 移动了"
+      user_moved_post: "%{username} 移动了帖子"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2063,7 +2072,7 @@ zh_CN:
         other: "<span class='multi-user'>%{username}、%{username2} 和其他 %{count} 人</span> %{description}"
       liked_by_2_users: "%{username}、%{username2}"
       liked_by_multiple_users:
-        other: "%{username}和%{username2}还有其余%{count}人"
+        other: "%{username}、%{username2} 和其他 %{count} 人"
       liked_consolidated_description:
         other: "点赞了您的 %{count} 个帖子"
       liked_consolidated: "<span>%{username}</span> %{description}"
@@ -2071,7 +2080,7 @@ zh_CN:
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
       invited_to_topic: "<span>%{username}</span> %{description}"
       invitee_accepted: "<span>%{username}</span> 已接受您的邀请"
-      invitee_accepted_your_invitation: "接受了你的邀请"
+      invitee_accepted_your_invitation: "接受了您的邀请"
       moved_post: "<span>%{username}</span> 移动了%{description}"
       linked: "<span>%{username}</span> %{description}"
       granted_badge: "获得了 '%{description}'"
@@ -2086,12 +2095,12 @@ zh_CN:
       dismiss_confirmation:
         body:
           default:
-            other: "您确定吗？您有 %{count} 个重要通知。"
+            other: "确定吗？您有 %{count} 个重要通知。"
           bookmarks:
-            other: "确定吗？您共有 %{count} 个未读书签提醒。"
+            other: "确定吗？您有 %{count} 个未读书签提醒。"
           messages:
-            other: "确定吗？你有 %{count} 条未读的个人信息。"
-        dismiss: "忽略"
+            other: "确定吗？您有 %{count} 条未读个人信息。"
+        dismiss: "关闭"
         cancel: "取消"
       group_message_summary:
         other: "您的 %{group_name} 收件箱中有 %{count} 条消息"
@@ -2148,8 +2157,8 @@ zh_CN:
       clear_all: "全部清除"
       too_short: "您的搜索词过短。"
       open_advanced: "打开高级搜索"
-      clear_search: "清除搜索内容"
-      sort_or_bulk_actions: "分类或者从结果中批量选择"
+      clear_search: "清除搜索"
+      sort_or_bulk_actions: "排序或批量选择结果"
       result_count:
         other: "<span>%{count}%{plus} 条与 </span>“<span class='term'>%{term}</span>”有关的结果"
       title: "搜索"
@@ -2168,23 +2177,23 @@ zh_CN:
       search_term_label: "输入搜索关键字"
       categories: "类别"
       tags: "标签"
-      in: "在"
-      in_this_topic: "在此主题中"
-      in_this_topic_tooltip: "切换到搜索所有主题"
+      in: "位置"
+      in_this_topic: "在此话题中"
+      in_this_topic_tooltip: "切换为搜索所有话题"
       in_messages: "在消息中"
-      in_messages_tooltip: "切换到搜索常规话题"
-      in_topics_posts: "在所有主题和帖子中"
+      in_messages_tooltip: "切换为搜索常规话题"
+      in_topics_posts: "在所有话题和帖子中"
       enter_hint: "或按 Enter"
-      in_posts_by: "搜索 @%{username} 的帖子"
+      in_posts_by: "在 %{username} 的帖子中"
       browser_tip: "%{modifier} + f"
-      browser_tip_description: "再次使用本机浏览器搜索"
+      browser_tip_description: "再次使用原生浏览器搜索"
       recent: "最近的搜索"
-      clear_recent: "清除搜索历史"
+      clear_recent: "清除最近的搜索"
       type:
-        default: "主题/帖子"
+        default: "话题/帖子"
         users: "用户"
         categories: "类别"
-        categories_and_tags: "分类/标签"
+        categories_and_tags: "类别/标签"
       context:
         user: "搜索 @%{username} 的帖子"
         category: "搜索 #%{category} 类别"
@@ -2194,15 +2203,15 @@ zh_CN:
       tips:
         category_tag: "按类别或标签筛选"
         author: "按帖子作者筛选"
-        in: "按元数据进行筛选(例如：标题、个人、置顶)"
-        status: "按主题状态筛选"
+        in: "按元数据（例如：in:title、in:personal、in:pinned）筛选"
+        status: "按话题状态筛选"
         full_search: "启动完整页面搜索"
-        full_search_key: "%{modifier} + 回车"
+        full_search_key: "%{modifier} + Enter"
       advanced:
-        title: 高级过滤器
+        title: 高级筛选器
         posted_by:
           label: 发帖人
-          aria_label: 按作者过滤
+          aria_label: 按帖子作者筛选
         in_category:
           label: 分类
         in_group:
@@ -2211,7 +2220,7 @@ zh_CN:
           label: 有该徽章
         with_tags:
           label: 拥有该标签
-          aria_label: 按标签过滤
+          aria_label: 使用标签筛选
         filters:
           label: 只返回话题/帖子…
           title: 仅在标题中匹配
@@ -2242,25 +2251,25 @@ zh_CN:
             label: 帖子
           min:
             placeholder: 最小值
-            aria_label: 按帖子的最大数量筛选
+            aria_label: 按最小帖子数筛选
           max:
             placeholder: 最大值
-            aria_label: 按帖子的最大数量筛选
+            aria_label: 按最大帖子数筛选
           time:
             label: 发布时间
-            aria_label: 按发布日期过滤
+            aria_label: 按发布日期筛选
             before: 早于
             after: 晚于
         views:
           label: 浏览量
         min_views:
           placeholder: 最小值
-          aria_label: 按最大观看次数筛选
+          aria_label: 按最小浏览量筛选
         max_views:
           placeholder: 最大值
-          aria_label: 按最大观看次数筛选
+          aria_label: 按最大浏览量筛选
         additional_options:
-          label: "按帖子数量和主题浏览量筛选"
+          label: "按帖子数量和话题浏览量筛选"
     hamburger_menu: "菜单"
     new_item: "新"
     go_back: "返回"
@@ -2268,8 +2277,8 @@ zh_CN:
     current_user: "转到您的用户页面"
     view_all: "查看所有%{tab}"
     user_menu:
-      generic_no_items: "此列表中没有内容。"
-      sr_menu_tabs: "用户菜单标签"
+      generic_no_items: "此列表中没有条目。"
+      sr_menu_tabs: "用户菜单标签页"
       view_all_notifications: "查看所有通知"
       view_all_bookmarks: "查看所有书签"
       view_all_messages: "查看所有个人消息"
@@ -2284,31 +2293,31 @@ zh_CN:
         likes: "赞"
         likes_with_unread:
           other: "赞 - %{count} 个未读赞"
-        watching: "关注的主题"
+        watching: "关注的话题"
         watching_with_unread:
-          other: "关注的主题 - %{count} 未读的关注主题"
-        messages: "私信"
+          other: "关注的话题 - %{count} 个未读关注话题"
+        messages: "个人信息"
         messages_with_unread:
-          other: "私信 - %{count} 条未读私信"
+          other: "个人信息 - %{count} 条未读信息"
         bookmarks: "书签"
         bookmarks_with_unread:
           other: "书签 - %{count} 个未读书签"
         review_queue: "审核队列"
         review_queue_with_unread:
-          other: "审核队列 - %{count} 个项目需要审核"
+          other: "审核队列 - %{count} 个条目需要审核"
         other_notifications: "其他通知"
         other_notifications_with_unread:
           other: "其他通知 - %{count} 个未读通知"
         profile: "个人资料"
       reviewable:
-        view_all: "查看所有审查项目"
+        view_all: "查看所有审核条目"
         queue: "队列"
-        deleted_user: "(删除用户)"
-        deleted_post: "(已删除的帖子)"
+        deleted_user: "（已删除的用户）"
+        deleted_post: "（已删除的帖子）"
         post_number_with_topic_title: "帖子 #%{post_number} - %{title}"
         new_post_in_topic: "%{title} 中的新帖子"
-        user_requires_approval: "%{username} 需要批准"
-        default_item: "可审查项目 #%{reviewable_id}"
+        user_requires_approval: "%{username} 需要审批"
+        default_item: "可审核条目 #%{reviewable_id}"
     topics:
       new_messages_marker: "上次访问"
       bulk:
@@ -2316,7 +2325,7 @@ zh_CN:
         clear_all: "全部清除"
         unlist_topics: "取消公开话题"
         relist_topics: "重新公开话题"
-        reset_bump_dates: "重置顶帖日期"
+        reset_bump_dates: "重置提升日期"
         defer: "推迟"
         delete: "删除话题"
         dismiss: "关闭"
@@ -2333,11 +2342,11 @@ zh_CN:
           other: "关闭新话题（%{count} 个）…"
         toggle: "切换话题批量选择"
         actions: "批量操作"
-        change_category: "设置分类"
+        change_category: "设置类别…"
         close_topics: "关闭话题"
         archive_topics: "归档话题"
         move_messages_to_inbox: "移至收件箱"
-        notification_level: "通知..."
+        notification_level: "通知…"
         change_notification_level: "更改通知级别"
         choose_new_category: "为话题选择新类别："
         selected:
@@ -2371,7 +2380,7 @@ zh_CN:
         read: "没有更多已读话题了。"
         new: "没有更多新话题了。"
         unread: "没有更多未读话题了。"
-        unseen: "没有更多未读主题了。"
+        unseen: "没有更多未读话题了。"
         category: "没有更多%{category}话题了。"
         tag: "没有更多%{tag}话题了。"
         top: "没有更多热门话题了。"
@@ -2470,7 +2479,7 @@ zh_CN:
         time_frame_required: "请选择时间范围"
         min_duration: "持续时间必须大于 0"
         max_duration: "持续时间必须小于 20 年"
-        duration: "持续时间："
+        duration: "持续时间"
       publish_to_category:
         title: "排定发布时间表"
       temp_open:
@@ -2573,16 +2582,16 @@ zh_CN:
         open: "打开话题"
         close: "关闭话题"
         multi_select: "选择帖子…"
-        slow_mode: "设置慢速模式..."
+        slow_mode: "设置慢速模式…"
         timed_update: "设置话题计时器…"
         pin: "置顶话题…"
         unpin: "取消置顶话题…"
         unarchive: "取消归档话题"
         archive: "归档话题"
-        invisible: "取消列出话题"
-        visible: "列出话题"
+        invisible: "取消公开话题"
+        visible: "公开话题"
         reset_read: "重置阅读数据"
-        make_public: "设为公开话题..."
+        make_public: "设为公开话题…"
         make_private: "设为个人消息"
         reset_bump_date: "重置提升日期"
       feature:
@@ -2601,7 +2610,7 @@ zh_CN:
         instructions: "分享此话题的链接："
         copied: "话题链接已复制。"
         restricted_groups:
-          other: "仅对 %{groupNames} 群组成员可见"
+          other: "仅对以下群组的成员可见：%{groupNames}"
         invite_users: "邀请"
       print:
         title: "打印"
@@ -2761,9 +2770,9 @@ zh_CN:
           other: "您已选择 <b>%{count}</b> 个帖子。"
       deleted_by_author_simple: "（话题已被作者删除）"
     post:
-      confirm_delete: "你确定你要删除这个帖子吗？"
+      confirm_delete: "确定要删除此帖子吗？"
       quote_reply: "引用"
-      quote_reply_shortcut: "或者按 q"
+      quote_reply_shortcut: "或按 q"
       quote_edit: "编辑"
       quote_edit_shortcut: "或按 e"
       quote_share: "分享"
@@ -2780,16 +2789,17 @@ zh_CN:
       show_hidden: "查看已忽略的内容。"
       deleted_by_author_simple: "（帖子已被作者删除）"
       collapse: "收起"
-      sr_collapse_replies: "折叠嵌入回复"
+      sr_collapse_replies: "收起嵌入式回复"
       sr_date: "发布日期"
       sr_expand_replies:
-        other: "这个帖子有 %{count} 个回复。点击展开"
+        other: "此帖子有 %{count} 个回复。点击展开"
       expand_collapse: "展开/收起"
       sr_below_embedded_posts_description: "帖子#%{post_number} 回复"
       sr_embedded_reply_description: "@%{username} 回复帖子 #%{post_number}"
       locked: "一名管理人员已将此帖子锁定为无法编辑"
       gap:
         other: "查看 %{count} 个隐藏回复"
+      sr_reply_to: "回复 @%{username} 发布的帖子 #%{post_number}"
       notice:
         new_user: "这是 %{user} 首次发帖 - 让我们欢迎他/她加入社区吧！"
         returning_user: "我们已经有一段时间没有看到 %{user} 了 — 他/他上次发帖是 %{time}。"
@@ -2804,9 +2814,9 @@ zh_CN:
       has_likes_title_you:
         other: "您和其他 %{count} 人赞了此帖子"
       sr_post_like_count_button:
-        other: "%{count} 人点赞这个帖子。点击查看"
+        other: "%{count} 人赞过此帖子。点击查看"
       sr_post_read_count_button:
-        other: "%{count} 人阅读过这个帖子。点击查看"
+        other: "%{count} 人读过此帖子。点击查看"
       filtered_replies_hint:
         other: "查看此帖子及其 %{count} 个回复"
       filtered_replies_viewing:
@@ -2817,9 +2827,9 @@ zh_CN:
         create: "抱歉，创建您的帖子时出错。请重试。"
         edit: "抱歉，编辑您的帖子时出错。请重试。"
         upload: "抱歉，上传该文件时出错。请重试。"
-        file_too_large: "抱歉，该文件太大（最大大小为 %{max_size_kb}KB）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？"
-        file_size_zero: "抱歉，好像出了点问题，您要上传的文件大小是 0 字节。请再试一次。"
-        file_too_large_humanized: "抱歉，该文件太大（最大大小为 %{max_size}）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？"
+        file_too_large: "抱歉，该文件太大（大小上限为 %{max_size_kb}KB）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？"
+        file_size_zero: "抱歉，好像出了点问题，您要上传的文件是 0 字节。请再试一次。"
+        file_too_large_humanized: "抱歉，该文件太大（大小上限为 %{max_size}）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？"
         too_many_uploads: "抱歉，一次只能上传一个文件。"
         too_many_dragged_and_dropped_files:
           other: "抱歉，一次只能上传 %{count} 个文件。"
@@ -2861,7 +2871,7 @@ zh_CN:
           just_the_post: "否，仅删除此帖子"
         admin: "帖子管理员操作"
         permanently_delete: "永久删除"
-        permanently_delete_confirmation: "你确定要永久删除此帖子吗？你将无法恢复它。"
+        permanently_delete_confirmation: "确定要永久删除此帖子吗？您将无法恢复它。"
         wiki: "设为 Wiki"
         unwiki: "移除 Wiki"
         convert_to_moderator: "添加管理人员颜色"
@@ -2869,8 +2879,8 @@ zh_CN:
         rebake: "重新构建 HTML"
         publish_page: "页面发布"
         unhide: "取消隐藏"
-        change_owner: "更改所有者..."
-        grant_badge: "授予徽章..."
+        change_owner: "更改所有权…"
+        grant_badge: "授予徽章…"
         lock_post: "锁定帖子"
         lock_post_description: "阻止发帖人编辑此帖子"
         unlock_post: "解锁帖子"
@@ -2883,8 +2893,8 @@ zh_CN:
         delete_topic_confirm_modal_no: "否，保留此话题"
         delete_topic_error: "删除此话题时出错"
         delete_topic: "删除话题"
-        add_post_notice: "添加管理人员通知..."
-        change_post_notice: "更改管理人员通知..."
+        add_post_notice: "添加管理人员通知…"
+        change_post_notice: "更改管理人员通知…"
         delete_post_notice: "删除管理人员通知"
         remove_timer: "移除计时器"
         edit_timer: "编辑计时器"
@@ -2898,8 +2908,8 @@ zh_CN:
             other: "还有其他 %{count} 人赞了此帖子"
           read_capped:
             other: "还有其他 %{count} 人阅读了此帖子"
-          sr_post_likers_list_description: "喜欢这个帖子的用户"
-          sr_post_readers_list_description: "阅读此帖的用户"
+          sr_post_likers_list_description: "赞过此帖子的用户"
+          sr_post_readers_list_description: "读过此帖子的用户"
         by_you:
           off_topic: "您将此帖子举报为偏离话题"
           spam: "您将此帖子举报为垃圾信息"
@@ -2911,7 +2921,7 @@ zh_CN:
           other: "确定要删除这 %{count} 个帖子吗？"
       merge:
         confirm:
-          other: "你确定要合并这 %{count} 个帖子吗？"
+          other: "确定要合并这 %{count} 个帖子吗？"
       revisions:
         controls:
           first: "第一个修订"
@@ -2947,9 +2957,9 @@ zh_CN:
             button: "HTML"
       bookmarks:
         create: "创建书签"
-        create_for_topic: "添加主题到收藏夹"
+        create_for_topic: "为话题创建书签"
         edit: "编辑书签"
-        edit_for_topic: "编辑收藏"
+        edit_for_topic: "编辑话题的书签"
         created: "已创建"
         updated: "更新"
         name: "名称"
@@ -2980,7 +2990,7 @@ zh_CN:
         show_all: "全部显示"
       share:
         title: "分享帖子 #%{post_number}"
-        instructions: "分享此帖子的链接:"
+        instructions: "分享此帖子的链接："
     category:
       none: "（无类别）"
       all: "所有类别"
@@ -3001,10 +3011,10 @@ zh_CN:
       manage_tag_groups_link: "管理标签组"
       allow_global_tags_label: "也允许其他标签"
       required_tag_group:
-        description: "新主题要求必须有来自标签组的标签。"
+        description: "要求新话题具有来自标签组的标签："
         delete: "删除"
-        add: "添加必需的标签组"
-        placeholder: "选择标签组..."
+        add: "添加所需标签组"
+        placeholder: "选择标签组…"
       topic_featured_link_allowed: "在此类别中允许精选链接"
       delete: "删除类别"
       create: "新建类别"
@@ -3017,7 +3027,7 @@ zh_CN:
       name: "类别名称"
       description: "描述"
       logo: "类别徽标图片"
-      logo_dark: "深色模式类别 Logo 图片"
+      logo_dark: "深色模式类别徽标图片"
       background_image: "类别背景图片"
       badge_colors: "徽章颜色"
       background_color: "背景色"
@@ -3065,7 +3075,7 @@ zh_CN:
       default_list_filter: "默认列表筛选器："
       allow_badges_label: "允许在此类别中授予徽章"
       edit_permissions: "编辑权限"
-      reviewable_by_group: "除工作人员外，还可通过以下方式审查这一类别的内容："
+      reviewable_by_group: "除管理人员外，此类别中的内容还可以由以下群组审核："
       review_group_name: "群组名称"
       require_topic_approval: "所有新话题都需要版主审批"
       require_reply_approval: "所有新回复都需要版主审批"
@@ -3075,12 +3085,12 @@ zh_CN:
       position_disabled: "类别将按照活动顺序显示。要控制类别在列表中的顺序，"
       position_disabled_click: '请启用“fixed category positions”设置。'
       minimum_required_tags: "话题中所需的最少标签数："
-      default_slow_mode: '为该分类中的新主题启用“慢速模式”。'
+      default_slow_mode: '为此类别中的新话题启用“慢速模式”。'
       parent: "父类别"
       num_auto_bump_daily: "每天自动顶贴的开放话题的数量："
       navigate_to_first_post_after_read: "阅读话题后导航到第一个帖子"
       notifications:
-        title: "更改此分类的通知级别"
+        title: "更改此类别的通知级别"
         watching:
           title: "关注"
           description: "您将自动关注此类别中的所有话题。您会收到每个话题中每个新帖子的通知，并且会显示新回复数量。"
@@ -3226,14 +3236,14 @@ zh_CN:
     views_lowercase:
       other: "浏览量"
     replies: "回复"
-    sr_replies: "按回复排序"
+    sr_replies: "按回复数排序"
     views_long:
       other: "此话题已被浏览 %{number} 次"
     activity: "活动"
     sr_activity: "按活动排序"
     likes: "赞"
-    sr_likes: "按赞排序"
-    sr_op_likes: "按原帖点赞排序"
+    sr_likes: "按赞数排序"
+    sr_op_likes: "按原帖赞数排序"
     likes_lowercase:
       other: "赞"
     users: "用户"
@@ -3241,7 +3251,7 @@ zh_CN:
       other: "用户"
     category_title: "类别"
     history_capped_revisions: "历史记录，最近 100 次修订"
-    history: "历史"
+    history: "历史记录"
     changed_by: "作者 %{author}"
     raw_email:
       title: "传入电子邮件"
@@ -3272,7 +3282,7 @@ zh_CN:
       unseen:
         title: "未读"
         lower_title: "未读"
-        help: "您当前正在关注或跟踪，具有未读帖子的话题"
+        help: "新话题和您当前正在关注或跟踪，具有未读帖子的话题"
       new:
         lower_title_with_count:
           other: "%{count} 新"
@@ -3314,8 +3324,8 @@ zh_CN:
         this_week: "周"
         today: "今天"
         other_periods: "查看热门："
-    browser_update: '很抱歉， <a href="https://www.discourse.org/faq/#browser">你的浏览器不受支持</a>。请 <a href="https://browsehappy.com">切换到支持的浏览器</a> 查看丰富的内容、登录和回复。'
-    safari_13_warning: 该站点将很快停止对 iOS 和 Safari 13 及以下版本的支持。简化的只读版本仍将可用。 (<a href="https://meta.discourse.org/t/224747">查看更多信息</a>)
+    browser_update: '很抱歉，<a href="https://www.discourse.org/faq/#browser">您的浏览器不受支持</a>。请<a href="https://browsehappy.com">切换到支持的浏览器</a>查看富内容、登录和回复。'
+    safari_13_warning: 此站点将很快移除对 iOS 和 Safari 13 及以下版本的支持。简化的只读版本将保持可用。（<a href="https://meta.discourse.org/t/224747">更多信息</a>）
     permission_types:
       full: "创建/回复/查看"
       create_post: "回复/查看"
@@ -3323,7 +3333,7 @@ zh_CN:
     preloader_text: "正在加载"
     lightbox:
       download: "下载"
-      open: "原始图像"
+      open: "原始图片"
       previous: "上一个（左方向键）"
       next: "下一个（右方向键）"
       counter: "%curr%/%total%"
@@ -3406,7 +3416,7 @@ zh_CN:
         edit: "%{shortcut} 编辑帖子"
         delete: "%{shortcut} 删除帖子"
         mark_muted: "%{shortcut} 将话题设为免打扰"
-        mark_regular: "%{shortcut} 常规(默认)话题"
+        mark_regular: "%{shortcut} 常规（默认）话题"
         mark_tracking: "%{shortcut} 跟踪话题"
         mark_watching: "%{shortcut} 关注话题"
         print: "%{shortcut} 打印话题"
@@ -3452,8 +3462,8 @@ zh_CN:
       title: "下载日历"
       save_ics: "下载 .ics 文件"
       save_google: "添加到 Google 日历"
-      remember: "不再提醒"
-      remember_explanation: "（您可以在用户偏好设置中更改此配置）"
+      remember: "不再询问"
+      remember_explanation: "（您可以在用户偏好设置中更改此偏好设置）"
       download: "下载"
       default_calendar: "默认日历"
       default_calendar_instruction: "决定保存日期时应使用哪个日历"
@@ -3469,12 +3479,12 @@ zh_CN:
       tags: "标签"
       choose_for_topic: "可选标签"
       choose_for_topic_required:
-        other: "您必须至少选择 %{count} 个标签。"
+        other: "至少选择 %{count} 个标签…"
       choose_for_topic_required_group:
-        other: "从 “%{name}” 中选择 %{count} 个标签..."
+        other: "从 '%{name}' 中选择 %{count} 个标签…"
       info: "信息"
-      default_info: "该标签不限于任何类别，并且没有同义词。"
-      staff_info: "要添加限制，请将此标签放入 <a href=%{basePath}/tag_groups>标签组</a>。"
+      default_info: "此标签不限于任何类别，并且没有同义词。"
+      staff_info: "要添加限制，请将此标签放入<a href=%{basePath}/tag_groups>标签组</a>。"
       category_restricted: "此标签仅限于您无权访问的类别。"
       synonyms: "同义词"
       synonyms_description: "使用以下标签时，它们将被替换为 <b>%{base_tag_name}</b>。"
@@ -3483,7 +3493,7 @@ zh_CN:
         other: "此标签属于以下组：%{tag_groups}。"
       category_restrictions:
         other: "它只能用于以下类别："
-      edit_synonyms: "编辑同义标签"
+      edit_synonyms: "编辑同义词"
       add_synonyms_label: "添加同义词："
       add_synonyms: "添加"
       add_synonyms_explanation:
@@ -3612,34 +3622,34 @@ zh_CN:
       unsupported_file_picked: "您选择了不受支持的文件。支持的文件类型 – %{types}。"
     user_activity:
       no_activity_title: "尚无活动"
-      no_activity_body: "欢迎来到我们的社区！作为新人，你还未参与过讨论。第一步，请访问 <a href='%{topUrl}'>置顶</a>内容 或 <a href='%{categoriesUrl}'>分类</a> 并开始阅读！在你喜欢或想了解更多的帖子上选择 %{heartIcon} 。当你参与时，你的活动将被列在这里。"
+      no_activity_body: "欢迎来到我们的社区！作为新人，您还未参与过讨论。第一步，请访问<a href='%{topUrl}'>热门</a>或<a href='%{categoriesUrl}'>类别</a>并开始阅读！在您喜欢或想详细了解的帖子上选择 %{heartIcon} 。在您参与后，您的活动将被列在此处。"
       no_replies_title: "您还没有回复任何话题"
       no_replies_title_others: "%{username} 还没有回复任何话题"
-      no_replies_body: "当你 <a href='%{searchUrl}'>发现</a> 一个你希望参与的有趣对话时，请直接按下任何帖子下方的 <kbd>回复</kbd> 按钮以开始回复该特定帖子。或者，如果你希望回复一般主题而不是任何个人帖子或个人，请在主题最底部或主题时间线下方按下 <kbd>回复</kbd> 按钮。"
+      no_replies_body: "当您<a href='%{searchUrl}'>发现</a>一个您希望参与的有趣对话时，请直接按任何帖子下方的<kbd>回复</kbd>按钮开始回复该特定帖子。或者，如果您希望回复一般话题而不是任何帖子或个人，请在话题最底部或话题时间线下方查找<kbd>回复</kbd>按钮。"
       no_drafts_title: "您还没有写过任何草稿"
-      no_drafts_body: "还没准备好发布？每当您开始撰写主题、回复或个人消息时，我们都会自动保存新草稿并在此处列出。选择取消按钮放弃或保存您的草稿以供稍后继续。"
+      no_drafts_body: "还没准备好发布？每当您开始撰写话题、回复或个人信息时，我们都会自动保存新草稿并在此处列出。选择取消按钮以舍弃或保存草稿以便稍后继续。"
       no_likes_title: "您还没有赞任何话题"
-      no_likes_title_others: "%{username} 还没有喜欢任何话题"
-      no_likes_body: "加入并开始贡献的一个好方法是阅读已有的主题，并在您喜欢的帖子上点击 %{heartIcon}"
+      no_likes_title_others: "%{username} 还没有赞过任何话题"
+      no_likes_body: "加入并开始贡献的一个好方法是开始阅读已经发生的对话，然后在您喜欢的帖子上选择 %{heartIcon}！"
       no_topics_title: "您还没有开始任何话题"
-      no_topics_body: "在开始一个新的话题之前，最好先用 <a href='%{searchUrl}'>搜索</a> 来查找现有的话题，但如果你确信你想要的话题还没有出现，那就开始一个属于你自己的新话题吧。在话题列表、类别或标签页面的右上方找到 <kbd>+ 新建话题</kbd> 按钮来创建新的话题。"
+      no_topics_body: "在开始新的话题之前，最好先<a href='%{searchUrl}'>搜索</a>对话的现有话题，但如果您确信您想要的话题还没有出现，那就开始一个属于您自己的新话题吧。查找话题列表、类别或标签右上角的 <kbd>+ 新建话题</kbd>按钮，开始在该领域创建新话题。"
       no_topics_title_others: "%{username} 还没有开始任何话题"
       no_read_topics_title: "您还没有阅读任何话题。"
-      no_read_topics_body: "开始阅读讨论后，您将在此处看到一个列表。要开始阅读，请在 <a href='%{topUrl}'>置顶</a> 或 <a href='%{categoriesUrl}'>类别</a> 或按关键字搜索 %{searchIcon}"
+      no_read_topics_body: "开始阅读讨论后，您会在此处看到一个列表。要开始阅读，请在<a href='%{topUrl}'>热门</a>或<a href='%{categoriesUrl}'>类别</a>中或者通过关键字搜索 %{searchIcon}，查找您感兴趣的话题"
     no_group_messages_title: "未找到群组消息"
     topic_entrance:
       sr_jump_top_button: "跳到第一个帖子"
       sr_jump_bottom_button: "跳到最后一个帖子"
     fullscreen_table:
-      expand_btn: "展开表格"
+      expand_btn: "展开表"
     second_factor_auth:
-      redirect_after_success: "双重认证验证成功。重定向到之前的页面…"
+      redirect_after_success: "第二重认证验证成功。正在重定向到之前的页面…"
     sidebar:
       unread_count:
         other: "%{count} 未读"
       new_count:
         other: "%{count} 新"
-      toggle_section: "切换部分"
+      toggle_section: "切换版块"
       more: "更多"
       all_categories: "所有类别"
       all_tags: "所有标签"
@@ -3653,20 +3663,20 @@ zh_CN:
             inbox: "收件箱"
             sent: "已发送"
             new: "新"
-            new_with_count: "新消息 (%{count})"
+            new_with_count: "新 (%{count})"
             unread: "未读"
             unread_with_count: "未读 (%{count})"
             archive: "归档"
         tags:
-          none: "你还没有添加任何标签。"
-          click_to_get_started: "点击这里开始。"
+          none: "您还没有添加任何标签。"
+          click_to_get_started: "点击此处开始。"
           header_link_text: "标签"
-          header_action_title: "编辑您的侧边栏标签"
+          header_action_title: "编辑您的边栏标签"
         categories:
-          none: "你还没有添加任何类别。"
-          click_to_get_started: "点击这里开始。"
+          none: "您还没有添加任何类别。"
+          click_to_get_started: "点击此处开始。"
           header_link_text: "类别"
-          header_action_title: "编辑你的侧边栏类别"
+          header_action_title: "编辑您的边栏类别"
         community:
           header_link_text: "社区"
           header_action_title: "创建新话题"
@@ -3695,14 +3705,14 @@ zh_CN:
               content: "我的帖子"
               title: "我的帖子"
               draft_count:
-                other: "%{count} 草稿"
+                other: "%{count} 个草稿"
             review:
               content: "审核"
               title: "审核"
               pending_count: "%{count} 待处理"
     welcome_topic_banner:
-      title: "创建你的欢迎话题"
-      description: '你的欢迎话题是新来的人首先会读到的东西。可以把它看作是你的一段 "电梯推销 "或 "使命宣言"。'
+      title: "创建您的欢迎话题"
+      description: '您的欢迎话题是新成员首先会阅读的内容。把它想象成您的“电梯推销”或“使命宣言”。让每个人都知道这个社区是为谁服务的，他们可以在这里找到什么，以及您希望他们首先做什么。'
       button_title: "开始编辑"
     until: "直到："
   admin_js:
@@ -3837,7 +3847,7 @@ zh_CN:
               description: "管理员可以看到所有群组。"
             members_visibility_levels:
               title: "谁可以看到此群组的成员？"
-              description: "管理员可以查看所有组的成员。 群组标识对所有用户可见。"
+              description: "管理员可以查看所有群组的成员。 群组标识对所有用户可见。"
             publish_read_state: "在群组消息中发布群组阅读状态"
           membership:
             automatic: 自动
@@ -3847,7 +3857,7 @@ zh_CN:
             automatic_membership_email_domains: "使用与此列表中的电子邮件网域完全匹配的电子邮件网域注册的用户将被自动添加到此群组："
             automatic_membership_user_count:
               other: "%{count} 个用户具有新的电子邮件网域，将被添加到群组中。"
-            automatic_membership_associated_groups: "在这里列出的服务上属于某个组的用户，当他们用此服务登录时，会被自动加入到这个组。"
+            automatic_membership_associated_groups: "作为此处列出的服务的群组成员的用户将在使用该服务登录时自动添加到该群组。"
             primary_group: "自动设置为主要群组"
         name_placeholder: "群组名称，没有空格，与用户名规则相同"
         primary: "主要群组"
@@ -3910,10 +3920,10 @@ zh_CN:
             使用范围时，您可以将一个 API 密钥限制到一组特定的端点。
             您还可以定义允许哪些参数。使用逗号分隔多个值。
           title: 范围
-          granular: Granular
+          granular: 精细
           read_only: 只读
-          global: 全局范围
-          global_description: API 密钥没有限制，所有终端节点均可访问。
+          global: 全局
+          global_description: API 密钥没有限制，所有端点均可访问。
           resource: 资源
           action: 操作
           allowed_parameters: 允许的参数
@@ -3922,11 +3932,11 @@ zh_CN:
           allowed_urls: 允许的 URL
           descriptions:
             global:
-              read: 限制 API 密钥到只读终端节点。
+              read: 将 API 密钥限制为只读端点。
             topics:
               read: 阅读一个话题或其中的一个帖子。也支持 RSS。
               write: 创建一个新话题或发布到现有话题。
-              update: 更新一个话题。更改标题、类别、标签等。
+              update: 更新话题。更改标题、类别、标签等。
               read_lists: 阅读诸如热门、新、最新等话题列表。也支持 RSS。
             posts:
               edit: 编辑任意帖子或特定帖子。
@@ -3934,7 +3944,7 @@ zh_CN:
               list: 获取类别列表。
               show: 通过 id 获取单个类别。
             uploads:
-              create: 上传一个新文件或启动单个或多个部分直接上传至外部存储。
+              create: 上传新文件或启动单部分或多部分直接上传到外部存储。
             users:
               bookmarks: 列出用户书签。使用 ICS 格式时返回书签提醒。
               sync_sso: 使用 DiscourseConnect 同步用户。
@@ -3948,18 +3958,18 @@ zh_CN:
             email:
               receive_emails: 将此范围与邮件收件人结合来处理传入电子邮件。
             badges:
-              create: 创建一个新徽章。
-              show: 获取有关该徽章的信息。
-              update: 更新一个徽章。
-              delete: 删除一个徽章
-              list_user_badges: 列出用户拥有的徽章。
-              assign_badge_to_user: 授予用户徽章。
+              create: 创建新徽章。
+              show: 获取有关徽章的信息。
+              update: 更新徽章。
+              delete: 删除徽章。
+              list_user_badges: 列出用户的徽章。
+              assign_badge_to_user: 向用户授予徽章。
               revoke_badge_from_user: 撤销用户的徽章。
             wordpress:
-              publishing: WP Discourse 插件发布功能所必需的(必需)。
-              commenting: WP Discourse 插件评论功能所必需的。
-              discourse_connect: WP Discourse 插件 DiscourseConnect 功能所必需的。
-              utilities: 如果你使用 WP Discourse 插件工具，则有必要。
+              publishing: WP Discourse 插件发布功能所需（必需）。
+              commenting: WP Discourse 插件评论功能所需。
+              discourse_connect: WP Discourse 插件 DiscourseConnect 功能所需。
+              utilities: 如果您使用 WP Discourse 插件实用程序，则需要。
       web_hooks:
         title: "网络钩子"
         none: "当前没有网络钩子。"
@@ -4269,7 +4279,7 @@ zh_CN:
           install_git_repo: "从 git 仓库"
           install_create: "创建新主题"
           duplicate_remote_theme: "主题组件“%{name}”已安装，确定要安装另一个副本吗？"
-          force_install: "该主题无法安装，因为 Git 仓库无法访问。你确定你要继续安装它吗？"
+          force_install: "该主题无法安装，因为 Git 仓库无法访问。确定要继续安装吗？"
           create_placeholder: "创建占位符"
           about_theme: "关于"
           license: "许可证"
@@ -4293,6 +4303,7 @@ zh_CN:
           has_overwritten_history: "当前主题版本不再存在，因为 Git 历史记录已被强制推送覆盖。"
           add: "添加"
           theme_settings: "主题设置"
+          overriden_settings_explanation: "被覆盖的设置标有一个点并具有突出显示的颜色。要将这些设置重置为默认值，请按它们旁边的重置按钮。"
           no_settings: "此主题没有设置。"
           theme_translations: "主题翻译"
           empty: "无条目"
@@ -4330,11 +4341,11 @@ zh_CN:
 
               强烈建议为属性名称添加前缀以避免与插件和/或核心冲突。
           head_tag:
-            text: "<head>标签"
-            title: "将在 </head> tag 前插入的 HTML"
+            text: "Head"
+            title: "将在 head 标记之前插入的 HTML"
           body_tag:
             text: "正文"
-            title: "将在 </body> tag前插入的 HTML"
+            title: "将在正文标记之前插入的 HTML"
           yaml:
             text: "YAML"
             title: "使用 YAML 格式定义主题设置"
@@ -4432,7 +4443,7 @@ zh_CN:
         time: "时间"
         user: "用户"
         email_type: "电子邮件类型"
-        details_title: "显示电子邮件详情"
+        details_title: "显示电子邮件详细信息"
         to_address: "目标地址"
         test_email_address: "要测试的电子邮件地址"
         send_test: "发送测试电子邮件"
@@ -4450,7 +4461,7 @@ zh_CN:
         last_seen_user: "最后活动："
         no_result: "没有找到摘要的结果。"
         reply_key: "回复键"
-        post_link_with_smtp: "Post 和 SMTP 详细信息"
+        post_link_with_smtp: "POST 和 SMTP 详细信息"
         skipped_reason: "跳过原因"
         incoming_emails:
           from_address: "发件人"
@@ -4701,7 +4712,7 @@ zh_CN:
           upload: "从文件添加"
           upload_successful: "上传成功。关注词已添加。"
           case_sensitivity_label: "是否区分大小写"
-          case_sensitivity_description: "仅适用于与键入关注词大小写一致的词语"
+          case_sensitivity_description: "仅限字符大小写匹配的单词"
         test:
           button_label: "测试"
           modal_title: "%{action}：测试关注词"
@@ -4811,7 +4822,7 @@ zh_CN:
         logged_out: "用户已在所有设备上退出"
         revoke_admin: "撤消管理员权限"
         grant_admin: "授予管理员权限"
-        grant_admin_success: "新管理员已确认。"
+        grant_admin_success: "新管理员已被确认。"
         grant_admin_confirm: "我们已向您发送电子邮件以验证新管理员。请打开它并按照说明进行操作。"
         revoke_moderation: "撤消审核权限"
         grant_moderation: "授予审核权限"
@@ -4853,15 +4864,15 @@ zh_CN:
             title: "删除帖子的进度"
             description: "正在删除帖子…"
           confirmation:
-            title: "删除由 @%{username} 发出的所有帖子"
+            title: "删除 @%{username} 发布的所有帖子"
             description: |
-              <p>您确定要删除由 @%{username} 撰写的 <b>%{post_count}</b> ？
+              <p>确定要删除 @%{username} 发布的 <b>%{post_count}</b> 个帖子吗？
 
-              <p><b>这是无法撤销的！</b></p>
+              <p><b>此操作无法撤消！</b></p>
 
-              <p>请输入： <code>%{text}</code></p>
-            text: "删除由 @%{username} 发出的帖子"
-            delete: "删除由 @%{username} 发出的帖子"
+              <p>继续输入：<code>%{text}</code></p>
+            text: "删除 @%{username} 发布的帖子"
+            delete: "删除 @%{username} 发布的帖子"
             cancel: "取消"
         merge:
           button: "合并"
@@ -4897,8 +4908,8 @@ zh_CN:
           other: "无法删除所有帖子。某些帖子的存在时间超过 %{count} 天。（delete_user_max_post_age 设置。）"
         cant_delete_all_too_many_posts:
           other: "无法删除所有帖子，因为该用户的帖子超过 %{count} 篇。(delete_all_posts_max)"
-        delete_confirm_title: "你确定要删除这个用户吗？这是永久性的!"
-        delete_confirm: "一般来说，最好是对用户进行匿名处理，而不是删除他们，以避免删除现有讨论的内容。"
+        delete_confirm_title: "确定要删除此用户吗？此操作无法撤消！"
+        delete_confirm: "通常最好将用户匿名而不是删除他们，以避免从现有讨论中移除内容。"
         delete_and_block: "删除并<b>禁止</b>该电子邮件和 IP 地址"
         delete_dont_block: "仅删除"
         deleting_user: "正在删除用户…"
@@ -5184,7 +5195,7 @@ zh_CN:
           grant_existing_holders: 向现有徽章持有者授予额外的徽章
       emoji:
         title: "表情符号"
-        help: "添加可供所有人使用的新表情符号。一次拖放多个文件，无需输入名称即可使用文件名创建表情符号。选定的组将被用于同时添加的所有文件。您还可以单击“添加新表情符号”以打开文件选择器。"
+        help: "添加可供所有人使用的新表情符号。一次拖放多个文件，无需输入名称即可使用文件名创建表情符号。所选组将用于同时添加的所有文件。您还可以点击“添加新表情符号”以打开文件选择器。"
         add: "添加新表情符号"
         choose_files: "选择文件"
         uploading: "正在上传…"
@@ -5196,7 +5207,7 @@ zh_CN:
       embedding:
         get_started: "如果您想将 Discourse 嵌入另一个网站，请先添加其主机。"
         confirm_delete: "确定要删除该主机吗？"
-        sample: "将以下 HTML 代码粘贴到您的站点来创建discourse嵌入式话题。将 <b>REPLACE_ME</b> 替换为目标页面的规范 URL。"
+        sample: "将以下 HTML 代码粘贴到您的站点中以创建和嵌入 Discourse 话题。将 <b>REPLACE_ME</b> 替换为您要嵌入它的页面的规范 URL。"
         title: "嵌入"
         host: "允许的主机"
         class_name: "类名"
@@ -5247,11 +5258,11 @@ zh_CN:
           replace: "替换"
   wizard_js:
     wizard:
-      jump_in: "跳进去!"
+      jump_in: "跳转！"
       finish: "退出设置"
       back: "返回"
       next: "下一步"
-      configure_more: "配置更多..."
+      configure_more: "配置更多…"
       step-text: "步骤"
       step: "%{current}/%{total}"
       upload: "上传"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 402bebd7bc..eb7faded6a 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -83,7 +83,7 @@ zh_TW:
         over_x_years:
           other: "超過 %{count} 年"
         almost_x_years:
-          other: "幾乎 %{count} 年"
+          other: "大約 %{count} 年"
         date_year: "YYYY年 M月 D日"
       medium_with_ago:
         x_minutes:
@@ -953,7 +953,16 @@ zh_TW:
       external_links_in_new_tab: "在新分頁中開啟所有外部連結"
       enable_quoting: "允許引用劃記文字"
       experimental_sidebar:
+        enable: "啟用側選單"
         options: "選項"
+        categories_section: "選擇分類"
+        categories_section_instruction: "選定的分類將顯示在側選單的分類段落中。"
+        tags_section: "選擇標籤"
+        tags_section_instruction: "選定的標籤將顯示在側選單的標籤段落中。"
+        navigation_section: "導覽"
+        list_destination_instruction: "當我點擊側選單中包含新主題或未讀主題的列表連結時，帶我前往"
+        list_destination_default: "預設"
+        list_destination_unread_new: "新文章/未讀"
       change: "修改"
       featured_topic: "特色主題"
       moderator: "%{user} 是板主"
@@ -1052,6 +1061,7 @@ zh_TW:
         tags: "標籤"
         interface: "界面"
         apps: "應用"
+        sidebar: "側選單"
       change_password:
         success: "( 寄出的郵件 )"
         in_progress: "( 正在傳送郵件 )"
@@ -1090,9 +1100,9 @@ zh_TW:
         edit: "編輯"
         security_key:
           register: "註冊"
-          edit: "編輯安全金鑰"
+          iphone_default_name: "iPhone"
+          android_default_name: "安卓"
           save: "儲存"
-          edit_description: "安全金鑰名稱"
           name_required_error: "您必須提供安全金鑰名稱"
       change_about:
         title: "修改關於我"
@@ -2702,7 +2712,7 @@ zh_TW:
         getting_started:
           name: 開始
         community:
-          name: 社區
+          name: 社群
         trust_level:
           name: 信任等級
         other:
@@ -2813,13 +2823,16 @@ zh_TW:
         other: "%{count} 個未讀"
       new_count:
         other: "%{count} 近期"
+      toggle_section: "切換選擇"
       more: "更多"
       all_categories: "所有分類"
+      all_tags: "所有標籤"
       sections:
         about:
           header_link_text: "關於"
         messages:
           header_link_text: "訊息"
+          header_action_title: "寫一則個人訊息"
           links:
             inbox: "收件匣"
             sent: "送出"
@@ -2829,11 +2842,20 @@ zh_TW:
             unread_with_count: "未讀 (%{count})"
             archive: "封存"
         tags:
+          none: "您尚未新增任何標籤。"
+          click_to_get_started: "按一下這裡開始。"
           header_link_text: "標籤"
+          header_action_title: "編輯側選單的標籤"
+          configure_defaults: "設定預設值"
         categories:
+          none: "您尚未新增任何類別。"
+          click_to_get_started: "按一下這裡開始。"
           header_link_text: "分類"
+          header_action_title: "編輯側選單的分類"
+          configure_defaults: "設定預設值"
         community:
-          header_link_text: "社區"
+          header_link_text: "社群"
+          header_action_title: "開啟新話題"
           links:
             about:
               content: "關於"
@@ -2841,22 +2863,29 @@ zh_TW:
               content: "管理員"
             badges:
               content: "徽章"
+            everything:
+              content: "所有"
+              title: "所有話題"
             faq:
               content: "常見問答"
             tracked:
               content: "已追蹤"
+              title: "所有追蹤話題"
             groups:
               content: "群組"
               title: "所有群組"
             users:
-              content: "使用者數量"
+              content: "使用者"
+              title: "所有使用者"
             my_posts:
               content: "我的貼文"
+              title: "我的貼文"
               draft_count:
-                other: "%{count}草稿"
+                other: "%{count} 草稿"
             review:
               content: "審核"
               title: "審核"
+              pending_count: "剩餘 %{count}"
   admin_js:
     type_to_filter: "輸入要搜尋的文字..."
     admin:
@@ -3929,6 +3958,7 @@ zh_TW:
           search: "搜索"
           groups: "群組"
           dashboard: "控制面板"
+          sidebar: "側選單"
         secret_list:
           invalid_input: "輸入欄位不能為空或包含垂直字元"
         default_categories:
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index ef9020fb84..72605365aa 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -59,8 +59,6 @@ ar:
     bad_color_scheme: "يتعذَّر تحديث السمة، لوحة الألوان غير صالحة"
     other_error: "حدث خطأ ما في أثناء تحديث السمة"
     ember_selector_error: "عذرًا - غير مسموح باستخدام #ember أو محدِّدات CSS ember-view لأن هذه الأسماء يتم إنشاؤها ديناميكيًا في وقت التشغيل وستتغير بمرور الوقت، مما يؤدي في النهاية إلى تعطُّل CSS. جرِّب محدِّدًا مختلفًا."
-    compile_error:
-      unrecognized_extension: "امتداد الملف غير معروف: %{extension}"
     import_error:
       generic: حدث خطأ في أثناء استيراد هذه السمة
       upload: "خطأ في إنشاء أصل التحميل: %{name}. %{errors}"
@@ -694,7 +692,6 @@ ar:
   staff_category_name: "فريق العمل"
   staff_category_description: "فئة خاصة لمناقشات فريق العمل. تكون الموضوعات مرئية للمسؤولين والمشرفين فقط."
   discourse_welcome_topic:
-    title: "مرحبًا بك في Discourse"
     body: |2
 
       ستكون الفقرة الأولى من هذا الموضوع المثبَّت مرئية كرسالة ترحيب لجميع الزوار الجُدد على صفحتك الرئيسية. إنه مهم!
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 1c3f8e8bd1..6ec89878f7 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -343,8 +343,6 @@ be:
   meta_category_description: "Абмеркаванне гэтага сайта, яго арганізацыя, як яна працуе, і як мы можам палепшыць яго."
   staff_category_name: "персанал"
   staff_category_description: "Асобная катэгорыя для абмеркавання персаналу. Тэмы бачныя толькі адміністратарам і мадэратарам."
-  discourse_welcome_topic:
-    title: "Сардэчна запрашаем у дыскурсе"
   admin_quick_start_title: "READ ME FIRST: Адміністратар Quick Start Guide"
   category:
     topic_prefix: "Аб %{category} катэгорыі"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 2bc7d14c89..8f0e212e25 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -56,8 +56,6 @@ bs_BA:
   themes:
     bad_color_scheme: "Ne može se ažurirati tema, nevažeća paleta boja"
     other_error: "Nešto je krenulo loše pri ažuriranju izgleda teme."
-    compile_error:
-      unrecognized_extension: "Neprepoznata ekstenzija datoteke: %{extension}"
     import_error:
       about_json_values: "o .json sadrži nevažeće vrijednosti: %{errors}"
       git: "Greška prilikom kloniranja git repository-a, pristup je odbijen ili repositroy nije pronađen."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index efdc4a7130..9205e62714 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -56,8 +56,6 @@ ca:
   themes:
     bad_color_scheme: "No es pot actualitzar l'aparença, paleta de colors incorrecta"
     other_error: "S'ha produït un error mentre s'actualitzava l'aparença"
-    compile_error:
-      unrecognized_extension: "Extensió de fitxer no reconeguda: %{extension}"
     import_error:
       about_json_values: "about.json conté valors no vàlids: %{errors}"
       git: "S'ha produït un error clonant el dipòsit git, s'ha denegat l'accés o no s'ha trobat el dipòsit."
@@ -452,7 +450,6 @@ ca:
   staff_category_name: "Equip responsable"
   staff_category_description: "Categoria privada per a converses de l'equip responsable. Els temes només seran visibles per a discussions entre moderadors i administradors."
   discourse_welcome_topic:
-    title: "Benvingut a Discourse"
     body: |2
 
       El primer paràgraf d'aquest tema afixat serà visible com a missatge de benvinguda per a totes les noves visites a la vostra pàgina principal. És important!
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 419e5d8da9..4830c3604c 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -58,8 +58,6 @@ cs:
     bad_color_scheme: "Motiv nelze aktualizovat, neplatná paleta barev"
     other_error: "Něco se pokazilo při aktualizaci skinu (theme)"
     ember_selector_error: "Omlouváme se – použití selektorů CSS #ember nebo .ember-view není povoleno, protože tyto názvy jsou dynamicky generovány za běhu a časem se budou měnit, což nakonec povede k nefunkčnímu CSS. Zkuste jiný selektor."
-    compile_error:
-      unrecognized_extension: "Nerozpoznaná přípona souboru: %{extension}"
     import_error:
       generic: Při importu tohoto motivu došlo k chybě
       upload: "Chyba při vytváření položky pro upload: %{name}. %{errors}"
@@ -364,7 +362,6 @@ cs:
   staff_category_name: "Redakce"
   staff_category_description: "Privátní kategorie pro diskuze redakce. Témata jsou viditelná pouze pro moderátory a správce."
   discourse_welcome_topic:
-    title: "Vítejte v Discourse"
     body: |2
 
       První odstavec tohoto připnutého tématu se zobrazí na domovské stránce jako uvítací zpráva pro všechny nové návštěvníky. Je to důležité!
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 310d8e9012..91e920f6bb 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -58,8 +58,6 @@ da:
     bad_color_scheme: "Kan ikke opdatere tema, ugyldigt farvepalette"
     other_error: "Der opstod en fejl under opdatering af temaet"
     ember_selector_error: "Beklager — brug af #ember eller .ember-view CSS-vælgere er ikke tilladt, da disse navne genereres dynamisk på kørselstidspunktet og ændres over tid, hvilket i sidste ende resulterer i ødelagt CSS. Prøv en anden vælger."
-    compile_error:
-      unrecognized_extension: "Ikke-genkendt filtypenavn: %{extension}"
     import_error:
       generic: Der opstod en fejl under importering af dette tema
       about_json: "Importfejl: about.json eksisterer ikke, eller er ugyldig. Er du sikker på, at dette er et Discourse tema?"
@@ -567,7 +565,6 @@ da:
   staff_category_name: "Personale"
   staff_category_description: "Privat kategori for personale diskussioner. Emner er kun synlige for administratorer og moderatorer."
   discourse_welcome_topic:
-    title: "Velkommen til Discourse"
     body: |2
 
       Det første afsnit af dette fastgjorte emne vil kunne ses som en velkomstbesked for alle nye besøgende på din hjemmeside. Dette er vigtigt!
@@ -1452,7 +1449,6 @@ da:
     google_oauth2_client_id: "Klient ID til din Google application."
     google_oauth2_client_secret: "Klient hemmelighed til din Google-applikation."
     google_oauth2_prompt: "En valgfri mellemrums-afgrænset liste over strengværdier, der specificerer, om godkendelsesserveren beder brugeren om gen-godkendelse og samtykke. Se <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> for de mulige værdier."
-    google_oauth2_hd_groups: "(eksperimentel) Hent brugernes Google-grupper på det hostede domæne ved godkendelse. Hentede Google-grupper kan bruges til at give automatisk Discourse gruppemedlemskab (se gruppeindstillinger)."
     enable_twitter_logins: "Aktivér Twitter-godkendelse, kræver twitter_consumer_key og twitter_consumer_secret. Se <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfiguration af Twitter-login (og rige indlejringer) for Discourse</a>."
     twitter_consumer_key: "Forbrugernøgle til Twitter-godkendelse, registreret på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Forbrugerhemmelighed til Twitter-godkendelse, registreret på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e07be0c18d..0192e02b8f 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -59,8 +59,6 @@ de:
     bad_color_scheme: "Kann Theme nicht aktualisieren, weil die Farbpalette ungültig ist"
     other_error: "Beim Aktualisieren des Themes ist ein Fehler aufgetreten"
     ember_selector_error: "Tut uns leid, die Verwendung von #ember- oder .ember-view-CSS-Selektoren ist nicht zulässig, da diese zur Laufzeit dynamisch generiert werden und sich im Laufe der Zeit ändern werden, was schließlich zu defektem CSS führt. Probiere einen anderen Selektor."
-    compile_error:
-      unrecognized_extension: "Unbekannte Dateiendung: %{extension}"
     import_error:
       generic: Beim Importieren dieses Themes ist ein Fehler aufgetreten
       upload: "Fehler beim Erstellen des Upload-Assets: %{name}. %{errors}"
@@ -73,7 +71,7 @@ de:
       file_too_big: "Die unkomprimierte Datei ist zu groß."
       unknown_file_type: "Die Datei, die du hochgeladen hast, scheint kein gültiges Discourse-Theme zu sein."
       not_allowed_theme: "`%{repo}` ist nicht in der Liste der zulässigen Themes (überprüfe die globale Einstellung `allowed_theme_repos`)."
-      ssh_key_gone: "Du hast zu lange mit der Installation des Themas gewartet und der SSH-Schlüssel ist abgelaufen. Bitte versuche es noch einmal."
+      ssh_key_gone: "Du hast zu lange mit der Installation des Themes gewartet und der SSH-Schlüssel ist abgelaufen. Bitte versuche es noch einmal."
     errors:
       component_no_user_selectable: "Theme-Komponenten können nicht vom Benutzer auswählbar sein"
       component_no_default: "Theme-Komponenten können nicht Standard-Theme sein"
@@ -168,8 +166,8 @@ de:
       emojis_disabled: "kann keine Emojis beinhalten"
       ip_address_already_screened: "wird bereits von einer bestehenden Regel abgedeckt"
       restrict_dependent_destroy:
-        one: "Eintrag kann nicht gelöscht werden, da noch ein davon abhängiger %{record} existiert."
-        other: "Eintrag kann nicht gelöscht werden, da noch davon abhängige %{record} existieren."
+        one: "Eintrag kann nicht gelöscht werden, da noch ein davon abhängiger %{record} existiert"
+        other: "Eintrag kann nicht gelöscht werden, da noch davon abhängige %{record} existieren"
       too_long:
         one: ist zu lang (Maximum ist %{count} Zeichen)
         other: ist zu lang (Maximum sind %{count} Zeichen)
@@ -208,9 +206,9 @@ de:
       local_login_cannot_be_disabled_if_second_factor_enforced: "Du kannst die lokale Anmeldung nicht deaktivieren, wenn 2FA erzwungen wird. Deaktiviere die erzwungene 2FA vor dem Deaktivieren lokaler Anmeldungen."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Du kannst S3-Uploads nicht aktivieren, weil S3-Uploads bereits global aktiviert sind. Aktivieren auf Website-Ebene kann zu kritischen Problemen mit Uploads führen"
       cors_origins_should_not_have_trailing_slash: "Du solltest den abschließenden Schrägstrich (/) nicht zu CORS-Ursprüngen hinzufügen."
-      slow_down_crawler_user_agent_must_be_at_least_3_characters: "Benutzeragenten müssen mindestens 3 Zeichen lang sein, um zu verhindern, dass menschliche Benutzer falsch eingeschätzt werden."
+      slow_down_crawler_user_agent_must_be_at_least_3_characters: "Browserkennungen müssen mindestens 3 Zeichen lang sein, um zu verhindern, dass menschliche Benutzer fälschlicherweise 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 die Strip-Image-Metadaten nicht deaktivieren, wenn \"composer media optimization image enabled\" aktiviert ist. Deaktiviere \"composer media optimization image enabled\", bevor du Strip-Image-Metadaten deaktivierst."
+      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."
       twitter_summary_large_image_no_svg: "Twitter-Zusammenfassungsbilder, die für twitter:image-Metadaten verwendet werden, können keine .svg-Bilder sein."
     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>'
     onebox:
@@ -234,7 +232,7 @@ de:
       <p>Ansonsten kannst du <a href="%{base_url}/password-reset">dein Passwort zurücksetzen</a>.</p>
     not_found_template_link: |
       <p>Diese Einladung zu <a href="%{base_url}">%{site_name}</a> kann nicht mehr eingelöst werden. Bitte die Person, die dich eingeladen hat, dir eine neue Einladung zu schicken.</p>
-    user_exists: "Es ist nicht nötig, <b>%{email}</b>einzuladen, sie haben bereits ein Konto!"
+    user_exists: "Es ist nicht nötig, <b>%{email}</b> einzuladen. Die Person hat bereits ein Konto!"
     invite_exists: "Du hast <b>%{email}</b> bereits eingeladen."
     invalid_email: "%{email} ist keine gültige E-Mail-Adresse."
     rate_limit:
@@ -246,10 +244,10 @@ de:
       discourse_connect_enabled: "Einladungen sind deaktiviert, da DiscourseConnect aktiviert ist."
       invalid_access: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen."
     requires_groups: "Die Einladung wurde nicht gespeichert, weil auf das angegebene Thema nicht zugegriffen werden kann. Füge eine der folgenden Gruppen hinzu: %{groups}."
-    domain_not_allowed: "Diese E-Mail-Adresse kann nicht verwendet werden, um diese Einladung einzulösen."
+    domain_not_allowed: "Deine E-Mail-Adresse kann nicht verwendet werden, um diese Einladung anzunehmen."
     max_redemptions_allowed_one: "für E-Mail-Einladungen sollte es 1 sein."
     redemption_count_less_than_max: "sollte weniger als %{max_redemptions_allowed} sein."
-    email_xor_domain: "E-Mail- und Domänenfelder sind nicht gleichzeitig erlaubt"
+    email_xor_domain: "E-Mail- und Domain-Felder sind nicht gleichzeitig erlaubt"
   bulk_invite:
     file_should_be_csv: "Die hochgeladene Datei sollte im CSV-Format vorliegen."
     max_rows: "Die ersten %{max_bulk_invites} Einladungen wurden versandt. Versuche, die Datei in kleinere Teile aufzuteilen."
@@ -346,8 +344,8 @@ de:
   too_many_links:
     one: "Entschuldige, neue Benutzer können Beiträgen höchstens einen Link hinzufügen."
     other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Links hinzufügen."
-  contains_blocked_word: "Tut mir leid, du kannst das Wort '%{word}' nicht posten; es ist nicht erlaubt."
-  contains_blocked_words: "Sorry, das kannst du nicht posten. Nicht erlaubt: %{words}."
+  contains_blocked_word: "Du kannst das Wort „%{word}“ leider nicht posten; es ist nicht erlaubt."
+  contains_blocked_words: "Leider kannst du das nicht posten. Nicht erlaubt: %{words}."
   spamming_host: "Entschuldige, leider kannst du keinen Link zu diesem Host posten."
   user_is_suspended: "Gesperrte Benutzer dürfen keine Beiträge schreiben."
   topic_not_found: "Etwas ist schiefgelaufen. Wurde das Thema eventuell geschlossen oder gelöscht, während du es angeschaut hast?"
@@ -408,7 +406,7 @@ de:
       cannot_set_reminder_in_distant_future: "Du kannst keine Lesezeichen-Erinnerung einstellen, die mehr als 10 Jahre in der Zukunft liegt."
       time_must_be_provided: "Die Zeit muss für alle Erinnerungen angegeben werden"
       for_topic_must_use_first_post: "Du kannst nur den ersten Beitrag verwenden, um das Thema mit einem Lesezeichen zu versehen."
-      bookmarkable_id_type_required: "Der Name und Typ des Datensatzes, für den ein Lesezeichen erstellt werden soll, ist erforderlich."
+      bookmarkable_id_type_required: "Der Name und Typ des Eintrags, für den ein Lesezeichen erstellt werden soll, ist erforderlich."
       invalid_bookmarkable: "Ein %{type} kann nicht mit einem Lesezeichen versehen werden."
     reminders:
       at_desktop: "Nächstes Mal, wenn ich an meinem PC bin"
@@ -497,8 +495,8 @@ de:
       Du kannst deine letzte Antwort bearbeiten, um ein Zitat hinzuzufügen, indem du den Text auswählst und auf die erscheinende Schaltfläche <b>Zitat</b> klickst.
 
       Es ist für alle einfacher, Themen zu lesen, die wenige umfassende Antworten statt viele kleine und einzelne Antworten haben.
-    dominating_topic: Du hast mehr als %{percent}% der Antworten hier gepostet, gibt es noch jemanden, von dem du gerne hören würdest?
-    get_a_room: Du hast @%{reply_username} %{count} mal geantwortet, wusstest du, dass du der Person stattdessen eine persönliche Nachricht schicken kannst?
+    dominating_topic: Du hast mehr als %{percent} % der Antworten hier gepostet. Gib anderen doch auch die Möglichkeit, etwas beizutragen.
+    get_a_room: Du hast @%{reply_username} %{count} Mal geantwortet. Wusstest du, dass du der Person stattdessen eine persönliche Nachricht schicken kannst?
     too_many_replies: |
       ### Du hast das Antwort-Limit für dieses Thema erreicht
 
@@ -608,7 +606,7 @@ de:
   staff_category_name: "Team"
   staff_category_description: "Private Kategorie für Team-Diskussionen. Themen sind nur für Administratoren und Moderatoren sichtbar."
   discourse_welcome_topic:
-    title: "Willkommen bei Discourse"
+    title: "Willkommen in unserer Community!"
     body: |2
 
       Der erste Absatz dieses angehefteten Themas wird allen neuen Besuchern als Begrüßungsnachricht angezeigt. Er ist wichtig!
@@ -656,10 +654,10 @@ de:
   post:
     image_placeholder:
       broken: "Dieses Bild ist beschädigt"
-      blocked_hotlinked_title: "Das Bild befindet sich auf einer anderen Website. Anklicken, um es in einem neuen Tab zu öffnen."
+      blocked_hotlinked_title: "Das Bild wird auf einer anderen Website gehostet. Anklicken, um es in einer neuen Registerkarte zu öffnen."
       blocked_hotlinked: "Externes Bild"
     media_placeholder:
-      blocked_hotlinked_title: "Die Medien werden auf einer anderen Website gehostet. Anklicken, um in einem neuen Tab zu öffnen."
+      blocked_hotlinked_title: "Die Medien werden auf einer anderen Website gehostet. Anklicken, um sie in einer neuen Registerkarte zu öffnen."
       blocked_hotlinked: "Externe Medien"
     hidden_bidi_character: "Bidirektionale Zeichen können die Reihenfolge ändern, in der der Text gerendert wird. Dies könnte dazu genutzt werden, bösartigen Code zu verschleiern."
     has_likes:
@@ -1333,24 +1331,24 @@ de:
         mutes_count: Anzahl stummgeschaltet
       description: "Benutzer, die von vielen anderen Benutzern stummgeschaltet und/oder ignoriert wurden."
     top_users_by_likes_received:
-      title: "Top-Benutzer nach erhaltenen Likes"
+      title: "Top-Benutzer nach erhaltenen „Gefällt mir“"
       labels:
         user: Benutzer
         qtt_like: Erhaltene „Gefällt mir“
-      description: "Top 10 Benutzer, die Likes erhalten haben."
+      description: "Top-10-Benutzer, die „Gefällt mir“ erhalten haben."
     top_users_by_likes_received_from_inferior_trust_level:
-      title: "Top-Benutzer nach Likes, die von einem Benutzer mit einer niedrigeren Vertrauensstufe erhalten wurden"
+      title: "Top-Benutzer nach „Gefällt mir“, die von einem Benutzer mit einer niedrigeren Vertrauensstufe erhalten wurden"
       labels:
         user: Benutzer
         trust_level: Vertrauensstufe
         qtt_like: Erhaltene „Gefällt mir“
-      description: "Top 10 Benutzer mit einer höheren Vertrauensstufe, die von Personen mit einer niedrigeren Vertrauensstufe gemocht werden."
+      description: "Top-10-Benutzer mit einer höheren Vertrauensstufe, die „Gefällt mir“ von Personen mit einer niedrigeren Vertrauensstufe erhalten haben."
     top_users_by_likes_received_from_a_variety_of_people:
-      title: "Top-Benutzer nach Likes, die von einer Vielzahl von Personen erhalten wurden"
+      title: "Top-Benutzer nach „Gefällt mir“, die von einer Vielzahl von Personen erhalten wurden"
       labels:
         user: Benutzer
         qtt_like: Erhaltene „Gefällt mir“
-      description: "Top 10 Benutzer, die von einer Vielzahl von Leuten Likes bekommen haben."
+      description: "Top-10-Benutzer, die von einer Vielzahl von Personen „Gefällt mir“ erhalten haben."
   dashboard:
     group_email_credentials_warning: '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}'
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
@@ -1401,8 +1399,8 @@ de:
     min_personal_message_title_length: "Minimal zulässige Zeichenanzahl für den Titel von Nachrichten."
     max_emojis_in_title: "Maximal erlaubte Emoji-Anzahl in Thementiteln"
     min_search_term_length: "Minimal zulässige Länge eines Suchbegriffs in Zeichen."
-    search_tokenize_chinese: "Suche erzwingen, um Chinesisch auch auf nicht chinesischen Websites zu kennzeichnen"
-    search_tokenize_japanese: "Suche erzwingen, um Japanisch auch auf nicht japanischen Websites zu kennzeichnen"
+    search_tokenize_chinese: "Tokenisierung von Chinesisch bei der Suche auch auf nicht chinesischen Websites erzwingen"
+    search_tokenize_japanese: "Tokenisierung von Japanisch bei der Suche auch auf nicht japanischen Websites erzwingen"
     search_prefer_recent_posts: "Wenn das Durchsuchen deines großen Forums langsam ist, dann versucht es diese Option zuerst mit einem Index der letzten Beiträge."
     search_recent_posts_size: "Anzahl aktueller Beiträge im Index"
     log_search_queries: "Protokolliere Suchanfragen von Benutzern"
@@ -1422,11 +1420,11 @@ de:
     contact_email: "E-Mail-Adresse einer verantwortlichen Person für diese Website. Wird verwendet für kritische Benachrichtigungen und unter <a href='%{base_path}/about' target='_blank'>/about</a> für dringende Anfragen angezeigt."
     contact_url: "Kontakt-URL für diese Website. Wird auf der Seite <a href='%{base_path}/about' target='_blank'>/about</a> für dringende Anliegen angezeigt."
     crawl_images: "Lade Bilder von fremden URLs herunter, um ihre Höhe und Breite zu bestimmen."
-    download_remote_images_to_local: "Konvertiere externe (mit Hotlinks versehene) Bilder in lokale Bilder, indem du sie herunterlädst; so bleibt der Inhalt erhalten, auch wenn die Bilder in Zukunft von der verlinkten Seite entfernt werden."
+    download_remote_images_to_local: "Externe (per Hotlink aufgerufene) Bilder in lokale Bilder konvertieren, indem sie heruntergeladen werden; so bleibt der Inhalt erhalten, auch wenn die Bilder in Zukunft von der externen Website entfernt werden."
     download_remote_images_threshold: "Minimal benötigter freier Festplattenspeicher, um externe Bilder lokal herunterzuladen (in Prozent)"
     disabled_image_download_domains: "Durch senkrechte Striche („|“) getrennte Liste von Domains, von denen verlinkte Bilder niemals heruntergeladen werden sollen."
-    block_hotlinked_media: "Verhindert, dass Benutzer extrene (Hotlinked) Medien in ihren Beiträgen einfügen. Externe Medien, die nicht über 'download_remote_images_to_local' heruntergeladen werden, werden durch einen Platzhalter-Link ersetzt."
-    block_hotlinked_media_exceptions: "Eine Liste von Basis-URLs, die von der Einstellung block_hotlinked_media ausgenommen sind. Füge das Protokoll hinzu (z.B. https://example.com)."
+    block_hotlinked_media: "Verhindert, dass Benutzer extrene (per Hotline aufgerufene) Medien in ihren Beiträgen einfügen. Externe Medien, die nicht über „download_remote_images_to_local“ heruntergeladen werden, werden durch einen Platzhalter-Link ersetzt."
+    block_hotlinked_media_exceptions: "Eine Liste von Basis-URLs, die von der Einstellung block_hotlinked_media ausgenommen sind. Protokoll muss angegeben werden (z. B. https://example.com)."
     editing_grace_period: "Für (n) Sekunden nach dem Schreiben wird durch die Bearbeitung keine neue Version im Beitragsverlauf erstellt."
     editing_grace_period_max_diff: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 0 und 1)"
     editing_grace_period_max_diff_high_trust: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 2 und höher)"
@@ -1435,7 +1433,7 @@ de:
     tl2_post_edit_time_limit: "Verfasser der Vertrauensstufen 2 und höher können ihre Beiträge (n) Minuten nach dem Schreiben noch ändern. 0 bedeutet immer."
     edit_history_visible_to_public: "Erlaube jedem, vorherige Versionen eines bearbeiteten Beitrags zu sehen. Wenn deaktiviert, sind diese nur für Team-Mitglieder sichtbar."
     delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird."
-    notify_users_after_responses_deleted_on_flagged_post: "Wenn ein Beitrag markiert und dann entfernt wird, werden alle Benutzer, die auf den Beitrag geantwortet haben und deren Antworten entfernt wurden, benachrichtigt."
+    notify_users_after_responses_deleted_on_flagged_post: "Wenn ein Beitrag gemeldet und dann entfernt wird, werden alle Benutzer, die auf den Beitrag geantwortet haben und deren Antworten entfernt wurden, benachrichtigt."
     max_image_width: "Maximale Breite von Vorschaubildern in einem Beitrag."
     max_image_height: "Maximale Höhe von Vorschaubildern in einem Beitrag."
     responsive_post_image_sizes: "Ändere die Größe der Lightbox-Vorschaubilder, um High-DPI-Bildschirme mit den folgenden Pixelverhältnissen zu ermöglichen. Entferne alle Werte, um responsive Bilder zu deaktivieren."
@@ -1448,8 +1446,8 @@ de:
     show_pinned_excerpt_mobile: "Zeige einen Auszug angehefteter Themen in der mobilen Ansicht."
     show_pinned_excerpt_desktop: "Zeige einen Auszug angehefteter Themen in der Desktop-Ansicht."
     post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen."
-    blocked_onebox_domains: "Eine Liste von Domains, die niemals in einer Onebox untergebracht werden, z.B. wikipedia.org\n(Wildcard-Symbole * ? nicht unterstützt)"
-    block_onebox_on_redirect: "Blockiere Onebox für URLs, die umleiten."
+    blocked_onebox_domains: "Eine Liste von Domains, die niemals in einer Onebox untergebracht werden, z. B. wikipedia.org\n(Wildcard-Symbole * ? werden nicht unterstützt)"
+    block_onebox_on_redirect: "Onebox für weiterleitende URLs blockieren."
     allowed_inline_onebox_domains: "Eine Liste von Domains, die in verkleinerter Form in eine Onebox umgewandelt werden, wenn sie ohne Titel verlinkt werden"
     enable_inline_onebox_on_all_domains: "Ignoriere die Website-Einstellung `inline_onebox_domain_allowlist` und erlaube Inline-Oneboxen für alle Domains"
     force_custom_user_agent_hosts: "Hosts, bei denen der spezifische Onebox-Useragent für alle Anfragen genutzt wird. (Besonders hilfreich bei Hosts, die Zugriffe per Useragent limitieren.)"
@@ -1468,22 +1466,22 @@ de:
     favicon: "Ein Favicon für die Website, siehe <a href='https://de.wikipedia.org/wiki/Favicon' target='_blank'>https://de.wikipedia.org/wiki/Favicon</a>. Damit es auch über eine CDN richtig funktioniert, muss es ein PNG sein. Wird auf eine Größe von 32 x 32 gesetzt. Falls leer, wird large_icon verwendet."
     apple_touch_icon: "Icon für Apple-Touch-Geräte. Wird automatisch auf eine Größe von 180 x 180 gesetzt. Falls leer, wird large_icon verwendet."
     opengraph_image: "Standard-Opengraph-Bild. Wird verwendet, wenn die Seite kein anderes passendes Bild hat. Falls leer, wird large_icon verwendet."
-    twitter_summary_large_image: "Twitter-Karte \"Zusammenfassung großes Bild\" (sollte mindestens 280 in der Breite und mindestens 150 in der Höhe sein, kann nicht .svg sein). Wenn das Feld leer gelassen wird, werden die regulären Metadaten der Karte aus dem opengraph_image generiert, sofern es sich nicht ebenfalls um eine .svg-Datei handelt."
+    twitter_summary_large_image: "Twitter-Karte „summary large image“ (sollte mindestens 280 Pixel in der Breite und mindestens 150 Pixel in der Höhe sein, keine .svg-Datei). Wenn das Feld leer gelassen wird, werden die regulären Metadaten der Karte aus dem opengraph_image generiert, sofern es sich nicht ebenfalls um eine .svg-Datei handelt"
     notification_email: "Die E-Mail-Adresse, die als „from:“-Absender aller wichtigen System-E-Mails benutzt wird. Die angegebene Domain sollte über korrekte SPF-, DKIM- und Reverse-PTR-Einträge verfügen, damit E-Mails sicher zugestellt werden können."
     email_custom_headers: "Eine durch senkrechte Striche („|“) getrennte Liste von eigenen E-Mail-Headern"
     email_subject: "Anpassbares Betreff-Format für Standard-E-Mails. Siehe <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "Liefert mehr Details für Benutzer darüber, warum sie keinen Zugriff auf ein spezielles Thema haben. Hinweis: Dies ist weniger sicher, weil Benutzer so herausfinden, ob eine URL zu einem existierenden Thema führt."
     enforce_second_factor: "Zwingt die Benutzer, die Zwei-Faktor-Authentifizierung zu aktivieren. Wähle „all“, um sie für alle Benutzer zu erzwingen. Wähle „staff“, um sie nur für Team-Mitglieder zu erzwingen."
     force_https: "Erzwinge HTTPS für deine Website. ACHTUNG: Aktiviere dies NICHT, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du dein CDN, alle Anmeldungen über soziale Netzwerke, alle externe Logos/Abhängigkeiten geprüft, um sicherzustellen, dass sie auch HTTPS-kompatibel sind?"
-    same_site_cookies: "Verwenden Sie dieselben Site-Cookies, sie eliminieren alle Cross Site Request Forgery-Vektoren in unterstützten Browsern (Lax oder Strict). Warnung: Strict funktioniert nur auf Websites, die eine Anmeldung erzwingen und eine externe Authentifizierungsmethode verwenden."
+    same_site_cookies: "Same-Site-Cookies verwenden, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern („Lax“ oder „Strict“). Warnung: „Strict“ wird nur auf Websites funktionieren, die eine Anmeldung erzwingen und eine externe Authentifizierungsmethode verwenden."
     summary_score_threshold: "Mindestscore, den ein Beitrag benötigt, um in der „Dieses Thema zusammenfassen“-Ansicht zu erscheinen."
     summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert wird. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
     summary_likes_required: "Mindestanzahl an „Gefällt mir“ in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert wird. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
     summary_percent_filter: "Zeige die Top-% der Beiträge eines Themas in der „Dieses Thema zusammenfassen“-Ansicht."
     summary_max_results: "Maximale Anzahl der Beiträge in der „Dieses Thema zusammenfassen“-Ansicht"
-    summary_timeline_button: "Schaltfläche \"Zusammenfassen\" in der Zeitleiste anzeigen"
-    enable_personal_messages: "VERALTET, nutze stattdessen nun die Einstellung \"Gruppen mit aktivierten persönlichen Nachrichten\". \nErlaube Benutzern mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten senden kann."
-    personal_message_enabled_groups: "Erlaube Nutzern innerhalb dieser Gruppen, Nachrichten zu erstellen und auf Nachrichten zu antworten. Vertrauensstufengruppen schließen alle Vertrauensstufen über dieser Nummer ein. Wenn du z.B. Vertrauensstufe 1 auswählst, können auch Benutzer der Vertrauensstufen 2, 3 und 4 PMs versenden. Beachte, dass Mitarbeiter/innen immer Nachrichten senden können, egal welche Stufe sie wählen."
+    summary_timeline_button: "Schaltfläche „Zusammenfassen“ in der Zeitleiste anzeigen"
+    enable_personal_messages: "VERALTET, stattdessen die Einstellung „personal message enabled groups“ verwenden. Benutzern mit Vertrauensstufe 1 erlauben (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Team-Mitglieder können immer Nachrichten senden."
+    personal_message_enabled_groups: "Benutzern innerhalb dieser Gruppen erlauben, Nachrichten zu erstellen und auf Nachrichten zu antworten. Vertrauensstufengruppen umfassen alle Vertrauensstufen über dieser Nummer, zum Beispiel erlaubt die Wahl von trust_level_1 auch Benutzern mit trust_level_2, 3, 4 private Nachrichten zu senden. Team-Mitglieder können immer Nachrichten senden."
     enable_system_message_replies: "Erlaube Benutzern, auf Systemnachrichten zu antworten, auch wenn persönliche Nachrichten deaktiviert sind"
     enable_chunked_encoding: "Aktiviere „chunked encoding“-Antworten durch den Server. Diese Funktion ist mit den meisten Set-ups kompatibel, aber einige Proxys können puffern, wodurch die Antworten verzögert werden"
     long_polling_base_url: "Basis-URL für Long Polling (wenn zum Ausliefern von dynamischen Inhalten ein CDN verwendet wird, setze dies auf Origin-Pull), z. B. http://origin.site.com"
@@ -1502,9 +1500,9 @@ de:
     tl2_additional_edits_per_day_multiplier: "Erhöhe das Limit der Bearbeitungen pro Tag für Benutzer mit Vertrauensstufe 2 (Mitglied) durch Multiplikation mit dieser Zahl"
     tl3_additional_edits_per_day_multiplier: "Erhöhe das Limit der Bearbeitungen pro Tag für Benutzer mit Vertrauensstufe 3 (Stammgast) durch Multiplikation mit dieser Zahl"
     tl4_additional_edits_per_day_multiplier: "Erhöhe das Limit der Bearbeitungen pro Tag für Benutzer mit Vertrauensstufe 4 (Anführer) durch Multiplikation mit dieser Zahl"
-    tl2_additional_flags_per_day_multiplier: "Erhöhe das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 2 (Mitglied) durch Multiplikation mit dieser Zahl"
-    tl3_additional_flags_per_day_multiplier: "Erhöhe das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 3 (Stammgast) durch Multiplikation mit dieser Zahl"
-    tl4_additional_flags_per_day_multiplier: "Erhöhe das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 4 (Anführer) durch Multiplikation mit dieser Zahl"
+    tl2_additional_flags_per_day_multiplier: "Das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 2 (Mitglied) durch Multiplikation mit dieser Zahl erhöhen"
+    tl3_additional_flags_per_day_multiplier: "Das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 3 (Stammgast) durch Multiplikation mit dieser Zahl erhöhen"
+    tl4_additional_flags_per_day_multiplier: "Das Limit der „Meldungen“ pro Tag für Benutzer mit Vertrauensstufe 4 (Anführer) durch Multiplikation mit dieser Zahl erhöhen"
     num_users_to_silence_new_user: "Wenn die Beiträge eines neuen Benutzers num_spam_flags_to_silence_new_user Spam-Meldungen von so vielen verschiedenen Benutzern erhalten, werden alle Beiträge des Benutzers versteckt und zukünftige Beiträge verhindert. 0 zum Deaktivieren."
     num_tl3_flags_to_silence_new_user: "Wenn die Beiträge eines neuen Benutzers so viele Meldungen von num_tl3_users_to_silence_new_user verschiedenen Benutzern mit Vertrauensstufe 3 erhalten, werden alle Beiträge des Benutzers versteckt und zukünftige Beiträge verhindert. 0 zum Deaktivieren."
     num_tl3_users_to_silence_new_user: "Wenn die Beiträge eines neuen Benutzers num_tl3_flags_to_silence_new_user Meldungen von so vielen verschiedenen Benutzern mit Vertrauensstufe 3 erhalten, werden alle Beiträge des Benutzers versteckt und zukünftige Beiträge verhindert. 0 zum Deaktivieren."
@@ -1530,7 +1528,7 @@ de:
     gtm_container_id: "Google-Tag-Manager-Container-ID. Zum Beispiel: GTM-ABCDEF. <br/>Hinweis: Skripte von Drittanbietern, die von GTM geladen werden, müssen unter Umständen in der Liste „content security policy script src“ erlaubt werden (Positivliste)."
     enable_escaped_fragments: "Auf die Ajax-Crawling-API von Google zurückgreifen, wenn kein Webcrawler gefunden wird. Siehe <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_and_groups: "Moderatoren erlauben, Kategorien und Gruppen zu erstellen und zu verwalten"
-    moderators_change_post_ownership: "Moderatoren erlauben, die Inhaberschaft des Beitrags zu ändern"
+    moderators_change_post_ownership: "Moderatoren erlauben, die Eigentümerschaft des Beitrags zu ändern"
     cors_origins: "Erlaubte Adressen für Cross-Origin-Requests (CORS). Jede Adresse muss http:// oder https:// enthalten. Die Umgebungsvariable DISCOURSE_ENABLE_CORS muss gesetzt sein, um CORS zu aktivieren."
     use_admin_ip_allowlist: "Administratoren können sich nur anmelden, wenn sie eine IP-Adresse nutzen, die in der Liste der gefilterten IPs definiert ist (Administration > Protokolle > Gefilterte IPs)."
     blocked_ip_blocks: "Eine Liste von privaten IP-Blöcken, die nie von Discourse indiziert werden sollen"
@@ -1539,7 +1537,7 @@ de:
     allowed_iframes: "Eine Liste von iframe-src-Domain-Präfixen, die Discourse in Beiträgen sicher erlauben kann."
     allowed_crawler_user_agents: "Browserkennungen von Webcrawlern, denen der Zugriff auf die Website erlaubt sein soll. WARNUNG! DIESE EINSTELLUNG BLOCKIERT ALLE HIER NICHT GELISTETEN CRAWLER!"
     blocked_crawler_user_agents: "Eindeutiges Wort unter Vernachlässigung der Groß- und Kleinschreibung in der Zeichenfolge der Browserkennung, das Webcrawler identifiziert, die nicht auf die Website zugreifen dürfen. Gilt nicht, wenn die Positivliste definiert ist."
-    slow_down_crawler_user_agents: 'Benutzeragenten von Web-Crawlern, die wie in der Einstellung "Crawler-Rate verlangsamen" konfiguriert, begrenzt werden sollen. Jeder Wert muss mindestens 3 Zeichen lang sein.'
+    slow_down_crawler_user_agents: 'Browserkennungen von Webcrawlern, die wie in der Einstellung „slow down crawler rate“ konfiguriert, einer Durchsatzratenbegrenzung unterworfen werden sollen. Jeder Wert muss mindestens 3 Zeichen lang sein.'
     slow_down_crawler_rate: "Wenn slow_down_crawler_user_agents ausgewählt ist, wird diese Anfragenbegrenzung auf alle Crawler angewendet (Anzahl der Sekunden zwischen zwei Anfragen)"
     content_security_policy: "Aktiviere Content-Security-Policy"
     content_security_policy_report_only: "Aktiviere Content-Security-Policy-Report-Only"
@@ -1551,7 +1549,7 @@ de:
     post_menu: "Legt fest, welche Funktionen in welcher Reihenfolge im Beitragsmenü auftauchen. Beispiel: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Die Einträge im Menü eines Beitrags, die standardmäßig hinter einer erweiterbaren Ellipse versteckt werden sollen."
     share_links: "Legt fest, welche Dienste in welcher Reihenfolge im Teilen-Dialog auftauchen."
-    allow_username_in_share_links: "Erlaube Benutzernamen in Freigabelinks zu verwenden. Dies ist nützlich, um Abzeichen für einzelne Besucher zu vergeben."
+    allow_username_in_share_links: "Benutzernamen in Freigabelinks erlauben. Dies ist nützlich, um Abzeichen für einzelne Besucher zu vergeben."
     site_contact_username: "Gültiger Benutzername eines Team-Mitglieds, in dessen Namen alle automatisch erzeugten Nachrichten versendet werden sollen. Falls leer, wird das Standard-System-Konto verwendet."
     site_contact_group_name: "Ein gültiger Name einer Gruppe, die zu allen automatisch versendeten privaten Nachrichten eingeladen wird."
     send_welcome_message: "Sende allen neuen Benutzern eine Begrüßungsnachricht mit einer Kurzanleitung."
@@ -1559,7 +1557,7 @@ de:
     send_tl2_promotion_message: "Sende neuen Benutzern der Vertrauensstufe 2 eine Nachricht über die Beförderung."
     suppress_reply_directly_below: "Zeige die erweiterbare Anzahl der Antworten auf einen Beitrag nicht, falls die einzige Antwort direkt darunter folgt."
     suppress_reply_directly_above: "Zeige das erweiterbare Element „In Antwort auf“ bei einem Beitrag nicht an, wenn es nur eine einzige Antwort direkt über diesem Beitrag gibt."
-    remove_full_quote: "Automatisches Entfernen von Zitaten, wenn sie (a) am Anfang eines Beitrags stehen, (b) aus einem ganzen Beitrag stammen und (c) aus dem unmittelbar vorangegangenen Beitrag stammen. Für Details, siehe <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>Entfernung von vollständigen Zitaten aus direkten Antworten</a>"
+    remove_full_quote: "Zitat automatisch entfernen, wenn es (a) am Anfang eines Beitrags steht, (b) einen ganzen Beitrag umfasst und (c) aus dem unmittelbar vorangegangenen Beitrag stammt. Für Details, siehe <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>Entfernung von vollständigen Zitaten aus direkten Antworten</a>"
     suppress_reply_when_quoting: "Zeige das erweiterbare Element „In Antwort auf“ bei einem Beitrag nicht an, wenn der Beitrag den beantworteten Beitrag zitiert."
     max_reply_history: "Maximale Anzahl an Antworten beim Ausklappen von „In Antwort auf“"
     topics_per_period_in_top_summary: "Anzahl der Themen, die in der Standard-Zusammenfassung der angesagten Themen angezeigt werden."
@@ -1574,13 +1572,13 @@ de:
     enable_badges: "Abzeichen aktivieren"
     max_favorite_badges: "Maximale Anzahl von Abzeichen, die der Benutzer auswählen kann"
     enable_whispers: "Erlaube dem Team private Kommunikation innerhalb von Themen."
-    whispers_allowed_groups: "Erlaube private Kommunikation innerhalb von Themen für Mitglieder bestimmter Gruppen."
+    whispers_allowed_groups: "Private Kommunikation innerhalb von Themen für Mitglieder bestimmter Gruppen erlauben."
     allow_index_in_robots_txt: "Lege in der robots.txt fest, dass diese Website von Websuchmaschinen indiziert werden darf. In Ausnahmefällen kannst du die <a href='%{base_path}/admin/customize/robots'>robots.txt dauerhaft überschreiben</a>."
     blocked_email_domains: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten nicht verwendet werden dürfen. Beispiel: mailinator.com|trashmail.net"
     allowed_email_domains: "Eine durch senkrechte Striche („|“) getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten verwendet werden können. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains werden nicht zugelassen!"
-    normalize_emails: "Überprüfe, ob normalisierte E-Mails eindeutig sind. Normalisierte E-Mail entfernt alle Punkte aus dem Benutzernamen und alles zwischen + und @ Symbolen."
+    normalize_emails: "Überprüfen, ob normalisierte E-Mail-Adressen einzigartig sind. Bei normalisierten E-Mail-Adressen werden alle Punkte aus dem Benutzernamen und alles zwischen + und @ Symbolen entfernt."
     auto_approve_email_domains: "Benutzer mit E-Mail-Adressen aus dieser Liste von Domains werden automatisch genehmigt."
-    hide_email_address_taken: "Informiere Benutzer beim Anmelden oder Passwort-Zurücksetzen nicht über ein bereits bestehendes Konto mit dieser E-Mail-Adresse. Benötigt die Angabe vollständiger E-Mail-Adressen zum Passwort-Zurücksetzen."
+    hide_email_address_taken: "Benutzer beim Registrieren oder Passwort-Zurücksetzen nicht über ein bereits bestehendes Konto mit dieser E-Mail-Adresse informieren. Erfordert die Angabe vollständiger E-Mail-Adressen zum Passwort-Zurücksetzen."
     log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden"
     version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen im <a href='%{base_path}/admin' target='_blank'>/admin</a>-Dashboard an."
     new_version_emails: "Sende eine E-Mail an die contact_email-Adresse, wenn eine neue Version von Discourse verfügbar ist."
@@ -1609,11 +1607,11 @@ de:
     auth_overrides_email: "Überschreibt lokale E-Mail bei jeder Anmeldung mit externer Website-E-Mail und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Aufgrund der Normalisierung lokaler E-Mails können Abweichungen auftreten.)"
     auth_overrides_username: "Überschreibt den lokalen Benutzernamen bei jeder Anmeldung mit dem Benutzernamen der externen Website und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Abweichungen können aufgrund unterschiedlicher Länge/Anforderungen des Benutzernamens auftreten.)"
     auth_overrides_name: "Überschreibt bei jeder Anmeldung den lokalen vollständigen Namen mit dem vollständigen Namen der externen Website und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter."
-    discourse_connect_overrides_avatar: "Überschreibt den Benutzeravatar mit dem Wert aus der DiscourseConnect-Payload. Wenn diese Option aktiviert ist, dürfen Benutzer keine Avatare auf Discourse hochladen."
-    discourse_connect_overrides_location: "Überschreibt den Benutzerstandort mit dem Wert aus der DiscourseConnect-Payload und verhindert lokale Änderungen."
-    discourse_connect_overrides_website: "Überschreibt die Benutzer-Website mit dem Wert aus der DiscourseConnect-Payload und verhindert lokale Änderungen."
-    discourse_connect_overrides_profile_background: "Überschreibt den Hintergrund des Benutzerprofils mit dem Wert aus der DiscourseConnect-Payload."
-    discourse_connect_overrides_card_background: "Überschreibt den Hintergrund der Benutzerkarte mit dem Wert aus der DiscourseConnect-Payload."
+    discourse_connect_overrides_avatar: "Überschreibt den Benutzeravatar mit dem Wert aus dem DiscourseConnect-Payload. Wenn diese Option aktiviert ist, dürfen Benutzer keine Avatare bei Discourse hochladen."
+    discourse_connect_overrides_location: "Überschreibt den Benutzerstandort mit dem Wert aus dem DiscourseConnect-Payload und verhindert lokale Änderungen."
+    discourse_connect_overrides_website: "Überschreibt die Benutzer-Website mit dem Wert aus dem DiscourseConnect-Payload und verhindert lokale Änderungen."
+    discourse_connect_overrides_profile_background: "Überschreibt den Hintergrund des Benutzerprofils mit dem Wert aus dem DiscourseConnect-Payload."
+    discourse_connect_overrides_card_background: "Überschreibt den Hintergrund der Benutzerkarte mit dem Wert aus dem DiscourseConnect-Payload."
     discourse_connect_not_approved_url: "Nicht genehmigte DiscourseConnect-Konten zu dieser URL weiterleiten"
     discourse_connect_allows_all_return_paths: "Beschränke die von DiscourseConnect bereitgestellte Domain für return_paths nicht (standardmäßig muss der Return-Path auf der aktuellen Website liegen)"
     enable_local_logins: "Aktiviert lokale Konten mit Anmeldung über Benutzername und Passwort. WARNUNG: Wenn deaktiviert, kannst du dich möglicherweise nicht mehr anmelden, wenn du nicht vorher mindestens eine alternative Anmeldemethode konfiguriert hast."
@@ -1625,7 +1623,6 @@ de:
     google_oauth2_client_secret: "Client-Geheimnis deiner Google-Anwendung."
     google_oauth2_prompt: "Eine optionale, durch Leerzeichen getrennte Liste von String-Werten, die angibt, ob der Autorisierungsserver den Benutzer zur erneuten Authentifizierung und Zustimmung auffordert. Siehe <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> für die möglichen Werte."
     google_oauth2_hd: "Eine optionale, bei Google Apps gehostete Domain, auf welche die Anmeldung beschränkt wird. Siehe <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> für weitere Details."
-    google_oauth2_hd_groups: "(experimentell) Rufe die Google-Gruppen der Nutzer der gehosteten Domain bei der Authentifizierung ab. Die abgerufenen Google-Gruppen können verwendet werden, um die automatische Mitgliedschaft in Discourse-Gruppen zu gewähren (siehe Gruppeneinstellungen)."
     enable_twitter_logins: "Twitter-Authentifizierung aktivieren, erfordert twitter_consumer_key und twitter_consumer_secret. Siehe <a href='https://meta.discourse.org/t/13395' target='_blank'>Twitter-Anmeldung (und Rich Embeds) für Discourse konfigurieren</a>."
     twitter_consumer_key: "Consumer-Key für Twitter-Authentifizierung, registriert unter <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Consumer-Secret für Twitter-Authentifizierung, registriert unter <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -1640,7 +1637,7 @@ de:
     discord_secret: "Discord-Secret-Key"
     discord_trusted_guilds: 'Das Anmelden per Discord nur Mitgliedern dieser Discord-Gilden gestatten. Verwende die numerische ID der Gilde. Lies die Anleitung <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">hier</a>, um mehr zu erfahren. Leer lassen, um jede Gilde zuzulassen.'
     enable_backups: "Erlaube Administratoren, Backups des Forums zu erstellen"
-    allow_restore: "Wiederherstellung zulassen, die ALLE Site-Daten ersetzen kann! Lasse es deaktiviert, es sei denn, Du möchtest ein Backup wiederherstellen."
+    allow_restore: "Wiederherstellung zulassen, die ALLE Website-Daten ersetzen kann! Lasse dies deaktiviert, es sei denn, du möchtest ein Backup wiederherstellen"
     maximum_backups: "Die maximale Anzahl an Backups, die gespeichert werden. Ältere Backups werden automatisch gelöscht."
     automatic_backups_enabled: "Automatische Backups aktivieren. Die Backups werden im eingestellten Zeitintervall erstellt."
     backup_frequency: "Die Anzahl von Tagen zwischen Backups."
@@ -1661,7 +1658,7 @@ de:
     top_topics_formula_first_post_likes_multiplier: "Wert des Multiplikators (n) für die „Gefällt mir“-Angaben des ersten Beitrags in der Formel für angesagte Themen: `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: "Wert des Multiplikators (n) für die wenigsten „Gefällt mir“-Angaben pro Beitrag in der Formel für angesagte Themen: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     enable_safe_mode: "Erlaube Benutzern, den abgesicherten Modus zu betreten, um Plug-ins zu debuggen."
-    enable_experimental_sidebar_hamburger: "Ermöglicht die Aktivierung der experimentellen Seitenleiste und des Benutzer-Hamburger-Dropdown-Menüs."
+    enable_experimental_sidebar_hamburger: "Ermöglicht die Aktivierung der experimentellen Seitenleiste und des Benutzer-Hamburger-Drop-down-Menüs."
     enable_sidebar: "Aktiviert die experimentelle Seitenleiste."
     rate_limit_create_topic: "Nach Erstellen eines Themas muss ein Benutzer (n) Sekunden warten, bevor ein weiteres Thema erstellt werden kann."
     rate_limit_create_post: "Nach Schreiben eines Beitrags muss ein Benutzer (n) Sekunden warten, bevor ein weiterer Beitrag erstellt werden kann."
@@ -1706,8 +1703,8 @@ de:
     external_emoji_url: "URL des externen Dienstes für Emoji-Bilder. Lasse das Feld leer, um dies zu deaktivieren."
     use_site_small_logo_as_system_avatar: "Verwende das kleine Logo der Website anstelle des Avatars des Systembenutzers. Das Logo muss vorhanden sein."
     restrict_letter_avatar_colors: "Eine Liste von 6-stelligen hexadezimalen Farbwerten, die für den Buchstaben-Avatar-Hintergrund verwendet werden."
-    enable_listing_suspended_users_on_search: "Ermögliche normalen Benutzern, gesperrte Benutzer zu finden."
-    selectable_avatars_mode: "Erlaube es den Nutzern, einen Avatar aus der Liste selectable_avatars auszuwählen, und beschränke benutzerdefinierte Avatar-Uploads auf die ausgewählte Vertrauensstufe."
+    enable_listing_suspended_users_on_search: "Normalen Benutzern ermöglichen, gesperrte Benutzer zu finden."
+    selectable_avatars_mode: "Benutzern erlauben, einen Avatar aus der Liste selectable_avatars auszuwählen, und benutzerdefinierte Avatar-Uploads auf die ausgewählte Vertrauensstufe beschränken."
     selectable_avatars: "Liste der Avatare, aus denen Benutzer wählen können."
     allow_all_attachments_for_group_messages: "Erlaube alle E-Mail-Anhänge für Gruppen-Nachrichten."
     png_to_jpg_quality: "Qualität der umgewandelten JPG-Datei (1 ist die niedrigste, 99 die beste Qualität, 100 deaktiviert die Funktion)."
@@ -1754,7 +1751,7 @@ de:
     min_trust_to_edit_wiki_post: "Minimale Vertrauensstufe, um als Wiki markierte Beiträge bearbeiten zu können."
     min_trust_to_edit_post: "Minimale Vertrauensstufe, um Beiträge bearbeiten zu können."
     min_trust_to_allow_self_wiki: "Minimale Vertrauensstufe, die ein Benutzer haben muss, um einen eigenen Wiki-Eintrag zu erstellen."
-    min_trust_to_send_messages: "VERALTET, verwende stattdessen die Einstellung „Gruppen mit aktivierten persönlichen Nachrichten“. Die Mindestvertrauensstufe, die zum Erstellen neuer persönlicher Nachrichten erforderlich ist."
+    min_trust_to_send_messages: "VERALTET, stattdessen die Einstellung „personal message enabled groups“ verwenden. Die Mindestvertrauensstufe, die zum Erstellen neuer persönlicher Nachrichten erforderlich ist."
     min_trust_to_send_email_messages: "Minimale Vertrauensstufe, um persönliche Nachrichten per E-Mail zu versenden."
     min_trust_to_flag_posts: "Minimale Vertrauensstufe, um Beiträge melden zu können"
     min_trust_to_post_links: "Minimale Vertrauensstufe, um Links in Beiträge einzufügen"
@@ -1772,9 +1769,9 @@ de:
     max_mentions_per_post: "Maximale Anzahl der Namenserwähnungen mit @, die Benutzer in Beiträgen nutzen dürfen."
     max_users_notified_per_group_mention: "Maximale Anzahl von Benutzern, die eine Benachrichtigung erhalten können, wenn eine Gruppe erwähnt wird (wenn der Schwellenwert erreicht ist, werden keine Benachrichtigungen ausgelöst)"
     enable_mentions: "Erlaube Benutzern, andere Benutzer zu erwähnen."
-    here_mention: "Name, der für eine @Erwähnung verwendet wird, damit privilegierte Benutzer bis zu 'max_here_mentioned' Personen benachrichtigen können, die an dem Thema teilnehmen. Darf kein bestehender Benutzername sein."
-    max_here_mentioned: "Maximale Anzahl der erwähnten Personen von @here."
-    min_trust_level_for_here_mention: "Die minimale Vertrauensstufe, die @hier erwähnt werden darf."
+    here_mention: "Name, der für eine Erwähnung per @ verwendet wird, damit privilegierte Benutzer bis zu „max_here_mentioned“ Personen benachrichtigen können, die an dem Thema teilnehmen. Darf kein bestehender Benutzername sein."
+    max_here_mentioned: "Maximale Anzahl der erwähnten Personen per @here."
+    min_trust_level_for_here_mention: "Die Mindestvertrauensstufe, die erforderlich ist, um @here zu erwähnen."
     create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden."
     email_time_window_mins: "Warte (n) Minuten, bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
     personal_email_time_window_seconds: "Warte (n) Sekunden, bevor E-Mail-Benachrichtigungen zu persönlichen Nachrichten verschickt werden, um Benutzern die Gelegenheit zu geben, ihre Nachrichten abschließend bearbeiten zu können."
@@ -1825,7 +1822,7 @@ de:
     topic_view_duration_hours: "Zähle einen neuen Themenaufruf einmal pro IP/Benutzer alle N Stunden"
     user_profile_view_duration_hours: "Zähle einen neuen Profilaufruf einmal pro IP/Benutzer alle N Stunden"
     levenshtein_distance_spammer_emails: "E-Mail-Adressen, die sich um so viele Zeichen unterscheiden, werden beim Abgleich mit Adressen der Spammer dennoch als identisch betrachtet."
-    max_new_accounts_per_registration_ip: "Keine neuen Registrierungen von einer IP-Adresse annehmen, wenn bereits (n) Benutzerkonten mit Vertrauensstufe 0 zugeordnet sind (und keines davon ein Team-Mitglied ist oder Vertrauensstufe 2 oder höher hat). 0 setzen um die Begrenzung zu deaktivieren."
+    max_new_accounts_per_registration_ip: "Keine neuen Registrierungen von einer IP-Adresse annehmen, wenn bereits (n) Benutzerkonten mit Vertrauensstufe 0 zugeordnet sind (und keines davon ein Team-Mitglied ist oder Vertrauensstufe 2 oder höher hat). 0 deaktiviert die Begrenzung."
     min_ban_entries_for_roll_up: "Wenn du auf die Schaltfläche „Zusammenfassen“ klickst, wird ein neuer Subnetz-Block-Eintrag erstellt, wenn es mindestens (N) Einträge gibt."
     max_age_unmatched_emails: "Gefilterte E-Mail-Adressen nach (N) Tagen ohne Treffer löschen."
     max_age_unmatched_ips: "Gefilterte IP-Adressen nach (N) Tagen ohne Treffer löschen."
@@ -1859,7 +1856,7 @@ de:
     max_emails_per_day_per_user: "Maximale Anzahl von E-Mails, die den Benutzern pro Tag gesendet werden. 0 zum Deaktivieren des Limits"
     enable_staged_users: "Erstelle automatisch vorbereitete Benutzer, wenn eingehende E-Mails verarbeitet werden."
     maximum_staged_users_per_email: "Maximale Anzahl vorbereiteter Benutzer, wenn eine eingehende E-Mail bearbeitet wird."
-    maximum_recipients_per_new_group_email: "Blockiere eingehende E-Mails mit zu vielen Empfängern."
+    maximum_recipients_per_new_group_email: "Eingehende E-Mails mit zu vielen Empfängern blockieren."
     auto_generated_allowlist: "Liste von E-Mail-Adressen, die nicht auf automatisch generierte Inhalte überprüft werden. Beispiel: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Eingehende E-Mails blockieren, die als automatisch generiert erkannt werden."
     ignore_by_title: "Ignoriere eingehende E-Mails basierend auf ihrem Betreff."
@@ -1879,7 +1876,7 @@ de:
     raw_email_max_length: "Wie viele Zeichen für eingehende E-Mails gespeichert werden sollen."
     raw_rejected_email_max_length: "Wie viele Zeichen für abgelehnte E-Mails gespeichert werden sollen."
     delete_rejected_email_after_days: "Lösche abgelehnte E-Mails, die älter als (n) Tage sind."
-    require_change_email_confirmation: "Verlangt von Nicht-Mitarbeitern, dass sie ihre alte E-Mail-Adresse bestätigen, bevor sie sie ändern. Gilt nicht für Mitarbeiter/innen, sie müssen ihre alte E-Mail-Adresse immer bestätigen."
+    require_change_email_confirmation: "Verlangt von Nicht-Team-Mitgliedern, dass sie ihre alte E-Mail-Adresse bestätigen, bevor sie sie ändern. Gilt nicht für Team-Mitglieder; diese müssen ihre alte E-Mail-Adresse immer bestätigen."
     manual_polling_enabled: "E-Mails über die API für E-Mail-Antworten verteilen."
     pop3_polling_enabled: "E-Mail-Antworten über POP3 abrufen."
     pop3_polling_ssl: "SSL für die Verbindung zum POP3-Server verwenden. (Empfohlen)"
@@ -1958,14 +1955,14 @@ de:
     enable_mobile_theme: "Mobilgeräte verwenden eine mobile Darstellung mit der Möglichkeit, zur vollständigen Website zu wechseln. Deaktiviere diese Option, wenn du ein eigenes Fully-Responsive-Stylesheet verwenden möchtest."
     dominating_topic_minimum_percent: "Anteil der Beiträge eines Themas in Prozent, die ein einzelner Benutzer verfassen darf, bevor dieser Benutzer darauf hingewiesen wird, dass er dieses Thema dominiert."
     disable_avatar_education_message: "Deaktiviert den Hinweis für Benutzer, dass sie ihren Avatar ändern können."
-    pm_warn_user_last_seen_months_ago: "Wenn du eine neue PM erstellst, warne den Benutzer, wenn der Empfänger vor mehr als n Monaten nicht gesehen wurde."
+    pm_warn_user_last_seen_months_ago: "Benutzer beim Erstellen einer neuen privaten Nachricht warnen, wenn der Empfänger seit mehr als n Monaten nicht gesehen wurde."
     suppress_uncategorized_badge: "Zeige kein Abzeichen für nicht kategorisierte Themen in der Themenliste."
     header_dropdown_category_count: "Wie viele Kategorien im Header-Drop-down-Menü angezeigt werden können."
     permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw., um Teilausdrücke zu verwenden"
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-Meldung in Form eines nicht ausblendbaren, global sichtbaren Banners an. Leere den Inhalt, um sie wieder auszublenden (HTML ist erlaubt)."
     disable_system_edit_notifications: "Unterdrückt Bearbeitungsbenachrichtigungen durch den System-Benutzer, wenn die „download_remote_images_to_local“-Einstellung aktiviert ist."
-    disable_category_edit_notifications: "Deaktiviere Benachrichtigungen über Kategorie-Anpassungen von Themen."
-    disable_tags_edit_notifications: "Deaktiviere Benachrichtigungen über Schlagwort-Anpassungen von Themen."
+    disable_category_edit_notifications: "Benachrichtigungen über Kategorie-Änderungen bei Themen deaktivieren."
+    disable_tags_edit_notifications: "Benachrichtigungen über Schlagwort-Änderungen bei Themen deaktivieren."
     notification_consolidation_threshold: "Anzahl von „Gefällt mir“- oder Mitgliedschaftsanfragen-Benachrichtigungen, bevor die Benachrichtigungen zu einer einzelnen zusammengefasst werden. Zum Deaktivieren auf 0 setzen."
     likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere „Gefällt mir“-Benachrichtigungen zu einer einzelnen Benachrichtigung zusammengefasst werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann mittels `SiteSetting.notification_consolidation_threshold` eingestellt werden."
     automatically_unpin_topics: "Themen automatisch loslösen, wenn ein Benutzer das Ende erreicht."
@@ -1985,11 +1982,11 @@ de:
     display_name_on_posts: "Zeige zusätzlich zum @Benutzernamen auch den vollständigen Namen des Benutzers bei seinen Beiträgen."
     show_time_gap_days: "Wenn zwei Beiträge so viele Tage auseinanderliegen, dann wird die Zeitspanne im Thema angezeigt."
     short_progress_text_threshold: "Sobald die Anzahl an Beiträgen in einem Thema diese Nummer übersteigt, zeigt der Fortschrittsbalken nur noch die aktuelle Beitragsnummer. Dieser Wert sollte angepasst werden, falls die Breite des Fortschrittsbalkens verändert wird."
-    default_code_lang: "Standardmäßige Syntaxhervorhebung der Programmiersprache, die auf Codeblöcke angewendet wird (auto, nohighlight, ruby, python etc.). Dieser Wert muss auch in der Site-Einstellung \"Hervorgehobene Sprachen\" enthalten sein."
+    default_code_lang: "Standardmäßige Syntaxhervorhebung für Programmiersprachen, die auf Codeblöcke angewendet wird (auto, nohighlight, ruby, python usw.). Dieser Wert muss auch in der Website-Einstellung `highlighted languages` enthalten sein."
     warn_reviving_old_topic_age: "Wenn jemand beginnt, auf ein Thema zu antworten, dessen letzte Antwort älter als diese Anzahl an Tagen ist, wird eine Warnung angezeigt. Zum Deaktivieren auf 0 setzen."
     autohighlight_all_code: "Erzwinge Syntaxhervorhebung für alle Quellcode-Blöcke auch dann, wenn keine Sprache angegeben wurde."
     highlighted_languages: "Aktivierte Regeln für die Syntaxhervorhebung. (Warnung: Das Aktivieren zu vieler Sprachen kann die Leistung beeinträchtigen.) Siehe <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> für eine Demonstration"
-    show_copy_button_on_codeblocks: "Füge eine Schaltfläche zu Codeblöcken hinzu, um den Inhalt des Blocks in die Zwischenablage des Nutzers zu kopieren."
+    show_copy_button_on_codeblocks: "Eine Schaltfläche zu Codeblöcken hinzufügen, um den Inhalt des Blocks in die Zwischenablage des Benutzers zu kopieren."
     embed_any_origin: "Einbettbare Inhalte unabhängig vom Ursprung erlauben. Dies ist für mobile Apps mit statischem HTML erforderlich."
     embed_topics_list: "HTML-Einbettung von Themenlisten unterstützen"
     embed_set_canonical_url: "Lege die kanonische URL für eingebettete Themen auf die URL des eingebetteten Inhalts fest."
@@ -2007,10 +2004,10 @@ de:
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (zum Deaktivieren auf 0 setzen)"
     prevent_anons_from_downloading_files: "Verhindern, dass anonyme Benutzer Anhänge herunterladen können."
     secure_media: 'VERALTET: Verwende stattdessen die Einstellung secure_uploads, wird in Discourse 3.0 entfernt.'
-    secure_uploads: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, Zips und andere). Wenn „Anmeldung erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienuploads in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein umfassendes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/-/140017">das Thema „Sichere Uploads“ auf Meta</a> für Details.'
+    secure_uploads: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, ZIPs und andere). Wenn „Anmeldung erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienuploads in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein umfassendes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/-/140017">das Thema „Sichere Uploads“ auf Meta</a> für Details.'
     secure_media_allow_embed_images_in_emails: "VERALTET: secure_uploads_allow_embed_images_in_emails verwenden, wird in Discourse 3.0 entfernt."
     secure_uploads_allow_embed_images_in_emails: "Ermöglicht das Einbetten sicherer Bilder, die normalerweise in E-Mails geschwärzt werden würden, wenn ihre Größe kleiner ist als die Einstellung „secure uploads max email embed image size kb“."
-    secure_media_max_email_embed_image_size_kb: "DEPRECATED: Verwende secure_uploads_max_email_embed_image_size_kb, wird in Discourse 3.0 entfernt."
+    secure_media_max_email_embed_image_size_kb: "DEPRECATED: secure_uploads_max_email_embed_image_size_kb verwenden, wird in Discourse 3.0 entfernt."
     secure_uploads_max_email_embed_image_size_kb: "Der Größengrenzwert für sichere Bilder, die in E-Mails eingebettet werden, wenn die Einstellung „secure uploads allow embed in emails“ aktiviert ist. Anderweitig hat diese Einstellung keine Auswirkung."
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. „encoded“ erzeugt einen Prozent-encodierten String, bei „none“ wird kein Kürzel verwendet."
     enable_emoji: "Emoji aktivieren"
@@ -2089,7 +2086,7 @@ de:
     tags_sort_alphabetically: "Zeige Schlagwörter in alphabetischer Reihenfolge. Standardmäßig werden sie nach Beliebtheit sortiert."
     tags_listed_by_group: "Zeige Schlagwörter auf der <a href='%{base_path}/tags' target='_blank'>Schlagwort-Seite</a> geordnet nach Schlagwortgruppe an."
     tag_style: "Visueller Stil für Schlagwort-Abzeichen."
-    pm_tags_allowed_for_groups: "Erlaube den Mitgliedern der einbezogenen Gruppe(n), jede persönliche Nachricht zu markieren"
+    pm_tags_allowed_for_groups: "Mitgliedern der einbezogenen Gruppe(n) erlauben, jede persönliche Nachricht zu markieren"
     min_trust_level_to_tag_topics: "Minimale Vertrauensstufe, um Schlagwörter zu Themen hinzuzufügen."
     suppress_overlapping_tags_in_list: "Schlagwort nicht zeigen, wenn es genauso im Thementitel vorkommt"
     remove_muted_tags_from_latest: "Themen, die nur mit stummgeschalteten Tags versehen sind, nicht in der Liste der aktuellen Themen anzeigen"
@@ -2103,9 +2100,10 @@ de:
     push_notifications_icon: "Das Abzeichensymbol, das in der Benachrichtigungsecke angezeigt wird. Ein monochromatisches PNG mit Transparenz (96 × 96) wird empfohlen."
     base_font: "Basisschriftart für die meisten Texte auf der Website. Themes können diese Schriftart mit der benutzerdefinierten CSS-Eigenschaft `--font-family` überschreiben."
     heading_font: "Schriftart für Überschriften auf der Website. Themes können diese Schriftart mit der benutzerdefinierten CSS-Eigenschaft `--heading-font-family` überschreiben."
-    enable_sitemap: "Generiere eine Sitemap für Deine Website und füge sie in die robots.txt-Datei ein."
+    enable_sitemap: "Generiere eine Sitemap für deine Website und füge sie in die robots.txt-Datei ein."
     sitemap_page_size: "Anzahl der URLs, die auf jeder Sitemap-Seite enthalten sein sollen. Max 50.000"
-    enable_user_status: "(experimentell) Erlaubt es den Nutzern, eine eigene Statusmeldung (Emoji + Beschreibung) einzustellen."
+    enable_user_status: "(Experimentell) Erlaubt es Benutzern, eine eigene Statusnachricht (Emoji + Beschreibung) einzustellen."
+    enable_onboarding_popups: "(Experimentell) Lern-Pop-ups aktivieren, die den Benutzern wichtige Funktionen beschreiben"
     short_title: "Der Kurztitel wird beim Benutzer auf dem Startbildschirm, im Startmenü oder an anderen Stellen mit begrenztem Platz verwendet. Er sollte auf 12 Zeichen begrenzt sein."
     dashboard_hidden_reports: "Erlaube das Ausblenden der angegebenen Berichte im Dashboard."
     dashboard_visible_tabs: "Wähle aus, welche Dashboard-Registerkarten sichtbar sind."
@@ -2116,13 +2114,13 @@ de:
     share_quote_buttons: "Lege fest, welche Elemente im Widget zum Teilen von Zitaten erscheinen und in welcher Reihenfolge."
     share_quote_visibility: "Bestimme, wann die Schaltflächen zum Teilen von Zitaten angezeigt werden sollen: nie, nur für anonyme Benutzer oder für alle Benutzer. "
     create_revision_on_bulk_topic_moves: "Erstelle eine Überarbeitung für die ersten Beiträge, wenn Themen massenweise in eine neue Kategorie verschoben werden."
-    allow_changing_staged_user_tracking: "Erlauben Sie, dass die Kategorie- und Tag-Benachrichtigungseinstellungen eines bereitgestellten Benutzers von einem Administratorbenutzer geändert werden."
-    use_email_for_username_and_name_suggestions: "Verwende den ersten Teil der E-Mail-Adressen für Vorschläge für Benutzernamen und Namen. Dies macht es für die Öffentlichkeit einfacher, die vollständigen E-Mail-Adressen der Nutzer/innen zu erraten (da ein großer Teil der Menschen gemeinsame Dienste wie \"gmail.com\" nutzt)."
-    use_name_for_username_suggestions: "Verwende den vollen Namen eines Benutzers, wenn du Benutzernamen vorschlägst."
-    suggest_weekends_in_date_pickers: "Beziehe die Wochenenden (Samstag und Sonntag) in die Datumsvorschläge mit ein (deaktiviere dies, wenn du Discourse nur an Wochentagen von Montag bis Freitag benutzt)."
+    allow_changing_staged_user_tracking: "Zulassen, dass die Kategorie- und Schlagwort-Benachrichtigungseinstellungen eines vorbereiteten Benutzers von einem Administratorbenutzer geändert werden."
+    use_email_for_username_and_name_suggestions: "Den ersten Teil der E-Mail-Adressen für Vorschläge für Benutzernamen und Namen verwenden. Dies macht es für die Öffentlichkeit einfacher, die vollständigen E-Mail-Adressen der Benutzer zu erraten (da ein großer Teil der Menschen gängige Dienste wie `gmail.com` nutzt)."
+    use_name_for_username_suggestions: "Beim Vorschlagen von Benutzernamen den vollen Namen eines Benutzers verwenden."
+    suggest_weekends_in_date_pickers: "Wochenenden (Samstag und Sonntag) in die Datumsvorschläge einbeziehen (deaktiviere dies, wenn du Discourse nur an Wochentagen von Montag bis Freitag benutzt)."
     splash_screen: "Zeigt einen temporären Ladebildschirm an, während Website-Assets geladen werden"
-    default_sidebar_categories: "Ausgewählte Kategorien werden standardmäßig im Abschnitt Kategorien der Seitenleiste angezeigt."
-    default_sidebar_tags: "Ausgewählte Schlagwörter werden standardmäßig im Abschnitt Tags der Seitenleiste angezeigt."
+    default_sidebar_categories: "Ausgewählte Kategorien werden standardmäßig im Abschnitt „Kategorien“ der Seitenleiste angezeigt."
+    default_sidebar_tags: "Ausgewählte Schlagwörter werden standardmäßig im Abschnitt „Schlagwörter“ der Seitenleiste angezeigt."
     enable_new_user_profile_nav_groups: "EXPERIMENTELL: Benutzern der ausgewählten Gruppen wird das neue Benutzerprofil-Navigationsmenü angezeigt"
     errors:
       invalid_css_color: "Ungültige Farbe. Gib einen Farbnamen oder einen Hexadezimalwert ein."
@@ -2143,7 +2141,7 @@ de:
       invalid_json: "Ungültiges JSON."
       invalid_reply_by_email_address: "Wert muss „%{reply_key}“ enthalten und sich von der Benachrichtigungs-E-Mail unterscheiden."
       invalid_alternative_reply_by_email_addresses: "Alle Werte müssen „%{reply_key}“ enthalten und sich von der Benachrichtigungs-E-Mail unterscheiden."
-      invalid_domain_hostname: "Darf kein * oder ? Zeichen enthalten."
+      invalid_domain_hostname: "Darf kein * oder ? enthalten."
       pop3_polling_host_is_empty: "Du musst „pop3 polling host“ definieren, um POP3-Abfragen zu aktivieren."
       pop3_polling_username_is_empty: "Du musst „pop3 polling username“ definieren, um POP3-Abfragen zu aktivieren."
       pop3_polling_password_is_empty: "Du musst „pop3 polling password“ definieren, um POP3-Abfragen zu aktivieren."
@@ -2151,9 +2149,9 @@ de:
       reply_by_email_address_is_empty: "Du musst „reply by email address“ definieren, bevor Antworten per E-Mail aktiviert wird."
       email_polling_disabled: "Du musst entweder manuelle oder POP3-Abfragen aktivieren, bevor Antworten per E-Mail aktiviert wird."
       user_locale_not_enabled: "Du musst erst „allow user locale“ aktivieren, bevor du diese Einstellung aktivierst."
-      personal_message_enabled_groups_invalid: "Du musst mindestens eine Gruppe für diese Einstellung angeben. Wenn du nicht möchtest, dass jemand außer den Mitarbeitern PMs verschickt, wähle die Gruppe der Mitarbeiter."
+      personal_message_enabled_groups_invalid: "Du musst mindestens eine Gruppe für diese Einstellung angeben. Wenn du nicht möchtest, dass jemand außer den Team-Mitgliedern private Nachrichten verschickt, wähle die Team-Gruppe aus."
       invalid_regex: "Regulärer Ausdruck ist ungültig oder nicht erlaubt."
-      invalid_regex_with_message: "Die Regex '%{regex}' hat einen Fehler: %{message}"
+      invalid_regex_with_message: "Die Regex „%{regex}“ hat einen Fehler: %{message}"
       email_editable_enabled: "Du musst „email editable“ deaktivieren, bevor du diese Einstellung aktivierst."
       staged_users_disabled: "Du musst erst „staged users“ aktivieren, bevor du diese Einstellung aktivierst."
       reply_by_email_disabled: "Du musst erst „reply by email“ aktivieren, bevor du diese Einstellung aktivierst."
@@ -2175,11 +2173,10 @@ de:
       unicode_usernames_avatars: "Die internen System-Avatare unterstützen keine Unicode-Benutzernamen."
       list_value_count: "Die Liste muss genau %{count} Werte enthalten."
       markdown_linkify_tlds: "Du kannst den Wert „*“ nicht angeben."
-      google_oauth2_hd_groups: "Vor Aktivierung dieser Einstellung musst zuerst \"google oauth2 hd\" eingeschaltet werden."
       search_tokenize_chinese_enabled: "Du musst „search_tokenize_chinese“ deaktivieren, bevor du diese Einstellung aktivierst."
       search_tokenize_japanese_enabled: "Du musst „search_tokenize_japanese“ deaktivieren, bevor du diese Einstellung aktivierst."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Du kannst DiscourseConnect nicht aktivieren, wenn 2FA erzwungen wird."
-      delete_rejected_email_after_days: "Diese Einstellung kann nicht niedriger als die Einstellung delete_email_logs_after_days oder höher als %{max} gesetzt werden."
+      delete_rejected_email_after_days: "Diese Einstellung kann nicht niedriger als die Einstellung delete_email_logs_after_days oder höher als %{max} gesetzt werden"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2343,13 +2340,13 @@ de:
       backup_code: "Benutze stattdessen einen Wiederherstellungscode"
   second_factor_auth:
     challenge_not_found: "Es konnte keine 2FA-Herausforderung in deiner aktuellen Sitzung gefunden werden."
-    challenge_expired: "Es ist zu viel Zeit vergangen, seit die 2FA-Herausforderung durchgeführt wurde, und sie ist nicht mehr gültig. Bitte versuche es erneut."
+    challenge_expired: "Es ist zu viel Zeit vergangen, seit die 2FA-Herausforderung vorbereitet wurde, und sie ist nicht mehr gültig. Bitte versuche es erneut."
     challenge_not_completed: "Du hast die 2FA-Herausforderung nicht abgeschlossen, um diese Aktion durchzuführen. Bitte schließe die 2FA-Herausforderung ab und versuche es erneut."
     actions:
       grant_admin:
-        description: "Für zusätzliche Sicherheitsmaßnahmen musst Di Deine 2FA bestätigen, bevor %{username} Administratorzugriff gewährt wird."
+        description: "Für zusätzliche Sicherheitsmaßnahmen musst du deine 2FA bestätigen, bevor %{username} Administratorzugriff gewährt wird."
       discourse_connect_provider:
-        description: "%{hostname} hat Dich aufgefordert, Deine 2FA zu bestätigen. Du wirst zur Website zurückgeleitet, sobald Du Deine 2FA bestätigt hast."
+        description: "%{hostname} hat dich aufgefordert, deine 2FA zu bestätigen. Du wirst zur Website zurückgeleitet, sobald du deine 2FA bestätigt hast."
   admin:
     email:
       sent_test: "gesendet!"
@@ -2526,11 +2523,11 @@ de:
 
       [**%{base_url}**][0]
 
-      Wir hoffen, Du hast diesen E-Mail-Zustellbarkeitstest erhalten. OK!
+      Wir hoffen, du hast diese Test-E-Mail betreffend die Zustellbarkeit erhalten!
 
       Hier ist eine [praktische Checkliste zum Überprüfen der Konfiguration der E-Mail-Zustellung][1].
 
-      Viel Glück,
+      Viel Erfolg!
 
       Deine Freunde bei [Discourse](https://www.discourse.org)
 
@@ -2576,8 +2573,8 @@ de:
     responder:
       off_topic: "Der Beitrag wurde als **Thema verfehlt** gemeldet: Die Community denkt, dass er nicht zum Thema passt, wie es durch den Titel und den ersten Beitrag definiert wurde."
       inappropriate: "Der Beitrag wurde als **unangemessen** gemeldet: Die Community denkt, dass er anstößig oder beleidigend ist oder einen Verstoß gegen [die Community-Richtlinien](%{base_path}/guidelines) darstellt."
-      spam: "Der Beitrag wurde als **Spam** gemeldet: Die Community denkt, dass es sich um Werbung handelt, zu werblich in seiner Art und nicht nützlich oder für das Diskussionsthema relevant ist."
-      notify_moderators: "Der Beitrag wurde **den Moderatoren gemeldet**: Die Community denkt, dass etwas an deinem Beitrag das Eingreifen eines Team-Mitglieds erfordert."
+      spam: "Der Beitrag wurde als **Spam** gemeldet: Die Community denkt, dass es sich um Werbung handelt oder der Beitrag zu werblich in seiner Art und nicht nützlich oder für das Diskussionsthema relevant ist."
+      notify_moderators: "Der Beitrag wurde **den Moderatoren gemeldet**: Die Community denkt, dass etwas an dem Beitrag das Eingreifen eines Team-Mitglieds erfordert."
   flags_dispositions:
     agreed: "Danke, dass du uns Bescheid gegeben hast. Wir sind auch der Meinung, dass es ein Problem gibt, und sehen uns das an."
     agreed_and_deleted: "Danke, dass du uns Bescheid gegeben hast. Wir sind auch der Meinung, dass es ein Problem gibt, und haben den Beitrag gelöscht."
@@ -2589,7 +2586,7 @@ de:
     other: "Dieses Thema wurde aufgrund einer großen Anzahl an Community-Meldungen vorübergehend für mindestens %{count} Stunden geschlossen."
   system_messages:
     reviewables_reminder:
-      subject_template: "Es gibt Einträge in der Überprüfungswarteschlange, die überprüft werden müssen"
+      subject_template: "Es gibt Einträge in der Warteschlange zur Überprüfung, die überprüft werden müssen"
       text_body_template:
         one: "%{mentions} Elemente wurden vor über %{count} Stunde übermittelt. [Bitte überprüfe sie](%{base_url}/review)."
         other: "%{mentions} Elemente wurden vor über %{count} Stunden übermittelt. [Bitte überprüfe sie](%{base_url}/review)."
@@ -2673,16 +2670,16 @@ de:
 
         Weitere Informationen findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
     flags_agreed_and_post_deleted_for_responders:
-      title: "Antwort wurde von Mitarbeitern aus dem markierten Beitrag entfernt"
-      subject_template: "Antwort wurde von Mitarbeitern aus dem markierten Beitrag entfernt"
+      title: "Antwort auf gemeldeten Beitrag wurde vom Team entfernt"
+      subject_template: "Antwort auf gemeldeten Beitrag wurde vom Team entfernt"
       text_body_template: |
         Hallo,
 
-        Dies ist eine automatische Nachricht von %{site_name} , um dich zu informieren, dass ein [Beitrag](%{base_url}%{url}), auf den du geantwortet hast, entfernt wurde.
+        dies ist eine automatische Nachricht von %{site_name}, um dich zu informieren, dass ein [Beitrag](%{base_url}%{url}), auf den du geantwortet hast, entfernt wurde.
 
         %{flag_reason}
 
-        Dieser Beitrag wurde von der Community markiert und ein Mitarbeiter hat sich entschieden, ihn zu entfernen.
+        Dieser Beitrag wurde von der Community gemeldet und ein Team-Mitglied hat sich entschieden, ihn zu entfernen.
 
         ``` markdown
         %{flagged_post_raw_content}
@@ -2749,18 +2746,18 @@ de:
       text_body_template: |
         Wir haben dich eine weitere [Vertrauensstufe](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) aufsteigen lassen!
 
-        Das Erreichen der Vertrauensstufe 2 bedeutet, dass du genug gelesen und aktiv mitgemacht hast, um als Mitglied dieser Gemeinschaft angesehen zu werden.
+        Das Erreichen der Vertrauensstufe 2 bedeutet, dass du genug gelesen und aktiv mitgemacht hast, um als Mitglied dieser Community angesehen zu werden.
 
-        Als erfahrener Nutzer wirst du [diese Liste mit praktischen Tipps und Tricks](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) zu schätzen wissen.
+        Als erfahrener Benutzer wirst du [diese Liste mit praktischen Tipps und Tricks](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) zu schätzen wissen.
 
-        Wir laden dich ein, dich weiterhin einzubringen - wir freuen uns, dich hier zu haben.
+        Wir laden dich ein, dich weiterhin einzubringen – und wir freuen uns, dich hier zu haben.
     backup_succeeded:
       title: "Backup erfolgreich"
       subject_template: "Backup erfolgreich abgeschlossen"
       text_body_template: |
-        Die Sicherung war erfolgreich.
+        Backup erfolgreich erstellt.
 
-        Besuche den [admin > Backup-Bereich](%{base_url}/admin/backups), um Deine neue Sicherung herunterzuladen.
+        Besuche [Administration > Backups](%{base_url}/admin/backups), um das neue Backup herunterzuladen.
 
         Hier ist das Protokoll:
 
@@ -2796,22 +2793,22 @@ de:
       title: "Masseneinladung erfolgreich"
       subject_template: "Masseneinladung von Benutzern erfolgreich verarbeitet"
       text_body_template: |
-        Deine Masseneinladungsdatei wurde verarbeitet, %{sent} Einladungen verschickt, %{skipped} übersprungen und %{warnings} Warnung(en).
+        Deine Masseneinladungsdatei wurde verarbeitet. %{sent} Einladungen wurden verschickt, %{skipped} wurden übersprungen und es gab %{warnings} Warnung(en).
 
-        ```` Text
+        ``` text
         %{logs}
-        ````
+        ```
     bulk_invite_failed:
       title: "Masseneinladung fehlgeschlagen"
       subject_template: "Bei der Verarbeitung der Masseneinladung von Benutzern sind Fehler aufgetreten"
       text_body_template: |
-        Deine Masseneinladungsdatei wurde verarbeitet, %{sent} Einladungen verschickt, %{skipped} übersprungen, %{warnings} Warnung(en) und %{failed} Fehler.
+        Deine Masseneinladungsdatei wurde verarbeitet. %{sent} Einladungen wurden verschickt, %{skipped} wurden übersprungen und es gab %{warnings} Warnung(en) und %{failed} Fehler.
 
         Hier ist das Protokoll:
 
-        ```` Text
+        ``` text
         %{logs}
-        ````
+        ```
     user_added_to_group_as_owner:
       title: "Als Eigentümer zur Gruppe hinzugefügt"
       subject_template: "Du wurdest als Eigentümer der Gruppe %{group_name} hinzugefügt"
@@ -3033,14 +3030,14 @@ de:
 
         Wenn du denkst, dass dies ein Fehler ist, [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_too_many_recipients:
-      title: "E-Mail lehnt zu viele Empfänger ab"
-      subject_template: "[%{email_prefix}] E-Mail-Problem - Zu viele Empfänger"
+      title: "E-Mail abgelehnt – zu viele Empfänger"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- zu viele Empfänger"
       text_body_template: |
-        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert.
+        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) konnte nicht zugestellt werden.
 
-        Du hast versucht, an mehr als %{max_recipients_count} Personen zu schreiben und unser System hat deine E-Mail automatisch als Spam markiert.
+        Du hast versucht, mehr als %{max_recipients_count} Personen anzuschreiben, und unser System hat deine E-Mail automatisch als Spam markiert.
 
-        Wenn du glaubst, dass dies ein Fehler ist, [kontaktiere einen Mitarbeiter](%{base_url}/about).
+        Wenn du denkst, dass dies ein Fehler ist, [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_error_notification:
       title: "Benachrichtigung zu E-Mail-Fehler"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- POP-Authentifizierungsfehler"
@@ -3211,7 +3208,7 @@ de:
     posted_by: "Erstellt von %{username} am %{post_date}"
     pm_participants: "Teilnehmer: %{participants}"
     more_pm_participants:
-      one: "%{participants} und %{count} andere"
+      one: "%{participants} und %{count} anderer"
       other: "%{participants} und %{count} andere"
     invited_group_to_private_message_body: |
       %{username} hat @%{group_name} zu einer Unterhaltung eingeladen
@@ -3440,9 +3437,9 @@ de:
       title: "Konto gesperrt"
       subject_template: "[%{email_prefix}] Dein Konto wurde gesperrt"
       text_body_template: |
-        Du wurdest vom Forum gesperrt.
+        Du wurdest im Forum gesperrt.
 
-        Grund - %{reason}
+        Grund – %{reason}
     account_silenced:
       title: "Konto stummgeschaltet"
       subject_template: "[%{email_prefix}] Dein Konto wurde stummgeschaltet"
@@ -3456,7 +3453,7 @@ de:
       text_body_template: |
         Du wurdest im Forum stummgeschaltet.
 
-        Grund - %{reason}
+        Grund – %{reason}
     account_exists:
       title: "Konto existiert bereits"
       subject_template: "[%{email_prefix}] Konto existiert bereits"
@@ -3697,18 +3694,18 @@ de:
     store_failure: "Hochladen von #%{upload_id} für Benutzer #%{user_id} ist fehlgeschlagen."
     file_missing: "Bitte wähle eine Datei zum Hochladen aus."
     empty: "Entschuldige, aber die angegebene Datei ist leer."
-    failed: "Sorry, aber dein Upload ist fehlgeschlagen. Bitte versuche es erneut."
+    failed: "Dein Upload ist leider fehlgeschlagen. Bitte versuche es erneut."
     png_to_jpg_conversion_failure_message: "Beim Konvertieren von PNG in JPG ist ein Fehler aufgetreten."
     optimize_failure_message: "Beim Optimieren des hochgeladenen Bildes ist ein Fehler aufgetreten."
     download_failure: "Herunterladen der Datei vom externen Anbieter fehlgeschlagen."
-    size_mismatch_failure: "Die Größe der auf S3 hochgeladenen Datei stimmte nicht mit der beabsichtigten Größe des externen Upload-Abschnittes überein. %{additional_detail}"
+    size_mismatch_failure: "Die Größe der auf S3 hochgeladenen Datei stimmte nicht mit der beabsichtigten Größe des externen Upload-Stubs überein. %{additional_detail}"
     create_multipart_failure: "Fehler beim Erstellen eines mehrteiligen Uploads im externen Speicher."
     abort_multipart_failure: "Fehler beim Abbrechen des mehrteiligen Uploads im externen Speicher."
     complete_multipart_failure: "Der mehrteilige Upload im externen Speicher konnte nicht abgeschlossen werden."
     external_upload_not_found: "Der Upload wurde im externen Speicher nicht gefunden. %{additional_detail}"
     checksum_mismatch_failure: "Die Prüfsumme der hochgeladenen Datei stimmt nicht überein. Der Dateiinhalt könnte sich beim Hochladen geändert haben. Bitte versuche es erneut."
-    cannot_promote_failure: "Der Upload kann nicht abgeschlossen werden, er kann bereits abgeschlossen oder zuvor gescheitert sein."
-    size_zero_failure: "Es tut uns leid, es sieht so aus, als ob etwas schief gelaufen ist. Die Datei, die Du hochzuladen versuchst, hat 0 Bytes. Bitte versuche es erneut."
+    cannot_promote_failure: "Der Upload kann nicht abgeschlossen werden. Er könnte bereits abgeschlossen oder zuvor gescheitert sein."
+    size_zero_failure: "Entschuldigung, es sieht so aus, als ob etwas schiefgelaufen ist. Die Datei, die du hochladen möchtest, ist 0 Byte groß. Bitte versuche es erneut."
     attachments:
       too_large: "Entschuldige, die Datei, die du hochladen möchtest, ist zu groß (maximale Dateigröße: %{max_size_kb} KB)."
       too_large_humanized: "Entschuldige, die Datei, die du hochladen möchtest, ist zu groß (maximale Dateigröße: %{max_size})."
@@ -3766,10 +3763,10 @@ de:
     wcag_theme_name: "WCAG (hell)"
     dracula: "Dracula"
     dracula_theme_name: "Dracula"
-    solarized_light: "Solarisiertes Licht"
-    solarized_light_theme_name: "Solarisiertes Licht"
-    solarized_dark: "Solarisierte Dunkelheit"
-    solarized_dark_theme_name: "Solarisierte Dunkelheit"
+    solarized_light: "Solarized (hell)"
+    solarized_light_theme_name: "Solarized (hell)"
+    solarized_dark: "Solarized (dunkel)"
+    solarized_dark_theme_name: "Solarized (dunkel)"
     wcag_dark: "WCAG (dunkel)"
     wcag_dark_theme_name: "WCAG (dunkel)"
     default_theme_name: "Standard"
@@ -4152,7 +4149,7 @@ de:
         invalid_csv: Wir haben einen Fehler in Zeile %{line_number} festgestellt. Bitte stelle sicher, dass die CSV-Datei eine E-Mail-Adresse pro Zeile enthält.
         too_many_csv_entries: Zu viele Einträge in der CSV-Datei. Bitte gib eine CSV-Datei mit nicht mehr als %{count} Einträgen an.
         badge_disabled: Bitte aktiviere zunächst das Abzeichen „%{badge_name}“.
-        cant_grant_multiple_times: Das %{badge_name} -Abzeichen kann einem einzelnen Benutzer nicht mehrfach gewährt werden.
+        cant_grant_multiple_times: Das %{badge_name}-Abzeichen kann einem einzelnen Benutzer nicht mehrfach verliehen werden.
     editor:
       name: Bearbeiter
       description: Hat den ersten Beitrag bearbeitet
@@ -4401,7 +4398,7 @@ de:
       invalid_token: "Ungültiges Token."
     email_input: "Administrator-E-Mail"
     submit_button: "E-Mail senden"
-    safe_mode: "Abgesicherter Modus: Deaktivieren Sie alle Themen/Plugins beim Anmelden"
+    safe_mode: "Abgesicherter Modus: Alle Themes/Plug-ins beim Anmelden deaktivieren"
   performance_report:
     initial_post_raw: Dieses Thema enthält tägliche Leistungsberichte für deine Website.
     initial_topic_title: Berichte zur Website-Leistung
@@ -4424,11 +4421,11 @@ de:
       synonym: 'Synonyme sind nicht erlaubt. Verwende stattdessen „%{tag_name}“.'
       has_synonyms: 'Schlagwort „%{tag_name}“ kann nicht verwendet werden, da es Synonyme hat.'
       restricted_tags_cannot_be_used_in_category:
-        one: 'Das Tag "%{tags}" kann nicht in der Kategorie "%{category}" verwendet werden. Bitte entferne es.'
-        other: 'Die folgenden Schlagwörter können nicht in der Kategorie "%{category}" verwendet werden: %{tags}. Bitte entferne sie.'
+        one: 'Das Schlagwort „%{tags}“ kann nicht in der Kategorie „%{category}“ verwendet werden. Bitte entferne es.'
+        other: 'Die folgenden Schlagwörter können nicht in der Kategorie „%{category}“ verwendet werden: %{tags}. Bitte entferne sie.'
       category_does_not_allow_tags:
-        one: 'In der Kategorie "%{category}" ist das Tag "%{tags}" nicht zulässig. Bitte entferne es.'
-        other: 'In der Kategorie "%{category}" sind die folgenden Schlagwörter nicht zulässig: "%{tags}“. Bitte entferne sie.'
+        one: 'In der Kategorie „%{category}“ ist das Schlagwort „%{tags}“ nicht zulässig. Bitte entferne es.'
+        other: 'In der Kategorie „%{category}“ sind die folgenden Schlagwörter nicht zulässig: „%{tags}“. Bitte entferne sie.'
     required_tags_from_group:
       one: "Du musst mindestens %{count} „%{tag_group_name}“-Schlagwort hinzufügen. Die Schlagwörter in dieser Gruppe sind: %{tags}."
       other: "Du musst mindestens %{count} „%{tag_group_name}“-Schlagwörter hinzufügen. Die Schlagwörter in dieser Gruppe sind: %{tags}."
@@ -4450,8 +4447,8 @@ de:
       message: "<p>Wir haben die Aktivierungs-E-Mail noch einmal an <b>%{email}</b> gesendet"
   safe_mode:
     title: "Abgesicherten Modus betreten"
-    description: "Der abgesicherte Modus ermöglicht es dir, deine Website zu testen, ohne Plugins oder Themes zu laden."
-    no_themes: "Themen und Themenkomponenten deaktivieren"
+    description: "Der abgesicherte Modus ermöglicht es dir, deine Website zu testen, ohne Plug-ins oder Themes zu laden."
+    no_themes: "Themes und Theme-Komponente deaktivieren"
     no_unofficial_plugins: "Inoffizielle Plug-ins deaktivieren"
     no_plugins: "Alle Plug-ins deaktivieren"
     enter: "Abgesicherten Modus betreten"
@@ -4471,7 +4468,7 @@ de:
           contact_email:
             label: "Ansprechpartner"
             placeholder: "example@user.com"
-            description: "Person oder Gruppe, die für diese Community verantwortlich ist. Wird für kritische Aktualisierungen verwendet und auf <a href='%{base_path}/about' target='_blank'>Ihrer Über-Seite</a> für dringenden Kontakt aufgelistet."
+            description: "Person oder Gruppe, die für diese Community verantwortlich ist. Wird für kritische Updates verwendet und auf der <a href='%{base_path}/about' target='_blank'>Seite „Über uns“</a> als Kontaktmöglichkeit für dringende Angelegenheiten aufgelistet."
           default_locale:
             label: "Sprache"
       privacy:
@@ -4481,8 +4478,8 @@ de:
             placeholder: "Privat"
             extra_description: "Nur angemeldete Benutzer können auf diese Community zugreifen"
           invite_only:
-            placeholder: "Nur einladen"
-            extra_description: "Benutzer müssen von vertrauenswürdigen Benutzern oder Team-Mitgliedern eingeladen werden, andernfalls können sich Benutzer selbst anmelden"
+            placeholder: "Nur auf Einladung"
+            extra_description: "Benutzer müssen von vertrauenswürdigen Benutzern oder Team-Mitgliedern eingeladen werden, andernfalls können sich Benutzer selbst registrieren"
           must_approve_users:
             placeholder: "Genehmigung erfordern"
             extra_description: "Benutzer müssen von den Team-Mitgliedern genehmigt werden"
@@ -4490,7 +4487,7 @@ de:
         title: "Dein Discourse ist bereit!"
         description: "Das war's! Du hast die Grundlagen für die Einrichtung deiner Community geschaffen. Jetzt kannst du dich umsehen, ein Willkommensthema schreiben und Einladungen verschicken!<br><br>Viel Spaß!"
       styling:
-        title: "Look & Feel"
+        title: "Look-and-feel"
         fields:
           color_scheme:
             label: "Farbschema"
@@ -4522,31 +4519,31 @@ de:
               subcategories_with_featured_topics:
                 label: "Unterkategorien mit hervorgehobenen Themen"
       branding:
-        title: "Customize Logos"
+        title: "Logos anpassen"
         fields:
           logo:
             label: "Hauptlogo"
             description: "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."
           logo_small:
             label: "Quadratisches Logo"
-            description: "Eine quadratische Version deines Logos. Es wird beim Scrollen in der oben links angezeigt und beim Teilen auf sozialen Netzwerken. Idealerweise größer als 512 x 512."
+            description: "Eine quadratische Version deines Logos. Es wird beim Scrollen nach unten und beim Teilen auf sozialen Netzwerken oben links angezeigt. Idealerweise mindestens 512 x 512 Pixel."
           favicon:
             label: "Browser-Symbol"
-            description: "Ein Icon, das deine Website in Webbrowsern darstellt und auch bei kleinen Größen gut aussieht. PNG oder JPG wird empfohlen. Standardmäßig wird ein quadratisches Logo verwendet."
+            description: "Ein Icon, das deine Website in Webbrowsern repräsentiert und auch in kleinen Größen gut aussieht. PNG oder JPG wird empfohlen. Standardmäßig wird das quadratische Logo verwendet."
           large_icon:
             label: "Großes Symbol"
-            description: "Ein Icon, das deine Website auf mobilen Geräten darstellt und auch bei größeren Größen gut aussieht. Idealerweise größer als 512x512. Standardmäßig wird ein quadratisches Logo verwendet."
+            description: "Ein Icon, das deine Website auf mobilen Geräten repräsentiert und auch bei größeren Größen gut aussieht. Idealerweise größer als 512 x 512 Pixel. Standardmäßig wird das quadratische Logo verwendet."
       corporate:
-        title: "Kontakt & Organisation"
+        title: "Deine Organisation"
         fields:
           company_name:
             label: "Firmenname"
             placeholder: "Beispiel-Organisation"
-            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Wenn es kein Unternehmen gibt, kannst du es überspringen."
+            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Falls es kein Unternehmen gibt, kannst du dies überspringen."
           governing_law:
             label: "Anzuwendendes Recht"
             placeholder: "Deutsches Recht"
-            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Wenn es kein Unternehmen gibt, kannst du es überspringen."
+            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Falls es kein Unternehmen gibt, kannst du dies überspringen."
           contact_url:
             label: "Webseite"
             placeholder: "https://www.example.com/contact-us"
@@ -4554,7 +4551,7 @@ de:
           city_for_disputes:
             label: "Stadt für Rechtsstreitigkeiten"
             placeholder: "Berlin"
-            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Wenn es kein Unternehmen gibt, kannst du es überspringen."
+            description: "Eingetragen auf deiner Seite mit den Nutzungsbedingungen. Falls es kein Unternehmen gibt, kannst du dies überspringen."
           site_contact:
             label: "Automatische Nachrichten"
             description: "Alle automatischen persönlichen Discourse-Nachrichten werden von diesem Benutzer geschickt, z. B. Warnungen zu Meldungen und Benachrichtigungen über den Abschluss von Backups."
@@ -4617,8 +4614,8 @@ de:
       trust_level: "Antworten von Benutzern auf niedrigen Vertrauensstufen müssen von Team-Mitgliedern genehmigt werden. Siehe %{link}."
       new_topics_unless_trust_level: "Themen von Benutzern auf niedrigen Vertrauensstufen müssen von Team-Mitgliedern genehmigt werden. Siehe %{link}."
       fast_typer: "Ein neuer Benutzer hat seinen ersten Beitrag verdächtig schnell getippt, Verdacht auf Bot oder Spammer-Verhalten. Siehe %{link}."
-      auto_silence_regex: "Neuer Benutzer, dessen erster Beitrag mit der %{link} -Einstellung übereinstimmt."
-      watched_word: "Dieser Beitrag enthielt ein beobachtetes Wort. Siehe dein %{link}."
+      auto_silence_regex: "Neuer Benutzer, dessen erster Beitrag mit der %{link}-Einstellung übereinstimmt."
+      watched_word: "Dieser Beitrag enthielt ein beobachtetes Wort. Siehe %{link}."
       staged: "Neue Themen und Beiträge für vorbereitete Benutzer müssen von Team-Mitgliedern genehmigt werden. Siehe %{link}."
       category: "Beiträge in dieser Kategorie benötigen manuelle Genehmigung von Team-Mitgliedern. Siehe %{link}."
       must_approve_users: "Alle neuen Benutzer müssen von Team-Mitgliedern genehmigt werden. Siehe %{link}."
@@ -4714,7 +4711,7 @@ de:
   notification_level:
     ignore_error: "Entschuldige, du kannst diesen Benutzer nicht ignorieren."
     mute_error: "Entschuldige, du kannst diesen Benutzer nicht stummschalten."
-    error: "Leider kannst Du die Benachrichtigungsebene für diesen Benutzer nicht ändern."
+    error: "Leider kannst du die Benachrichtigungsstufe für diesen Benutzer nicht ändern."
     invalid_value: '„%{value}“ ist keine gültige Benachrichtigungsstufe.'
   discord:
     not_in_allowed_guild: "Authentifizierung fehlgeschlagen. Du bist kein Mitglied einer erlaubten Discord-Gilde."
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 5ef1311d76..30fbff39f3 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -56,8 +56,6 @@ el:
   themes:
     bad_color_scheme: "Δεν είναι δυνατή η ενημέρωση του θέματος, μη έγκυρη παλέτα χρωμάτων"
     other_error: "Κάτι πήγε στραβά κατά την ενημέρωση του θέματος"
-    compile_error:
-      unrecognized_extension: "Μη αναγνωρισμένη επέκταση αρχείου: %{extension}"
     import_error:
       about_json: "Σφάλμα εισαγωγής: το about.json δεν υπάρχει ή δεν είναι έγκυρο. Είστε βέβαιοι ότι αυτό είναι ένα θέμα Discourse;"
       about_json_values: "Το about.json περιέχει μη έγκυρες τιμές: %{errors}"
@@ -423,7 +421,6 @@ el:
   staff_category_name: "Συνεργάτες"
   staff_category_description: "Ιδιωτική κατηγορία για συζητήσεις των συνεργατών. Τα θέματα είναι ορατά μόνο σε διαχειριστές και συντονιστές."
   discourse_welcome_topic:
-    title: "Καλώς ήρθατε στο Discourse"
     body: |2
 
       Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
diff --git a/config/locales/server.en_GB.yml b/config/locales/server.en_GB.yml
index e3eff993e6..813c24338e 100644
--- a/config/locales/server.en_GB.yml
+++ b/config/locales/server.en_GB.yml
@@ -34,8 +34,6 @@ en_GB:
     <<: *datetime_formats
   themes:
     bad_color_scheme: "Can not update theme, invalid colour palette"
-    compile_error:
-      unrecognized_extension: "Unrecognised file extension: %{extension}"
     import_error:
       generic: An error occurred whilst importing that theme
     errors:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 1c9fd3cd2d..9bb1e6e0f3 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -59,8 +59,6 @@ es:
     bad_color_scheme: "No se puede actualizar el tema, paleta de colores no válida"
     other_error: "Algo salió mal al actualizar el tema"
     ember_selector_error: "Lo sentimos. No se permite usar selectores #ember o .ember-view, porque los nombres se generan dinámicamente al ejecutarse y cambiarán con el tiempo, lo que hará que se rompa el CSS en el futuro. Prueba con otro selector."
-    compile_error:
-      unrecognized_extension: "Extensión de archivo no reconocida: %{extension}"
     import_error:
       generic: Ha ocurrido un error al importar el tema
       upload: "Error al crear el recurso: %{name}. %{errors}"
@@ -73,6 +71,7 @@ es:
       file_too_big: "El archivo sin comprimir es demasiado grande."
       unknown_file_type: "El archivo que cargaste no parece ser un tema de Discourse válido."
       not_allowed_theme: "«%{repo}» no está en la lista de temas permitidos (ver el ajuste global «allowed_theme_repos»)."
+      ssh_key_gone: "Has esperado demasiado tiempo para instalar el tema y la clave SSH ha caducado. Inténtalo de nuevo."
     errors:
       component_no_user_selectable: "Los componentes del tema no pueden ser seleccionables por el usuario"
       component_no_default: "Los componentes del tema no pueden ser tema predeterminado"
@@ -129,6 +128,7 @@ es:
         unsubscribe_not_allowed: "Sucede cuando no se le permite a este usuario anular la subscripción por correo electrónico."
         email_not_allowed: "Ocurre cuando la dirección de correo electrónico no está en la lista de permitidos o está en la lista de bloqueo."
       unrecognized_error: "Error no identificado"
+    secure_uploads_placeholder: "Censurado: este sitio tiene activadas las cargas seguras. Visita el tema o haz clic en «Ver multimedia» para ver las cargas adjuntas."
     view_redacted_media: "Ver multimedia"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -198,6 +198,7 @@ es:
       page_publishing_requirements: "No se puede activar la publicación de páginas si secure media está activado."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de respaldo salvo que hayas rellenado «%{setting_name}»."
       s3_bucket_reused: "No puedes usar el mismo bucket para «s3_upload_bucket» y «s3_backup_bucket». Selecciona otro bucket o usa una ruta diferente para cada bucket."
+      secure_uploads_requirements: "Las subidas en S3 deben estar activadas antes de activar las subidas seguras."
       share_quote_facebook_requirements: "Debes establecer la app id de Facebook para activar compartir citas en Facebook."
       second_factor_cannot_enforce_with_socials: "No puedes obligar el uso de 2FA con inicios de sesión usando redes sociales. Desactiva primero los inicios de sesión con %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "No puedes obligar a usar la autenticación de dos factores si los inicios de sesión locales están desactivados."
@@ -244,6 +245,9 @@ es:
       invalid_access: "No tienes permitido ver el recurso solicitado."
     requires_groups: "La invitación no se ha guardado porque el tema especificado es inaccesible. Añade uno de los siguientes grupos: %{groups}."
     domain_not_allowed: "Esta invitación no permite registrarte con esta dirección de correo."
+    max_redemptions_allowed_one: "para las invitaciones por correo electrónico debe ser 1."
+    redemption_count_less_than_max: "debe ser inferior a %{max_redemptions_allowed}."
+    email_xor_domain: "Los campos de correo electrónico y dominio no están permitidos al mismo tiempo"
   bulk_invite:
     file_should_be_csv: "El archivo subido debería estar en formato csv."
     max_rows: "Las primeras %{max_bulk_invites} invitaciones se han enviado. Intenta dividir el archivo en partes más pequeñas."
@@ -253,6 +257,7 @@ es:
     max_redemptions_limit: "debe ser entre 2 y %{max_limit}."
   topic_invite:
     failed_to_invite: "No se puede invitar al usuario a este tema sin ser miembro de un grupo en cualquiera de los siguientes grupos: %{group_names}."
+    not_pm: "Solo puedes invitar a mensajes privados."
     user_exists: "Lo sentimos, ese usuario ya fue invitado. Solo se puede invitar a un usuario a un tema una vez."
     muted_topic: "Lo sentimos, el usuario ha silenciado este tema."
     receiver_does_not_allow_pm: "Lo sentimos, el usuario no permite que le envíes mensajes privados."
@@ -601,7 +606,7 @@ es:
   staff_category_name: "Personal"
   staff_category_description: "Categoría privada para debates entre moderadores y administradores. Los temas solo serán visibles para miembros del equipo."
   discourse_welcome_topic:
-    title: "Te damos la bienvenida a Discourse"
+    title: "¡Te damos la bienvenida a nuestra comunidad!"
     body: |2
 
       El primer párrafo de este tema anclado será visible para todos los usuarios como mensaje de bienvenida en tu página principal. ¡Es importante!
@@ -1441,7 +1446,7 @@ es:
     show_pinned_excerpt_mobile: "Mostrar extracto de temas anclados en la vista móvil."
     show_pinned_excerpt_desktop: "Mostrar extracto de temas anclados en la vista de escritorio."
     post_onebox_maxlength: "Extensión máxima en caracteres de una publicación de Discourse en formato onebox."
-    blocked_onebox_domains: "Una lista de dominios que nunca serán oneboxeados, p. ej., wikipedia.org\n(símbolos comodines * ? no soportados)"
+    blocked_onebox_domains: "Una lista de dominios que nunca se incluirá en un solo recuadro, por ejemplo, wikipedia.org\n(no se admiten símbolos comodín *?)"
     block_onebox_on_redirect: "Bloquear onebox para URLs que redireccionen."
     allowed_inline_onebox_domains: "Una lista de dominios que serán oneboxed en forma de miniatura si están vinculados sin título"
     enable_inline_onebox_on_all_domains: "Ignorar el ajuste del sitio inline_onebox_domain_allowlist y permitir inline onebox en todos los dominios."
@@ -1475,6 +1480,8 @@ es:
     summary_percent_filter: "Cuando un usuario hace clic en «resumen de este tema», mostrar el % de las publicaciones destacadas"
     summary_max_results: "Cantidad máxima de publicaciones devueltas en «resumen de este tema»"
     summary_timeline_button: "Mostrar un botón para «Resumir» en la línea de tiempo"
+    enable_personal_messages: "DEPRECIADO, utiliza en su lugar el ajuste «grupos habilitados para mensajes personales». Permitir a los usuarios de nivel de confianza 1 (configurable a través de la confianza mínima para enviar mensajes) crear mensajes y responder a mensajes. Ten en cuenta que el personal siempre puede enviar mensajes, sea cual sea."
+    personal_message_enabled_groups: "Permite a los usuarios de estos grupos crear mensajes y responder a los mismos. Los grupos de nivel de confianza incluyen todos los niveles de confianza por encima de ese número, por ejemplo, elegir el nivel de confianza_1 también permite a los usuarios del nivel de confianza_2, 3, 4 enviar MP. Ten en cuenta que el personal siempre puede enviar mensajes, sea cual sea."
     enable_system_message_replies: "Permite a los usuarios responder a los mensajes del sistema, incluso si los mensajes personales están desactivados."
     enable_chunked_encoding: "Activar respuestas en lotes del servidor. Esta funcionalidad debería funcionar en casi todos los entornos, pero algunos proxies pueden causar que las respuestas tarden"
     long_polling_base_url: "URL base usada para el long polling (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al pull de origen) ejemplo: http://origin.site.com"
@@ -1602,9 +1609,9 @@ es:
     auth_overrides_name: "Sobrescribir nombre completo local con el del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación."
     discourse_connect_overrides_avatar: "Sobreescribir el avatar de los usuarios con el valor dado por DisccourseConnect. Al activarlo, los usuarios no podrán subir sus propios avatares desde Discourse."
     discourse_connect_overrides_location: "Sobrescribir la ubicación de los usuarios por el valor dado por DisccourseConnect y evitar cambios desde Discourse."
-    discourse_connect_overrides_website: "Sobrescribir la página web de los usuarios por el valor dado por DisccourseConnect y evitar cambios desde Discourse."
-    discourse_connect_overrides_profile_background: "Sobrescribir el fondo de perfil de los usuarios por el valor dado por DisccourseConnect y evitar cambios desde Discourse."
-    discourse_connect_overrides_card_background: "Sobrescribir el fondo de la tarjeta de los usuarios por el valor dado por DisccourseConnect y evitar cambios desde Discourse."
+    discourse_connect_overrides_website: "Sobrescribe el sitio web del usuario con el valor de la carga útil de DiscourseConnect y evita los cambios locales."
+    discourse_connect_overrides_profile_background: "Sobrescribe el fondo del perfil del usuario con el valor de la carga útil de DiscourseConnect."
+    discourse_connect_overrides_card_background: "Sobrescribe el fondo de la tarjeta de usuario con el valor de la carga útil de DiscourseConnect."
     discourse_connect_not_approved_url: "Redireccionar cuentas no aprobadas a esta URL al iniciar sesión con DiscourseConnect."
     discourse_connect_allows_all_return_paths: "No restringir el dominio para return_paths (rutas de vuelta) de DiscourseConnect (por defecto, la ruta de vuelta debe estar en el sitio actual)"
     enable_local_logins: "Activar inicio de sesión local con usuario y contraseña. CUIDADO: si lo desactivas, puede que no puedas iniciar sesión si no has configurado otro medio alternativo primero."
@@ -1616,7 +1623,9 @@ es:
     google_oauth2_client_secret: "Secreto del cliente de tu aplicación de Google."
     google_oauth2_prompt: "Una lista opcional delimitada por valores de cadena que especifica si el servidor de autorizaciones solicita al usuario la reautenticación y el consentimiento. Ver <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> para los valores posibles."
     google_oauth2_hd: "Un dominio opcional hospedado por Google Apps limitará el inicio de sesión. Ver <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> para más detalles."
-    google_oauth2_hd_groups: "(experimental) Pedir una lista de los grupos del dominio del usuario cuando inicie sesión con Google. Los grupos obtenidos pueden usarse para añadir al usuario automáticamente a grupos (configúralo en el grupo en el que quieras activar la funcionalidad)."
+    google_oauth2_hd_groups: "(experimental) Pedir una lista de los grupos del dominio del usuario cuando inicie sesión con Google. Los grupos obtenidos pueden usarse para añadir al usuario automáticamente a grupos (configúralo en el grupo en el que quieras activar la funcionalidad). Para más información, consulta https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "Una dirección de correo electrónico perteneciente a una cuenta de administrador de Google Workspace. Se utilizará con las credenciales de la cuenta de servicio para obtener la información del grupo."
+    google_oauth2_hd_groups_service_account_json: "Información clave con formato JSON para la cuenta de servicio. Se utilizará para obtener la información del grupo."
     enable_twitter_logins: "Activar autenticación mediante Twitter requiere una twitter_consumer_key y un twitter_consumer_secret. Consulta <a href='https://meta.discourse.org/t/13395' target='_blank'>configuración del inicio de sesión mediante Twitter (e inserciones) para Discourse</a>."
     twitter_consumer_key: "Clave del consumidor para la autenticación mediante Twitter, registrado en <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Secreto del consumidor para la autenticación mediante Twitter, registrado en <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -1666,6 +1675,7 @@ es:
     max_personal_messages_per_day: "Número máximo de nuevos mensajes personales que un usuario puede crear al día."
     max_invites_per_day: "Máximo número de invitaciones que un usuario puede enviar al día."
     max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día."
+    max_topic_invitations_per_minute: "Número máximo de invitaciones de temas que un usuario puede enviar por minuto."
     max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por dirección IP por hora."
     max_logins_per_ip_per_minute: "Máximo número de inicios de sesión permitidos por dirección IP por minuto."
     max_post_deletions_per_minute: "Número máximo de publicaciones que un usuario puede borrar por minuto. Poner a 0 para no dejar borrar publicaciones."
@@ -1744,6 +1754,7 @@ es:
     min_trust_to_edit_wiki_post: "El nivel mínimo de confianza requerido para editar una publicación marcada como wiki."
     min_trust_to_edit_post: "El nivel mínimo de confianza requerido para editar publicaciones."
     min_trust_to_allow_self_wiki: "El nivel mínimo de confianza requerido para que un usuario convierta sus propias publicaciones a wiki."
+    min_trust_to_send_messages: "DEPRECIADO, utiliza en su lugar el ajuste «grupos habilitados para mensajes personales». El nivel de confianza mínimo requerido para crear nuevos mensajes personales."
     min_trust_to_send_email_messages: "Nivel de confianza mínimo para mandar mensajes personales a través de correo electrónico."
     min_trust_to_flag_posts: "El nivel mínimo de confianza requerido para denunciar publicaciones"
     min_trust_to_post_links: "El nivel mínimo de confianza requerido para incluir enlaces en una publicación"
@@ -1814,7 +1825,7 @@ es:
     topic_view_duration_hours: "Contar una visita a un nuevo tema por IP/Usuario cada N horas"
     user_profile_view_duration_hours: "Contar una nueva visita de perfil por IP/Usuario cada N horas"
     levenshtein_distance_spammer_emails: "Al revisar coincidencias por correos electrónicos de spammers, cantidad de caracteres diferentes que permiten una coincidencia parcial."
-    max_new_accounts_per_registration_ip: "Si ya hay (n) cuentas de nivel de confianza 0 en esta IP (y ninguna es de un miembro del STAFF o tiene al menos nivel de confianza), bloquear nuevos registros desde esa dirección. Poner a 0 para desactivar este límite."
+    max_new_accounts_per_registration_ip: "Si ya hay (n) cuentas de nivel de confianza 0 en esta IP (y ninguna es de un miembro del personal o tiene al menos nivel de confianza), bloquear nuevos registros desde esa dirección. Poner a 0 para desactivar este límite."
     min_ban_entries_for_roll_up: "Al hacer clic en el botón agrupar, se creará un nuevo rango de entradas prohibidas si hay al menos (N) entradas."
     max_age_unmatched_emails: "Eliminar entradas de correos electrónicos prohibidos que no coincidan después de (N) días."
     max_age_unmatched_ips: "Eliminar entradas de IP prohibidos que no coincidan después de (N) días."
@@ -1868,6 +1879,7 @@ es:
     raw_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante."
     raw_rejected_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante rechazado."
     delete_rejected_email_after_days: "Eliminar correos rechazados anteriores a (n) días."
+    require_change_email_confirmation: "Requerir a los usuarios que no son del personal que confirmen su antigua dirección de correo electrónico antes de cambiarla. No se aplica a los usuarios del personal, siempre tienen que confirmar su antigua dirección de correo electrónico."
     manual_polling_enabled: "Lanza correos electrónicos usando la API para las respuestas por correo electrónico."
     pop3_polling_enabled: "Poll vía POP3 para respuestas por correo electrónico."
     pop3_polling_ssl: "Usar SSL mientras se conecta al servidor POP3. (Recomendado)"
@@ -1946,6 +1958,7 @@ es:
     enable_mobile_theme: "Los dispositivos móviles utilizan un tema adaptado, con la habilidad de cambiar al estilo de sitio completo. Desactiva esta opción si quieres utilizar una plantilla personalizada que sea completamente adaptable."
     dominating_topic_minimum_percent: "Porcentaje de publicaciones que un usuario debe hacer en un mismo tema antes de que se le muestre un recordatorio acerca de dominar en demasía un tema."
     disable_avatar_education_message: "Desactivar mensaje educacional para que los usuarios cambien su foto de perfil."
+    pm_warn_user_last_seen_months_ago: "Al crear un nuevo PM, advierte a los usuarios cuando el destinatario no se haya visto hace más de n meses."
     suppress_uncategorized_badge: "No mostrar la etiqueta de los temas sin categoría en la lista de temas."
     header_dropdown_category_count: "Cantidad de categorías que se pueden mostrar en el menú desplegable del encabezado."
     permalink_normalizations: "Aplicar la siguiente expresión regular antes de hacer coincidir los permalinks, por ejemplo: /(topic.*)\\?.*/\\1 despojará las cadenas de consulta de las rutas de los temas. El formato es regex+string usa \\1 etc. para acceder a capturas"
@@ -1993,6 +2006,12 @@ es:
     delete_merged_stub_topics_after_days: "Número de días que hay que esperar antes de eliminar automáticamente los temas pendientes totalmente fusionados. Poner a 0 para no eliminar nunca los temas pendientes."
     bootstrap_mode_min_users: "Número mínimo de usuarios requerido para desactivar el modo de arranque (establece en 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que usuarios anónimos descarguen archivos adjuntos."
+    secure_media: 'DEPRECIADO: utiliza el ajuste secure_uploads en su lugar, se eliminará en Discourse 3.0.'
+    secure_uploads: 'Limita el acceso a TODAS las subidas (imágenes, vídeo, audio, texto, pdfs, zips y otros). Si se activa la opción de «inicio de sesión obligatorio», solo los usuarios que hayan iniciado sesión podrán acceder a las subidas. De lo contrario, el acceso se limitará solo a las subidas de medios en los mensajes privados y en las categorías privadas. ADVERTENCIA: Esta configuración es compleja y requiere un profundo conocimiento administrativo. Consulta <a target="_blank" href="https://meta.discourse.org/t/-/140017">el tema de subidas seguras en Meta</a> para más detalles.'
+    secure_media_allow_embed_images_in_emails: "DEPRECIADO: usar secure_uploads_allow_embed_images_in_emails, se eliminará en Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "Permite incrustar imágenes seguras que normalmente estarían redactadas en los correos electrónicos, si su tamaño es menor que el ajuste de «tamaño máximo de la imagen incrustada en el correo electrónico»."
+    secure_media_max_email_embed_image_size_kb: "DEPRECIADO: usar secure_uploads_max_email_embed_image_size_kb, se eliminará en Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "El tamaño límite para las imágenes seguras que se incrustarán en los correos electrónicos si está activada la configuración «las subidas seguras permiten incrustarlas en los correos electrónicos». Sin esa configuración activada, esta configuración no tiene efecto."
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» desactivará completamente el slug."
     enable_emoji: "Activar emoji"
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( se convertirán a emojis"
@@ -2086,6 +2105,8 @@ es:
     heading_font: "Fuente a usar para los encabezados del sitio. Los temas lo pueden sobrescribir a través de la propiedad personalizada de CSS «--heading-font-family»."
     enable_sitemap: "Generar un sitemap para el sitio e incluirlo en el archivo robots.txt."
     sitemap_page_size: "Número de URLs que incluir en cada página del sitemap. Máximo de 50.000"
+    enable_user_status: "(experimental) Permitir a los usuarios establecer un mensaje de estado personalizado (emoji + descripción)."
+    enable_onboarding_popups: "(experimental) Habilitar ventanas emergentes educativas que describan las características clave a los usuarios"
     short_title: "El título corto se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe limitarse a 12 caracteres."
     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."
@@ -2097,11 +2118,12 @@ es:
     share_quote_visibility: "Cuándo mostrar los botones de compartir citas: nunca, a los usuarios anónimos solo o a todos los usuarios. "
     create_revision_on_bulk_topic_moves: "Crear edición para las primeras publicaciones cuando los temas se mueven a una nueva categoría en masa."
     allow_changing_staged_user_tracking: "Permitir que los usuarios con permisos de administración cambien las preferencias de notificación de categorías y etiquetas de los usuarios temporales."
-    use_email_for_username_and_name_suggestions: "Usar la primera parte de las direcciones de correo electrónico para las sugerencias de nombre de usuario y nombre. Ten en cuenta que esto facilita que el público adivine las direcciones de correo electrónico completas de los usuarios (porque una gran proporción de personas usan servicios como `gmail.com`)."
+    use_email_for_username_and_name_suggestions: "Usar la primera parte de las direcciones de correo electrónico para las sugerencias de nombre de usuario y nombre. Ten en cuenta que esto facilita que el público adivine las direcciones de correo electrónico completas de los usuarios (porque una gran proporción de personas usan servicios como «gmail.com»)."
     use_name_for_username_suggestions: "Usar el nombre completo para sugerir nombres de usuario"
     suggest_weekends_in_date_pickers: "Incluir fines de semana (sábados y domingos) en las sugerencias de los selectores de fecha (desactiva esto si solo usas Discourse de lunes a viernes)"
     splash_screen: "Muestra una pantalla de carga temporal mientras los archivos de la página se cargan"
     default_sidebar_categories: "Las categorías seleccionadas aparecerán por defecto en la sección de categorías de la barra lateral."
+    default_sidebar_tags: "Las etiquetas seleccionadas se mostrarán por defecto en la sección Etiquetas de la barra lateral."
     enable_new_user_profile_nav_groups: "EXPERIMENTAL: Los usuarios de los grupos seleccionados verán el nuevo menú de navegación del perfil de usuario"
     errors:
       invalid_css_color: "Color no válido. Introduce el nombre de un color o su valor hexadecimal."
@@ -2130,6 +2152,7 @@ es:
       reply_by_email_address_is_empty: "Debes establecer el campo «dirección para responder por correo electrónico» antes de activar respuesta por correo electrónico."
       email_polling_disabled: "Debes activar el polling sea manual o POP3 antes de activar la respuesta por correo electrónico."
       user_locale_not_enabled: "Debes activar primero «permitir usuario local» antes de activar esta opción."
+      personal_message_enabled_groups_invalid: "Debes especificar al menos un grupo para esta configuración. Si no quieres que nadie, excepto el personal, envíe MP, elige el grupo del personal."
       invalid_regex: "La expresión regular no es válida o no está permitida."
       invalid_regex_with_message: "La expresión regular «%{regex}» contiene un error: %{message}"
       email_editable_enabled: "Debes desactivar primero «correo electrónico editable» antes de activar esta opción."
@@ -2153,7 +2176,7 @@ es:
       unicode_usernames_avatars: "El sistema interno de avatares no soporta nombres de usuario Unicode."
       list_value_count: "La lista debe contener exactamente %{count} valores."
       markdown_linkify_tlds: "No puedes incluir el valor «*»"
-      google_oauth2_hd_groups: "Rellena el ajuste «google oauth2 hd» antes de activar esta opción."
+      google_oauth2_hd_groups: "Debes configurar todos los ajustes de «google oauth2 hd» antes de activar este ajuste."
       search_tokenize_chinese_enabled: "Debes desactivar el ajuste «search_tokenize_chinese» antes de activar este."
       search_tokenize_japanese_enabled: "Debes desactivar el ajuste «search_tokenize_japanese» antes de activar este."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "No puedes activar DiscourseConnect si la autenticación de dos factores (2FA) es obligatoria."
@@ -2774,9 +2797,23 @@ es:
     bulk_invite_succeeded:
       title: "Invitación en masa realizada con éxito"
       subject_template: "Invitación masiva procesada con éxito"
+      text_body_template: |
+        Tu archivo de invitación masiva ha sido procesado, se han enviado por correo electrónico %{sent} invitaciones, se han omitido %{skipped} con %{warnings} advertencia(s).
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "La invitación en masa falló"
       subject_template: "Invitación masiva procesada con algunos errores"
+      text_body_template: |
+        Tu archivo de invitación masiva ha sido procesado, se han enviado por correo electrónico %{sent} invitaciones, se han omitido %{skipped} con %{warnings} advertencia(s) y %{failed} error(es).
+
+        Este es el registro:
+
+        ``` text
+        %{logs}
+        ```
     user_added_to_group_as_owner:
       title: "Te han añadido como propietario a un grupo"
       subject_template: "Te han añadido como propietario al grupo %{group_name}"
@@ -3000,6 +3037,12 @@ es:
     email_reject_too_many_recipients:
       title: "El correo electrónico rechaza demasiados destinatarios"
       subject_template: "[%{email_prefix}] Problema del correo – Demasiados destinatarios"
+      text_body_template: |
+        Lo sentimos, pero tu mensaje de correo electrónico a %{destination} (titulado %{former_title}) no ha funcionado.
+
+        Has intentado enviar un correo electrónico a más de %{max_recipients_count} personas y nuestro sistema ha etiquetado automáticamente tu correo electrónico como spam.
+
+        Si crees que se trata de un error, [ponte en contacto con un miembro del personal](%{base_url}/about).
     email_error_notification:
       title: "Error de notificación de correo electrónico"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Error de autenticación POP"
@@ -3664,15 +3707,15 @@ es:
     abort_multipart_failure: "Fallo al abortar una subida en varias partes en el almacenamiento externo."
     complete_multipart_failure: "Fallo al completar la subida en varias partes en el almacenamiento externo."
     external_upload_not_found: "La carga no se encontró en la tienda externa. %{additional_detail}"
-    checksum_mismatch_failure: "La suma de comprobación del archivo que has subido no coincide. Puede que haya cambiado su contenido mientras se subía. Por favor, inténtalo de nuevo."
+    checksum_mismatch_failure: "La suma de comprobación del archivo que has subido no coincide. Puede que haya cambiado su contenido mientras se subía. Inténtalo de nuevo."
     cannot_promote_failure: "No se ha podido completar la subida, puede que ya haya terminado o fallado antes."
-    size_zero_failure: "Lo siento, parece que algo ha ido mal. El archivo que estás intentando cargar ocupa 0 bytes. Inténtalo de nuevo."
+    size_zero_failure: "Lo sentimos, algo ha ido mal. El archivo que estás intentando cargar ocupa 0 bytes. Inténtalo de nuevo."
     attachments:
       too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)."
       too_large_humanized: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size})."
     images:
       too_large: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB). Modifica sus dimensiones e inténtalo de nuevo."
-      too_large_humanized: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size}). Por favor, reduce su tamaño e inténtalo de nuevo."
+      too_large_humanized: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size}). Reduce su tamaño e inténtalo de nuevo."
       larger_than_x_megapixels: "Lo sentimos, la imagen que estas intentando subir es demasiado grande (tamaño máximo %{max_image_megapixels}-megapixels). Hazla mas pequeña e inténtalo de nuevo."
       size_not_found: "Lo sentimos, no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?"
     placeholders:
@@ -4409,6 +4452,7 @@ es:
       message: "<p>Hemos reenviado el correo electrónico de activación a <b>%{email}</b>"
   safe_mode:
     title: "Activar modo seguro"
+    description: "El modo seguro te permite probar tu sitio sin cargar plugins o temas."
     no_themes: "Desactivar temas y componentes de tema"
     no_unofficial_plugins: "Desactivar plugins no oficiales"
     no_plugins: "Desactivar todos los plugins"
@@ -4433,13 +4477,14 @@ es:
           default_locale:
             label: "Idioma"
       privacy:
+        title: "Experiencia del miembro"
         fields:
           login_required:
             placeholder: "Privada"
             extra_description: "Solo los usuarios con una sesión iniciada pueden acceder a esta comunidad"
           invite_only:
-            placeholder: "Sólo por invitación"
-            extra_description: "Los usuarios deben ser invitados por usuarios de confianza o el STAFF antes de que puedan registrarse."
+            placeholder: "Solo por invitación"
+            extra_description: "Los usuarios deben ser invitados por usuarios de confianza o el personal antes de que puedan registrarse."
           must_approve_users:
             placeholder: "Requiere aprobación"
             extra_description: "Los usuarios deben ser aprobados por el personal"
@@ -4479,7 +4524,7 @@ es:
               subcategories_with_featured_topics:
                 label: "Subcategorías con temas destacados"
       branding:
-        title: "Imagen de marca de la comunidad"
+        title: "Personalizar logotipos"
         fields:
           logo:
             label: "Logo principal"
@@ -4489,17 +4534,21 @@ es:
             description: "Una versión cuadrada del logotipo. Estará en la parte superior izquierda al bajar en la página, y saldrá como icono cuando se comparta en las redes sociales. Lo ideal es que sea de al menos de 512x512 píxeles."
           favicon:
             label: "Icono del navegador"
+            description: "Icono utilizado para representar tu sitio en los navegadores web que se ve bien en tamaños pequeños. Se recomienda PNG o JPG. El logotipo cuadrado se utiliza por defecto."
           large_icon:
             label: "Icono grande"
+            description: "Icono utilizado para representar tu sitio en dispositivos móviles que se ve bien en tamaños mayores. Lo ideal es que sea superior a 512x512. Logotipo cuadrado utilizado por defecto."
       corporate:
-        title: "Contacto y organización"
+        title: "Tu organización"
         fields:
           company_name:
             label: "Nombre de la compañía"
             placeholder: "Organización de ejemplo"
+            description: "Introducido en tu página de Términos del servicio. Puedes omitirlo si no existe ninguna empresa."
           governing_law:
             label: "Ley que rige"
             placeholder: "Ley de California"
+            description: "Introducido en tu página de Términos del servicio. Puedes omitirlo si no existe ninguna empresa."
           contact_url:
             label: "Página web"
             placeholder: "https://ejemplo.com/contacto"
@@ -4507,6 +4556,7 @@ es:
           city_for_disputes:
             label: "Ciudad para disputas"
             placeholder: "San Francisco, California"
+            description: "Introducido en tu página de Términos del servicio. Puedes omitirlo si no existe ninguna empresa."
           site_contact:
             label: "Mensajes automatizados"
             description: "Todos los mensajes personales automatizados de Discourse serán enviados desde este usuario, tales como denuncias de advertencia y notificaciones de copias de seguridad exitosas."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index f42476bd11..5dd4ce33a9 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -283,7 +283,6 @@ et:
   staff_category_name: "Meeskond"
   staff_category_description: "Privaatfoorum meeskonnasisesteks aruteludeks. Teemad on nähtavad vaid adminnidele ja moderaatoritele."
   discourse_welcome_topic:
-    title: "Tere tulemast Discourse'i"
     body: |2
 
       Selle märgistatud teema esimene lõik saab olema kõikidele uutele külastajatele nähtav kui tervitustekst sinu avalehel. See on oluline!
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index d307533b01..d912b7b0fb 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -58,8 +58,6 @@ fa_IR:
     bad_color_scheme: "نمی‌توان پوسته را بروزرسانی کرد، جعبه رنگ نامعتبر"
     other_error: "در بروزرسانی قالب مشکلی پیش آمده"
     ember_selector_error: "متأسفیم - استفاده از انتخابگرهای #ember یا .ember-view در CSS مجاز نیست ، زیرا این نام‌ها در زمان اجرا به صورت پویا تولید شده و با گذشت زمان تغییر می‌کنند که در نهایت منجر به تولید CSS غیر معتبر خواهد شد. انتخابگر دیگری را امتحان کنید."
-    compile_error:
-      unrecognized_extension: "پرونده افزونه شناسایی نشد:%{extension}"
     import_error:
       generic: خطایی در هنگام وارد کردن پوسته اتفاق افتاده است
       about_json_values: "about.json حاوی مقادیر نامعتبر است: %{errors}"
@@ -375,7 +373,7 @@ fa_IR:
   staff_category_name: "همکاران"
   staff_category_description: "بخش خصوصی برای گفتگوی مدیران. موضوعات فقط برای مدیران ارشد و مدیران قابل رویت است."
   discourse_welcome_topic:
-    title: "به دیسکورس خوش آمدید"
+    title: "به انجمن ما خوش آمدید!"
     body: |2
 
       اولین پاراگراف این موضوع سنجاق شده و به عنوان پیام خوش‌آمد گویی به تمام بازدید‌کنندگان نمایش داده می‌شود. که مهم است!
@@ -1244,6 +1242,7 @@ fa_IR:
     enable_sitemap: "یک نقشه سایت برای سایت خود ایجاد کنید و آن را در پرونده robots.txt قرار دهید."
     sitemap_page_size: "تعداد آدرس‌های اینترنتی که باید در هر صفحه نقشه سایت گنجانده شود. حداکثر ۵۰٫۰۰۰"
     enable_user_status: "(آزمایشی) به کاربران اجازه می‌دهد، که پیام وضعیت را تغییر دهند (شکلک + توضیحات)."
+    enable_onboarding_popups: "(آزمایشی) پنجره‌های بازشونده آموزشی را فعال کنید که ویژگی‌های کلیدی را برای کاربران توضیح دهد"
     use_name_for_username_suggestions: "هنگام پیشنهاد نام‌کاربری از نام کامل، کاربر استفاده کنید."
     errors:
       invalid_email: "آدرس ایمیل نامعتبر"
@@ -2303,12 +2302,14 @@ fa_IR:
               categories_and_top_topics:
                 label: "دسته بندی ها و مباحث داغ"
       branding:
+        title: "سفارشی کردن لوگوها"
         fields:
           logo:
             label: "لوگو اصلی"
           large_icon:
             label: "آیکن بزرگ"
       corporate:
+        title: "سازمان شما"
         fields:
           contact_url:
             label: "صفحه وب"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index fd703369f8..5ea048413d 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -58,8 +58,6 @@ fi:
     bad_color_scheme: "Teemaa ei voi päivittää, väripaletti ei kelpaa"
     other_error: "Jokin meni vikaan päivitettäessä teemaa"
     ember_selector_error: "Valitettavasti #ember- tai .ember-näkymän CSS-valitsimien käyttö ei ole sallittua, koska nämä nimet luodaan dynaamisesti ajon aikana ja ne muuttuvat ajan myötä, mikä johtaa lopulta rikkoutuneeseen CSS:ään. Kokeile toista valitsinta."
-    compile_error:
-      unrecognized_extension: "Tuntematon tiedostomuoto: %{extension}"
     import_error:
       generic: Teeman tuomisessa tapahtui virhe
       about_json: "Virhe tuotaessa: about.json ei ole olemassa tai ei kelpaa. Oletko varma, että tämä on Discourse-teema?"
@@ -574,7 +572,6 @@ fi:
   staff_category_name: "Henkilökunta"
   staff_category_description: "Yksityinen alue henkilökunnan keskusteluille. Ketjut näkyvät ainoastaan ylläpitäjille ja valvojille."
   discourse_welcome_topic:
-    title: "Tervetuloa käyttämään Discoursea"
     body: |2
 
       Tämän kiinnitetyn ketjun ensimmäinen kappale on sivustolla vierailevalle näkyvä tervetulotoivotus. Se on tärkeä!
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index fda1c54b07..92b154f348 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -59,8 +59,6 @@ fr:
     bad_color_scheme: "Impossible de mettre à jour le thème, la palette de couleurs est invalide"
     other_error: "Une erreur s'est produite lors de la mise à jour du thème"
     ember_selector_error: "Nous sommes désolés, utiliser un sélecteur CSS nommé #ember ou .ember-view n'est pas permis, car ces noms sont générés dynamiquement au moment de l'exécution et sont amenés à changer au cours du temps, ce qui entraînera potentiellement un dysfonctionnement des définitions CSS. Veuillez choisir un autre sélecteur."
-    compile_error:
-      unrecognized_extension: "Extension de fichier non reconnue : %{extension}"
     import_error:
       generic: Une erreur s'est produite lors de l'importation de ce thème
       upload: "Erreur lors de la création de l'élément de téléchargement : %{name}. %{errors}"
@@ -596,7 +594,6 @@ fr:
   staff_category_name: "Responsables"
   staff_category_description: "Catégorie privée pour les discussions entre responsables. Les sujets ne sont visibles que pour les administrateurs et les modérateurs."
   discourse_welcome_topic:
-    title: "Bienvenue sur Discourse"
     body: |2
 
       Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
@@ -1602,7 +1599,6 @@ fr:
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
     google_oauth2_prompt: "Liste facultative de valeurs de chaînes de caractères délimitées par des espaces, qui spécifie si le serveur d'autorisation invite l'utilisateur à s'authentifier à nouveau et à donner son consentement. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> pour connaître les valeurs possibles."
     google_oauth2_hd: "Un domaine optionnel Google Apps Hosted auquel la connexion sera limitée. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> pour obtenir plus de détails."
-    google_oauth2_hd_groups: "(réglage expérimental) Pour chaque utilisateur, récupérer les groupes Google existant sur le domaine hébergé au moment de l'authentification. Les groupes Google ainsi récupérés peuvent être utilisés pour délencher automatiquement l'appartenance à un groupe Discourse. (Voir la rubrique 'Groupes' dans les paramètres.)"
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et twitter_consumer_secret. Voir <a href='https://meta.discourse.org/t/13395' target='_blank'>Configurer la connexion Twitter (avec rich embeds) pour Discourse</a>."
     twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2134,7 +2130,6 @@ fr:
       unicode_usernames_avatars: "Les avatars du système n'acceptent pas les noms d'utilisateurs contenant des caractères Unicode."
       list_value_count: "La liste doit contenir exactement %{count} valeurs."
       markdown_linkify_tlds: "Vous ne pouvez pas inclure la valeur '*'."
-      google_oauth2_hd_groups: "Pour activer ce paramètre, vous devez d'abord configurer 'google oauth2 hd'."
       search_tokenize_chinese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver 'search_tokenize_chinese'."
       search_tokenize_japanese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver 'search_tokenize_japanese'."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Vous ne pouvez pas activer DiscourseConnect si le 2FA est obligatoire."
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index aee5a58a15..6cb09ef809 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -58,8 +58,6 @@ gl:
     bad_color_scheme: "Non se pode actualizar o tema; paleta de cores non válida"
     other_error: "Xurdiu un problema ao actualizar o tema"
     ember_selector_error: "Desculpe: non se permite o uso de selectores CSS #ember ou .ember-view, porque estes nomes xéranse dinamicamente no tempo de execución e cambiarán co paso do tempo, resultando finalmente en CSS rotos. Probe cun selector diferente."
-    compile_error:
-      unrecognized_extension: "Extensión de ficheiro non recoñecida: %{extension}"
     import_error:
       generic: Produciuse un erro ao importar este tema
       about_json: "Erro de importación: about.json non existe ou non é válido. Confirma que este é un tema de Discourse?"
@@ -557,7 +555,6 @@ gl:
   staff_category_name: "Equipo"
   staff_category_description: "Categoría privada para discusións do equipo. Os temas son visíbeis unicamente para administradores e moderadores."
   discourse_welcome_topic:
-    title: "Dámoslle a benvida a Discourse"
     body: |2
 
       O primeiro parágrafo deste tema pegado será visible como mensaxe de benvida para todos os novos visitantes na súa páxina de inicio. É, pois, importante!
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 2201302967..7c996b8a47 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -59,8 +59,6 @@ he:
     bad_color_scheme: "לא ניתן לעדכן ערכת עיצוב, מבחר הצבעים שגוי"
     other_error: "משהו השתבש בעת עדכון ערכת העיצוב"
     ember_selector_error: "עמך הסליחה – השימוש בבוררי ה־CSS‏ ‎#ember או ‎.ember-view אסור, כיוון שאלו שמות שנוצרים אוטומטית בזמן ההפעלה והם יישתנו עם הזמן, מה שיוביל לפגם ב־CSS. נא לנסות בורר אחר."
-    compile_error:
-      unrecognized_extension: "סיומת הקובץ אינה מוכרת: %{extension}"
     import_error:
       generic: אירעה שגיאה בעת ייבוא ערכת העיצוב הזו
       upload: "שגיאה ביצירת משאב להעלאה: %{name}. %{errors}"
@@ -658,7 +656,7 @@ he:
   staff_category_name: "סגל"
   staff_category_description: "קטגוריה פרטית לדיוני הסגל. הנושאים חשופים רק בפני מנהלים ומפקחים."
   discourse_welcome_topic:
-    title: "ברוך בואך ל־Discourse"
+    title: "ברוך בואך לקהילה שלנו!"
     body: |2
 
       הפסקה הראשונה של נושא נעוץ זה תראה כהודעת ״ברוכים הבאים״ לכל המבקרים החדשים באתר הבית שלכם. היא חשובה!
@@ -1729,7 +1727,9 @@ he:
     google_oauth2_client_secret: "קוד סודי של לקוח (client secret) של אפליקציית Google."
     google_oauth2_prompt: "רשימת רשות של ערכי מחרוזות מופרדים ברווחים שמציינת האם שרת האימות מבקש מהמשתמש אימות מחודש והסכמה. יש לעיין ב־<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> לצפייה בערכים האפשריים."
     google_oauth2_hd: "שם מתחם שמתארח ב־Google Apps שאליו תוגבל הכניסה. יש לעיין ב־<a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> לפרטים נוספים."
-    google_oauth2_hd_groups: "(ניסיוני) למשוך את קבוצות ה־Google של משתמשים בשם התחום המתארח עם האימות. ניתן להשתמש בקבוצות Google שנמשכו כדי להעניק חברות אוטומטית בקבוצות של Discourse (ניתן להציץ בהגדרות הקבוצה)."
+    google_oauth2_hd_groups: "(ניסיוני) למשוך את קבוצות ה־Google של משתמשים בשם התחום המתארח עם האימות. ניתן להשתמש בקבוצות Google שנמשכו כדי להעניק חברות אוטומטית בקבוצות של Discourse (ניתן להציץ בהגדרות הקבוצה). למידע נוסף ניתן לעיין ב־https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "כתובת דוא״ל ששייכת לחשבון ניהול ב־Google Workspace. יתבצע בה שימוש עם פרטי הגישה של חשבון השירות כדי למשוך פרטי קבוצות."
+    google_oauth2_hd_groups_service_account_json: "פרטי מפתח בתצורת JSON עבור חשבון השירות. ישמש כדי למשוך פרטי קבוצות."
     enable_twitter_logins: "הפעלת אימות עם טוויטר, דורש twitter_consumer_key ו־twitter_consumer_secret. יש לעיין ב<a href='https://meta.discourse.org/t/13395' target='_blank'>הגדרת כניסה עם טוויטר (לרבות הטמעות עשירות) ל־Discourse</a>."
     twitter_consumer_key: "מפתח צרכן לאימות עם טוויטר, ניתן להירשם תחת <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "סוד צרכן לאימות עם טוויטר, ניתן להירשם תחת <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2209,6 +2209,7 @@ he:
     enable_sitemap: "ליצור מפת אתר עבור האתר שלך ולכלול אותה בקובץ robots.txt."
     sitemap_page_size: "מספר הכתובות שיתווספו בכל עמוד של מפת אתר. 50,000 לכל היותר"
     enable_user_status: "(ניסיוני) לאפשר למשתמשים להגדיר הודעת מצב מותאמת אישית (אמוג׳י + תיאור)."
+    enable_onboarding_popups: "(ניסיוני) לאפשר חלונות קופצים לימודיים המסבירים למשתמשים על תכונות מפתח"
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
     dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
@@ -2278,7 +2279,7 @@ he:
       unicode_usernames_avatars: "התמונות הייצוגיות הפנימיות של המערכת אינן תומכות בשמות משתמשים עם יוניקוד."
       list_value_count: "הרשימה חייבת להכיל בדיוק %{count} ערכים."
       markdown_linkify_tlds: "לא ניתן לכלול ערך של ‚*’."
-      google_oauth2_hd_groups: "עליך להגדיר את ‚google oauth2 hd’ בטרם הפעלת ההגדרה הזאת."
+      google_oauth2_hd_groups: "עליך להגדיר את כל הגדרות ‚google oauth2 hd’ בטרם הפעלת ההגדרה הזאת."
       search_tokenize_chinese_enabled: "עליך להשבית את ‚search_tokenize_chinese’ (חיפוש מפרק סינית) בטרם הפעלת הגדרה זו."
       search_tokenize_japanese_enabled: "עליך להשבית את ‚search_tokenize_japanese’ (חיפוש מפרק יפנית) בטרם הפעלת הגדרה זו."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "אי אפשר להפעיל את DiscourseConnect אם נאכף אימות דו־שלבי."
@@ -4676,7 +4677,7 @@ he:
               subcategories_with_featured_topics:
                 label: "תת־קטגוריות עם נושאים מובילים"
       branding:
-        title: "מיתוג הקהילה"
+        title: "לוגואים משלך"
         fields:
           logo:
             label: "לוגו ראשי"
@@ -4691,7 +4692,7 @@ he:
             label: "אייקון גדול"
             description: "סמל שמשמש לייצוג האתר שלך במכשירים ניידים שנראה טוב בגדלים גדולים. מומלץ שיהיה גדול מ־512×512. ברירת המחדל היא הלוגו הריבועי."
       corporate:
-        title: "יצירת קשר וארגון"
+        title: "הארגון שלך"
         fields:
           company_name:
             label: "שם החברה"
diff --git a/config/locales/server.hr.yml b/config/locales/server.hr.yml
index ded4c1fe77..0dadc58709 100644
--- a/config/locales/server.hr.yml
+++ b/config/locales/server.hr.yml
@@ -59,8 +59,6 @@ hr:
     bad_color_scheme: "Tema se ne može ažurirati, nevažeća paleta boja"
     other_error: "Dogodila se greška pri ažuriranju teme"
     ember_selector_error: "Žao nam je – korištenje #ember ili .ember-view CSS selektora nije dopušteno, jer se ti nazivi dinamički generiraju tijekom izvođenja i mijenjat će se tijekom vremena, što će na kraju rezultirati neispravnim CSS-om. Pokušajte s drugim selektorom."
-    compile_error:
-      unrecognized_extension: "Nastavak datoteke %{extension} nije prepoznat"
     import_error:
       generic: Došlo je do greške prilikom uvoza te teme
       upload: "Greška pri snimanju materijala: %{name}. %{errors}"
@@ -378,8 +376,6 @@ hr:
   meta_category_description: "Rasprave o ovoj stranici, njezinoj organizaciji, kako radi i kako je se može poboljšati."
   staff_category_name: "Osoblje"
   staff_category_description: "Privatna kategorija za rasprave osoblja. Teme su vidljive samo administratorima i moderatorima."
-  discourse_welcome_topic:
-    title: "Dobrodošli na Discourse"
   admin_quick_start_title: "PROČITATI PRVO: brzi vodič za administratore"
   category:
     topic_prefix: "O %{category} kategoriji"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 3b0644a2d1..bcdd5d53ee 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -56,8 +56,6 @@ hu:
   themes:
     bad_color_scheme: "A téma nem frissíthető, érvénytelen színpaletta"
     other_error: "Hiba történt az oldal stílusának frissítésekor"
-    compile_error:
-      unrecognized_extension: "Ismeretlen fájlkiterjesztés: %{extension}"
     import_error:
       about_json_values: "Az about.json érvénytelen értékeket tartalmaz: %{errors}"
       modifier_values: "Az about.json módosítók érvénytelen értékeket tartalmaznak: %{errors}"
@@ -366,7 +364,6 @@ hu:
   staff_category_name: "Stáb"
   staff_category_description: "Privát kategória a stáb számára. Ezeket a témákat csak az adminisztrátorok és moderátorok látják."
   discourse_welcome_topic:
-    title: "Üdvözöljük a Discourse-ban"
     body: |2
 
       A rögzített téma első bekezdése üdvözlő üzenetként fog megjelenni a kezdőlap összes új látogatója előtt. Ez fontos!
@@ -881,7 +878,6 @@ hu:
     hide_email_address_taken: "Ne tájékoztassa a felhasználókat arról, hogy létezik fiók egy adott e-mail-címmel a regisztráció során vagy az elfelejtett jelszó folyamata során. Teljes e-mail-cím megkövetelése az „elfelejtett jelszó” kérésekhez."
     min_password_length: "Minimum jelszóhossz."
     block_common_passwords: "A 10 000 leggyakoribb jelszó tiltása."
-    google_oauth2_hd_groups: "(kísérleti) A felhasználók a kiszolgálóhoz tartozó domainben lévő Google-csoportjainak lekérése hitelesítéskor. A lekért Google-csoportok segítségével automatikusan állíthat be Discourse csoporttagságot (lásd a csoportbeállításokat)."
     enable_experimental_sidebar_hamburger: "Lehetővé teszi a kísérleti oldalsáv és a felhasználói hamburger legördülő menü engedélyezését."
     enable_sidebar: "Engedélyezi a kísérleti oldalsávot."
     rate_limit_new_user_create_topic: "Egy téma létrehozása után az új felhasználóknak (n) másodpercet kell várniuk, mielőtt új témát hozhatnak létre."
@@ -930,7 +926,6 @@ hu:
       invalid_regex_with_message: "A(z) „%{regex}” regexben hiba van: %{message}"
       min_username_length_range: "Nem lehet a legnagyobb értéknél nagyobb legkisebb értéket beállítani."
       max_username_length_range: "Nem lehet a legkisebb értéknél kisebb legnagyobb értéket beállítani."
-      google_oauth2_hd_groups: "A beállítás engedélyezése előtt be kell ezt állítania: „google oauth2 hd”."
       search_tokenize_chinese_enabled: "A beállítás engedélyezése előtt le kell tiltania a „search_tokenize_chinese” beállítást."
       search_tokenize_japanese_enabled: "A beállítás engedélyezése előtt le kell tiltania a „search_tokenize_japanese” beállítást."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "A DiscourseConnect nem engedélyezhető, ha a 2FA kényszerítve van."
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index e53cd23abc..13b1f83bed 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -417,7 +417,6 @@ hy:
   staff_category_name: "Անձնակազմ"
   staff_category_description: "Մասնավոր կատեգորիա անձնակազմի քննարկումների համար: Թեմաները տեսանելի են միայն ադմիններին և մոդերատորներին: "
   discourse_welcome_topic:
-    title: "Բարի գալուստ Discourse"
     body: "\nԱյս ամրակցված թեմայի առաջին պարբերությունը տեսանելի կլինի որպես ողջույնի հաղորդագրություն Ձեր գլխավոր էջի բոլոր նոր այցելուներին: Սա կարևոր է!\n\n**Խմբագրեք սա**՝ դարձնելով Ձեր համայնքի համառոտ նկարագրություն՝\n\n- Ո՞ւմ համար է սա:\n- Ի՞նչ կարող են նրանք գտնել այստեղ:\n- Ինչո՞ւ պետք է նրանք գան այստեղ:\n- Որտե՞ղ կարող ենք նրանք կարդալ ավելին (հղումներ, աղբյուրներ և այլն):\n\n<img src=\"%{base_path}/images/welcome/discourse-edit-post-animated.gif\" width=\"508\" height=\"106\">\n\nՀարավոր է՝ Դուք ցանկանաք փակել այս թեման ադմինի միջոցով :wrench: (վերին աջ կողմում և ներքևում), որպեսզի մի հայտարարության վրա պատասխաններ չհավաքվեն: \n"
   admin_quick_start_title: "ԱՌԱՋԻՆ ՀԵՐԹԻՆ ԿԱՐԴԱՑԵՔ ՍԱ՝ Ադմինի Արագ Մեկնարկի Ուղեցույց"
   category:
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 4b74ae0385..b6ac35e91f 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -57,8 +57,6 @@ id:
   themes:
     bad_color_scheme: "Tidak dapat memperbarui tema, palet warna tidak valid"
     other_error: "Terjadi masalah saat memperbarui tema"
-    compile_error:
-      unrecognized_extension: "Ekstensi file tidak dikenal: %{extension}"
     import_error:
       generic: Terjadi kesalahan saat mengimpor tema itu
       unpack_failed: "Gagal membongkar berkas"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 5033fa0339..de6d95d78c 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -59,8 +59,6 @@ it:
     bad_color_scheme: "Impossibile aggiornare il tema, tavolozza dei colori non valida"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
     ember_selector_error: "Spiacenti, l'utilizzo dei selettori CSS #ember o .ember-view non è consentito perché questi nomi vengono generati dinamicamente in fase di runtime e cambieranno nel tempo generando un errore CSS. Prova un altro selettore."
-    compile_error:
-      unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
     import_error:
       generic: Errore durante l'importazione del tema
       upload: "Errore nella creazione della risorsa di caricamento: %{name}. %{errors}"
@@ -130,6 +128,7 @@ it:
         unsubscribe_not_allowed: "Succede quando annullare l'iscrizione tramite email non è consentito per questo utente."
         email_not_allowed: "Succede quando l'indirizzo e-mail non è nella lista di contatti permessi o è in quella di contatti bloccati."
       unrecognized_error: "Errore Non Riconosciuto"
+    secure_uploads_placeholder: "Oscurato: l'opzione per la sicurezza dei contenuti caricati è attivata su questo sito; visita l'argomento o clicca su Visualizza media per vedere gli allegati."
     view_redacted_media: "Visualizza media"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -199,6 +198,7 @@ it:
       page_publishing_requirements: "La pubblicazione di pagine non può essere attivata se sono attivati i supporti sicuri."
       s3_backup_requires_s3_settings: "Non è possibile utilizzare S3 per i backup a meno che non sia stato fornito '%{setting_name}'."
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
+      secure_uploads_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i caricamenti sicuri."
       share_quote_facebook_requirements: "Devi impostare un ID app Facebook per attivare la condivisione delle citazioni per Facebook."
       second_factor_cannot_enforce_with_socials: "Non si può applicare l'autenticazione a due fattori se l'acceso tramite social è attivo. Devi prima disattivarlo tramite %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare l'autenticazione a due fattori se gli accessi locali sono disabilitati."
@@ -208,6 +208,7 @@ it:
       cors_origins_should_not_have_trailing_slash: "Non aggiungere la barra finale (/) alle origini CORS."
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Gli user agent devono essere lunghi almeno 3 caratteri per evitare di limitare erroneamente la velocità degli utenti umani."
       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."
       twitter_summary_large_image_no_svg: "Le immagini di riepilogo di Twitter utilizzate per i metadati di twitter:image non possono essere immagini .svg."
     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>'
     onebox:
@@ -245,6 +246,8 @@ it:
     requires_groups: "L'invito non è stato salvato perché l'argomento specificato non è accessibile. Aggiungi uno dei seguenti gruppi: %{groups}."
     domain_not_allowed: "La tua email non può essere usata per riscattare l’invito."
     max_redemptions_allowed_one: "per gli inviti via e-mail dovrebbe essere 1."
+    redemption_count_less_than_max: "deve essere minore di %{max_redemptions_allowed}."
+    email_xor_domain: "I campi e-mail e dominio non sono consentiti contemporaneamente"
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
     max_rows: "I primi %{max_bulk_invites} inviti sono stati spediti. Prova a dividere il file in parti più piccole."
@@ -254,6 +257,7 @@ it:
     max_redemptions_limit: "dovrebbe essere compreso tra 2 e %{max_limit}."
   topic_invite:
     failed_to_invite: "L'utente non può essere invitato in questo argomento senza essere membro di uno dei seguenti gruppi: %{group_names}."
+    not_pm: "Puoi invitare solo a messaggi privati."
     user_exists: "Spiacenti, l'utente è stato già invitato. Puoi invitare un utente ad uno stesso argomento solo una volta."
     muted_topic: "Spiacenti, quell'utente ha silenziato questo argomento."
     receiver_does_not_allow_pm: "Spiacenti, quell'utente non ti permette di inviargli messaggi privati."
@@ -491,8 +495,8 @@ it:
       Puoi modificare la risposta precedente per aggiungere una citazione evidenziando il testo e selezionando il pulsante <b>Cita</b> che comparirà.
 
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte singole.
-    dominating_topic: Hai postato più del %{percent}% delle risposte qui; c'è qualcun altro che vorresti sentire?
-    get_a_room: Abbiamo notato che hai già risposto %{count} volte a @%{reply_username}. Sapevi che puoi anche scambiare messaggi personali con questa persona tramite il forum?
+    dominating_topic: Hai pubblicato più del %{percent}% delle risposte qui; lascia esprimere anche qualcun altro.
+    get_a_room: Abbiamo notato che hai già risposto %{count} volte a @%{reply_username}. Sapevi che puoi anche scambiare messaggi personali con questa persona?
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
 
@@ -596,12 +600,13 @@ it:
       <<: *errors
   uncategorized_category_name: "Senza categoria"
   general_category_name: "Generale"
+  general_category_description: "Crea qui argomenti che non rientrano in nessun'altra categoria esistente."
   meta_category_name: "Feedback Sito"
   meta_category_description: "Discussioni su questo sito, la sua organizzazione, su come funziona e come possiamo migliorarlo."
   staff_category_name: "Staff"
   staff_category_description: "Categoria privata per discussioni dello staff. Gli argomenti sono visibili solo agli amministratori e ai moderatori."
   discourse_welcome_topic:
-    title: "Benvenuto in Discourse"
+    title: "Ti diamo il benvenuto nella nostra community!"
     body: |2
 
       Il primo paragrafo di questo argomento appuntato sarà visibile come messaggio di benvenuto a tutti i nuovi visitatori sulla tua homepage. È importante!
@@ -654,7 +659,7 @@ it:
     media_placeholder:
       blocked_hotlinked_title: "Contenuti ospitati su un altro sito. Clicca per aprire in una nuova scheda."
       blocked_hotlinked: "Contenuti Esterni"
-    hidden_bidi_character: "I caratteri bidirezionali possono cambiare l'ordine di visualizzazione del testo. Ciò potrebbe essere utilizzato per nascondere del codice maligno."
+    hidden_bidi_character: "I caratteri bidirezionali possono cambiare l'ordine di visualizzazione del testo. Ciò potrebbe essere utilizzato per nascondere del codice dannoso."
     has_likes:
       one: "%{count} Mi Piace"
       other: "%{count} Mi Piace"
@@ -673,7 +678,7 @@ it:
       public_group_membership: "Stai entrando/uscendo dai gruppi troppo frequentemente. Attendi %{time_left} prima di riprovare."
       topics_per_day: "Hai raggiunto il numero massimo di nuovi argomenti consentiti al giorno. Potrai creare nuovi argomenti tra %{time_left}."
       pms_per_day: "Hai raggiunto il numero massimo di messaggi consentiti al giorno. Potrai creare nuovi messaggi tra %{time_left}."
-      create_like: "Perbacco! Hai elargito molto affetto! Però hai raggiunto il numero massimo di Mi piace assegnabili nell'arco di 24 ore, ma man mano che guadagni livelli di attendibilità, potrai mettere più Mi piace al giorno. Potrai mettere nuovamente Mi piace ai messaggi tra %{time_left}."
+      create_like: "Wow! Hai espresso il tuo grande apprezzamento! Però hai raggiunto il numero massimo di Mi piace assegnabili nell'arco di 24 ore, ma man mano che guadagni livelli di attendibilità, potrai mettere più Mi piace al giorno. Potrai mettere nuovamente Mi piace ai messaggi tra %{time_left}."
       create_bookmark: "Hai raggiunto il numero massimo di segnalibri giornalieri. Potrai creare nuovi segnalibri tra %{time_left}."
       edit_post: "Hai raggiunto il numero massimo di modifiche giornaliere. Potrai inviare nuove modifiche tra %{time_left}."
       live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare."
@@ -1329,21 +1334,21 @@ it:
       title: "Migliori utenti per Mi piace ricevuti"
       labels:
         user: Utente
-        qtt_like: Mi piace - Ricevuti
-      description: "Primi 10 utenti a ricevere dei \"mi piace\"."
+        qtt_like: Mi piace ricevuti
+      description: "I 10 migliori utenti che hanno ricevuto Mi piace."
     top_users_by_likes_received_from_inferior_trust_level:
       title: "Migliori utenti per Mi piace ricevuti da un utente con un basso livello di attendibilità"
       labels:
         user: Utente
         trust_level: Livello di attendibilità
-        qtt_like: Mi piace - Ricevuti
+        qtt_like: Mi piace ricevuti
       description: "I migliori 10 utenti con un livello di attendibilità superiore che hanno ricevuto Mi piace da persone con un livello di attendibilità inferiore."
     top_users_by_likes_received_from_a_variety_of_people:
       title: "I migliori utenti per Mi piace ricevuti da varie persone"
       labels:
         user: Utente
-        qtt_like: Mi piace - Ricevuti
-      description: "Primi 10 utenti a ricevere \"mi piace\" da una vasta gamma di persone."
+        qtt_like: Mi piace ricevuti
+      description: "I migliori 10 utenti che hanno ricevuto Mi piace da una vasta gamma di persone."
   dashboard:
     group_email_credentials_warning: 'Si è verificato un problema con le credenziali e-mail per il gruppo <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. Nessuna e-mail verrà inviata dalla casella di posta del gruppo fino a quando il problema non sarà risolto. %{error}'
     rails_env_warning: "Il tuo server è in modalità %{env}."
@@ -1374,7 +1379,7 @@ it:
     watched_word_regexp_error: "L'espressione regolare per le parole osservate %{action} non è valida. Per favore verifica le tue <a href='%{base_path}/admin/customize/watched_words'>Impostazioni sulle Parole Osservate</a>, o disabilita l'impostazione del sito 'watched words regular expressions'."
   site_settings:
     allow_bulk_invite: "Consenti inviti di massa caricando un file CSV"
-    disabled: "disabilitata"
+    disabled: "disabilitato"
     display_local_time_in_user_card: "Visualizza l'ora locale in base al fuso orario di un utente quando viene aperta la sua scheda utente."
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Cancella automaticamente tutti i messaggi nascosti che restano nascosti per più di 30 giorni."
@@ -1418,6 +1423,7 @@ it:
     download_remote_images_to_local: "Converti immagini remote (linkate) in immagini locali scaricandole; ciò preserva il contenuto anche se le immagini vengono rimosse dal sito remoto in futuro."
     download_remote_images_threshold: "Minimo spazio su disco necessario per scaricare le immagini remote in locale (in percentuale)"
     disabled_image_download_domains: "Le immagini non verranno mai scaricate dai seguenti domini. Elenco delimitato dal carattere pipe |"
+    block_hotlinked_media: "Impedisci agli utenti di introdurre contenuti multimediali remoti (linkati) nei loro messaggi. Il contenuto remoto che non viene scaricato tramite l'opzione 'download_remote_images_to_local' verrà sostituito con un link segnaposto."
     block_hotlinked_media_exceptions: "Un elenco di URL di base esenti dall'impostazione block_hotlinked_media. Includere il protocollo (ad es. https://example.com)."
     editing_grace_period: "Per (n) secondi dopo la creazione del messaggio, le modifiche non saranno tracciate nella cronologia."
     editing_grace_period_max_diff: "Numero massimo di modifiche ai caratteri consentite durante la modifica nel periodo di tolleranza, se più modifiche memorizzano un'altra revisione del post (Livello attendibilità 0 e 1)"
@@ -1440,8 +1446,8 @@ it:
     show_pinned_excerpt_mobile: "Mostra estratti sugli argomenti appuntati nella visualizzazione in mobilità."
     show_pinned_excerpt_desktop: "Mostra estratti sugli argomenti appuntati nella vista desktop."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
-    blocked_onebox_domains: "Un elenco di domini che non saranno mai inseriti in una casella, ad esempio wikipedia.org\n(I simboli jolly *? non sono supportati)"
-    block_onebox_on_redirect: "Blocca onebox per le URL che reindirizzano."
+    blocked_onebox_domains: "Un elenco di domini che non saranno mai inseriti in onebox, ad esempio wikipedia.org\n(I simboli jolly *? non sono supportati)"
+    block_onebox_on_redirect: "Blocca onebox per gli URL che reindirizzano."
     allowed_inline_onebox_domains: "Un elenco di domini che saranno trasformati in onebox in forma di miniatura se collegati senza un titolo"
     enable_inline_onebox_on_all_domains: "Ignora l'impostazione del sito inline_onebox_domain_allowlist e consenti onebox in linea per tutti i domini."
     force_custom_user_agent_hosts: "Host per i quali utilizzare l'user agent onebox personalizzato su tutte le richieste. (Particolarmente utile per gli host che limitano l'accesso con user agent)."
@@ -1460,17 +1466,22 @@ it:
     favicon: "Una favicon per il tuo sito, vedi <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> . Per funzionare correttamente su un CDN deve essere un'immagine PNG. Verrà ridimensionata a 32x32. Se lasciato vuoto, verrà usato large_icon."
     apple_touch_icon: "Icona utilizzata per i dispositivi touch Apple. Verrà automaticamente ridimensionato a 180x180. Se lasciato vuoto, verrà usato large_icon."
     opengraph_image: "Immagine opengraph predefinita, utilizzata quando la pagina non ha altre immagini adatte. Se lasciato vuoto, verrà usato large_icon"
+    twitter_summary_large_image: "Opzione 'Summary large image' di una scheda Twitter (deve misurare almeno 280 di larghezza e almeno 150 di altezza e non può essere un'imagine .svg). Se lasciato vuoto, i normali metadati delle schede vengono generati utilizzando l'opzione opengraph_image, a meno che l'immagine non sia un file .svg."
     notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi."
     email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)"
     email_subject: "Formato oggetto personalizzabile per e-mail standard. Vedi <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "Fornisce maggiori dettagli agli utenti sul perché non possono accedere a un argomento specifico. Nota: questo metodo è meno sicuro perché gli utenti sapranno se un URL si collega a un argomento valido."
     enforce_second_factor: "Impone agli utenti di abilitare l'autenticazione a due fattori. Seleziona \"all\" per applicarlo a tutti gli utenti. Seleziona \"staff\" per applicarlo solo agli utenti staff."
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti gli accessi ai social ed ogni logo esterno / dipendenze per essere sicuro che sono anch'essi tutti compatibili con HTTPS?"
+    same_site_cookies: "Utilizza gli stessi cookie del sito. In tal modo si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict funzionerà solo su siti che richiedono l'accesso e utilizzano un metodo di autenticazione esterno."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
     summary_posts_required: "Numero minimo di messaggi in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Messaggi massimi restituiti da 'Riassumi questo argomento'."
+    summary_timeline_button: "Mostra un pulsante \"Riassumi\" nella timeline"
+    enable_personal_messages: "Impostazione DEPRECATA, usare l'impostazione 'personal message enabled groups' al suo posto. Autorizza gli utenti con livello di attendibilità 1 (configurabile attraverso l'opzione \"min livello di attendibilità per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
+    personal_message_enabled_groups: "Consenti agli utenti all'interno di questi gruppi di creare messaggi e rispondere ai messaggi. I gruppi dei livelli di attendibilità comprendono tutti i livelli al di sopra di tale numero, ad esempio la scelta di trust_level_1 consente anche agli utenti trust_level_2, 3, 4 di inviare MP. Tieni presente che lo staff può sempre inviare messaggi in ogni caso."
     enable_system_message_replies: "Consente agli utenti di rispondere ai messaggi di sistema, anche se i messaggi personali sono disabilitati"
     enable_chunked_encoding: "Abilita le risposte di codifica in blocchi dal server. Questa funzionalità va bene sulla maggior parte delle configurazioni, tuttavia alcuni proxy possono eseguire la bufferizzazione, provocando un ritardo nelle risposte"
     long_polling_base_url: "URL di base usato per il long polling (quando una CDN serve contenuto dinamico, bisogna impostarlo come origin pull) es. http://origin.site.com"
@@ -1491,6 +1502,7 @@ it:
     tl4_additional_edits_per_day_multiplier: "Aumenta il limite di modifiche giornaliere per gli utenti con Livello di attendibilità 4 (Veterano) moltiplicandolo per questo numero"
     tl2_additional_flags_per_day_multiplier: "Aumenta il limite giornaliero di segnalazioni per gli utenti con livello di attendibilità 2 (Membro), moltiplicandolo per questo numero"
     tl3_additional_flags_per_day_multiplier: "Aumenta il limite giornaliero di segnalazioni per gli utenti con livello di attendibilità 3 (Assiduo) moltiplicandolo per questo numero"
+    tl4_additional_flags_per_day_multiplier: "Aumenta il limite giornaliero di segnalazioni per gli utenti con livello di attendibilità 4 (veterano), moltiplicandolo per questo numero"
     num_users_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono num_spam_flags_to_silence_new_user segnalazioni di spam da così tanti utenti diversi, nascondi tutti i suoi messaggi e impediscigli ulteriori invii. 0 per disabilitare. "
     num_tl3_flags_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono questo numero di segnalazioni da num_tl3_users_to_silence_new_user differenti utenti a livello di attendibilità 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare."
     num_tl3_users_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono num_tl3_flags_to_silence_new_user segnalazioni da questo numero di utenti a livello di attendibilità 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare."
@@ -1537,6 +1549,7 @@ it:
     post_menu: "Determina quali elementi vengono mostrati nel menu del messaggio, e in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Le voci di menu da nascondere per impostazione predefinita nel menu di composizione del messaggio, a meno che non vengano premuti i punti di sospensione per espanderle."
     share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine."
+    allow_username_in_share_links: "Consenti ai nomi utente di essere inclusi nei link di condivisione. Questo permette di assegnare i distintivi in base ai visitatori unici."
     site_contact_username: "Un utente dello staff valido da cui inviare tutti i messaggi automatici. Se lasciato vuoto verrà usato l'account predefinito di Sistema."
     site_contact_group_name: "Un nome di gruppo valido che sarà invitato alla ricezione di tutti i messaggi automatici."
     send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido."
@@ -1565,6 +1578,7 @@ it:
     allowed_email_domains: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!"
     normalize_emails: "Controlla se l'email normalizzata è univoca. L'email normalizzata è il nome utente senza tutti i puntini e senza tutto ciò che è compreso tra i simboli + e @."
     auto_approve_email_domains: "Gli utenti con indirizzi email appartenenti a questo elenco di domini verranno approvati automaticamente."
+    hide_email_address_taken: "Non informare gli utenti dell'esistenza di un account con un determinato indirizzo e-mail durante la registrazione o la procedura di reimpostazione della password. Richiede l'e-mail completa per le richieste di \"password dimenticata\"."
     log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
     version_checks: "Controlla in Discourse Hub la presenza di aggiornamenti della versione e mostra i messaggi della nuova versione nel pannello <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Invia un'email all'indirizzo contact_email quando è disponibile una nuova versione di Discourse."
@@ -1658,6 +1672,7 @@ it:
     max_personal_messages_per_day: "Numero massimo di nuovi argomenti di messaggi personali che un utente può creare al giorno."
     max_invites_per_day: "Numero massimo di inviti che un utente può inviare in un giorno."
     max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno."
+    max_topic_invitations_per_minute: "Numero massimo di inviti ad argomenti che un utente può inviare al minuto."
     max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo IP in un'ora"
     max_logins_per_ip_per_minute: "Numero massimo di accessi consentiti per indirizzo IP al minuto"
     max_post_deletions_per_minute: "Numero massimo di messaggi che un utente può eliminare al minuto. Impostare questo valore a 0 per disabilitare l'eliminazione dei messaggi."
@@ -1688,6 +1703,7 @@ it:
     external_emoji_url: "URL del servizio esterno per le immagini di emoji. Lasciare vuoto questo valore per disabilitare l'opzione."
     use_site_small_logo_as_system_avatar: "Usa il logo piccolo del sito invece dell'avatar utente di sistema. Richiede che il logo sia presente."
     restrict_letter_avatar_colors: "Un elenco di valori in 6 cifre esadecimali per i colori da utilizzare per lo sfondo dell'avatar predefinito con la lettera iniziale."
+    enable_listing_suspended_users_on_search: "Consenti agli utenti regolari di trovare gli utenti sospesi."
     selectable_avatars_mode: "Consenti agli utenti di selezionare un avatar dall'elenco selectable_avatars e limita i caricamenti di avatar personalizzati al livello di attendibilità selezionato."
     selectable_avatars: "Lista di avatar da cui gli utenti possono scegliere."
     allow_all_attachments_for_group_messages: "Consenti tutti gli allegati sulle email per i messaggi di gruppo."
@@ -1735,6 +1751,7 @@ it:
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
     min_trust_to_edit_post: "Il livello di attendibilità minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di attendibilità minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
+    min_trust_to_send_messages: "Impostazione DEPRECATA, usare l'impostazione \"Gruppi abilitati per messaggi personali\" al suo posto. Il livello di attendibilità minimo richiesto per creare nuovi messaggi personali."
     min_trust_to_send_email_messages: "Il livello di attendibilità minimo richiesto per inviare messaggi personali via email."
     min_trust_to_flag_posts: "Il livello di attendibilità minimo richiesto per segnalare messaggi"
     min_trust_to_post_links: "Il livello di attendibilità minimo richiesto per includere link nei messaggi"
@@ -1752,6 +1769,9 @@ it:
     max_mentions_per_post: "Numero massimo di notifiche ad un @nome che chiunque può fare in un messaggio."
     max_users_notified_per_group_mention: "Massimo numero di utenti che possono ricevere una notifica se un gruppo è menzionato (se la soglia è raggiunta, nessuna notifica verrà inviata)"
     enable_mentions: "Permetti agli utenti di menzionare altri utenti."
+    here_mention: "Nome utilizzato per una @menzione per consentire agli utenti privilegiati di avvisare fino a \"max_here_member\" persone che partecipano all'argomento. Non deve essere un nome utente esistente."
+    max_here_mentioned: "Numero massimo di persone menzionate da @here."
+    min_trust_level_for_here_mention: "Il livello di attendibilità minimo richiesto per menzionare @here."
     create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio."
     email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi."
     personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare qualsiasi email di notifica di messaggi personali, per dare agli utenti la possibilità di modificare e finalizzare i propri messaggi."
@@ -1856,6 +1876,7 @@ it:
     raw_email_max_length: "Quanti caratteri devono essere memorizzati per i messaggi e-mail in arrivo."
     raw_rejected_email_max_length: "Quanti caratteri devono essere memorizzati per i messaggi e-mail in arrivo rifiutati."
     delete_rejected_email_after_days: "Elimina le email rifiutate più vecchie di (n) giorni."
+    require_change_email_confirmation: "Richiedi agli utenti non appartenenti allo staff di confermare il loro vecchio indirizzo email prima di modificarlo. Non si applica agli utenti dello staff, che devono sempre confermare il loro vecchio indirizzo email."
     manual_polling_enabled: "Push delle email utilizzando le API per le risposte email."
     pop3_polling_enabled: "Cerca le risposte via email tramite POP3."
     pop3_polling_ssl: "Usa SSL per la connessione al server POP3 (raccomandato)."
@@ -1934,6 +1955,7 @@ it:
     enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo."
     dominating_topic_minimum_percent: "Quale percentuale di messaggi un utente deve pubblicare in un argomento prima di essere avvertito che sta intervenendo eccessivamente nell'argomento."
     disable_avatar_education_message: "Disabilita il messaggio educativo per cambiare avatar"
+    pm_warn_user_last_seen_months_ago: "Quando si crea un nuovo MP, il sistema avvisa gli utenti quando il destinatario non si fa vedere lì da più di n mesi."
     suppress_uncategorized_badge: "Non mostrare il distintivo per gli argomenti senza categoria nell'elenco degli argomenti."
     header_dropdown_category_count: "Quante categorie possono essere visualizzate nel menu a discesa dell'intestazione."
     permalink_normalizations: "Applicare il seguente regex prima di accedere ai permalink, ad esempio: /(topic.*)\\?.*/\\1 eliminerà le stringhe query dalla route degli argomenti. Il formato è regex+string use \\1 ecc. per accedere alle acquisizioni"
@@ -1960,6 +1982,7 @@ it:
     display_name_on_posts: "Mostra il nome completo dell'utente sui messaggi oltre allo @username."
     show_time_gap_days: "Se due messaggi vengono creati dopo tale numero di giorni, mostrare l'intervallo di tempo nell'argomento."
     short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero di messaggi attuale. Se modifichi l'ampiezza della barra di avanzamento, potresti dover cambiare questo valore."
+    default_code_lang: "La modalità predefinita per evidenziare la sintassi del linguaggio di programmazione applicata nei blocchi di codice (auto, non evidenziare, ruby, python ecc.). Questo valore deve essere presente anche nell'impostazione del sito `Lingue evidenziate`."
     warn_reviving_old_topic_age: "Quando qualcuno inizia a rispondere ad un argomento in cui l'ultima risposta è più vecchia di tale numero di giorni, verrà visualizzato un avviso. Disabilita impostando su 0."
     autohighlight_all_code: "Forza l'evidenziazione della sintassi del codice nei blocchi di testo preformattato, anche se non è stato specificato il linguaggio di programmazione. "
     highlighted_languages: "Regole di evidenziazione della sintassi incluse. (Attenzione: includere troppi linguaggi può influire sulle prestazioni) vedi: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> per una demo"
@@ -1980,6 +2003,12 @@ it:
     delete_merged_stub_topics_after_days: "Numero di giorni di attesa prima di eliminare automaticamente gli argomenti stub completamente uniti. Impostare a 0 per non eliminare mai gli argomenti stub."
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
     prevent_anons_from_downloading_files: "Impedisci agli utenti anonimi di scaricare allegati."
+    secure_media: 'Opzione DEPRECATA: utilizzare al suo posto l''impostazione secure_uploads, verrà rimossa in Discourse 3.0.'
+    secure_uploads: 'Limita l''accesso a TUTTI i caricamenti (immagini, video, audio, testo, pdf, zip, ecc.). Se l''opzione “accesso richiesto” è attivata, solo gli utenti registrati possono accedere ai caricamenti. In caso contrario, l''accesso sarà limitato solo per i media caricati in messaggi privati e categorie private. ATTENZIONE: Questa impostazione è complessa e richiede una profonda competenza amministrativa. Per maggiori dettagli visita <a target="_blank" href="https://meta.discourse.org/t/-/140017">l''argomento sui caricamenti sicuri su Meta</a>.'
+    secure_media_allow_embed_images_in_emails: "Opzione DEPRECATA: utilizzare al suo posto l'impostazione secure_uploads_allow_embed_images_in_emails, sarà rimossa in Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "Consente l'integrazione di immagini sicure che normalmente verrebbero oscurate nelle e-mail, se la loro dimensione è inferiore al valore dell'i'impostazione 'dimensione max in kb immagini da integrare nelle email per caricamenti protetti'."
+    secure_media_max_email_embed_image_size_kb: "Opzione DEPRECATA: utilizzare al suo posto l'impostazione secure_uploads_max_email_embed_image_size_kb, sarà rimossa in Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "Limite di dimensione per le immagini protette che verranno incorporate nelle e-mail se l'impostazione \"secure upload allow embed in emails\" è abilitata. Se tale impostazione non è abilitata, anche questa non avrà alcun effetto."
     slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
     enable_emoji: "Attiva gli emoji"
     enable_emoji_shortcuts: "Smiley comuni come :) :p :( verranno convertiti in emoji"
@@ -2071,7 +2100,9 @@ it:
     push_notifications_icon: "L'icona del distintivo che appare nell'angolo delle notifiche. Si consiglia un'immagine PNG monocromatica 96×96 con trasparenza."
     base_font: "Tipo di carattere di base da utilizzare per la maggior parte del testo sul sito. I temi possono sovrascrivere questa impostazione tramite la proprietà personalizzata CSS `--font-family`."
     heading_font: "Tipo di carattere da utilizzare per le intestazioni del sito. I temi possono sovrascrivere questa impostazione tramite la proprietà personalizzata CSS `--heading-font-family`."
-    enable_sitemap: "Genera una sitemap per il tuo sito e includila nel file robots.txt."
+    enable_sitemap: "Genera una mappa per il tuo sito e includila nel file robots.txt."
+    sitemap_page_size: "Numero di URL da includere in ciascuna pagina della mappa del sito. Massimo 50.000"
+    enable_user_status: "(sperimentale) Consenti agli utenti di impostare un messaggio di stato personalizzato (emoji + descrizione)."
     short_title: "Il titolo breve verrà utilizzato nella schermata iniziale dell'utente, nel programma di avvio o in altri contesti in cui lo spazio potrebbe essere limitato. Dovrebbe essere limitato a 12 caratteri."
     dashboard_hidden_reports: "Consenti di nascondere i report specificati dal dashboard."
     dashboard_visible_tabs: "Scegli quali schede del dashboard sono visibili."
@@ -2083,12 +2114,15 @@ it:
     share_quote_visibility: "Determina quando mostrare i pulsanti di condivisione delle citazioni: mai, solo agli utenti anonimi o a tutti gli utenti. "
     create_revision_on_bulk_topic_moves: "Crea una revisione per i primi messaggi quando gli argomenti vengono spostati in blocco in una nuova categoria."
     allow_changing_staged_user_tracking: "Consenti a un utente amministratore di modificare le preferenze di notifica di etichette e categorie di utenti provvisori."
+    use_email_for_username_and_name_suggestions: "Utilizza la prima parte degli indirizzi e-mail per suggerimenti di nomi e nomi utente. Nota che questo aiuta il pubblico a individuare gli indirizzi e-mail completi degli utenti (perché la maggior parte delle persone utilizza servizi comuni come `gmail.com`)."
     use_name_for_username_suggestions: "Usa il nome completo dell'utente durante il suggerimento di nomi utente."
     suggest_weekends_in_date_pickers: "Includi i fine settimana (sabato e domenica) nei suggerimenti del selettore di date (disabilita questa opzione se usi Discourse solo nei giorni feriali, dal lunedì al venerdì)."
     splash_screen: "Visualizza una schermata di caricamento temporanea durante il caricamento delle risorse del sito"
     default_sidebar_categories: "Le categorie selezionate appariranno, per impostazione predefinita, nella sezione Categorie della barra laterale."
     default_sidebar_tags: "Le etichette selezionate appariranno, per impostazione predefinita, nella sezione Etichette della barra laterale."
+    enable_new_user_profile_nav_groups: "SPERIMENTALE: Gli utenti dei gruppi selezionati vedranno il nuovo menu di navigazione del profilo utente"
     errors:
+      invalid_css_color: "Colore non valido. Immettere un nome o un valore esadecimale per il colore."
       invalid_email: "Indirizzo email non valido."
       invalid_username: "Non c'è alcun utente con quel nome."
       valid_username: "C'è un membro con questo nome utente."
@@ -2114,6 +2148,7 @@ it:
       reply_by_email_address_is_empty: "Devi impostare 'reply by email address' prima di attivare la risposta via email."
       email_polling_disabled: "È necessario attivare il polling manuale o POP3 prima di attivare la risposta via email."
       user_locale_not_enabled: "Prima di attivare questa impostazione, devi abilitare 'allow user locale'."
+      personal_message_enabled_groups_invalid: "Devi specificare almeno un gruppo per questa impostazione. Se vuoi che nessuno al di fuori dello staff invii MP, scegli il gruppo dello staff."
       invalid_regex: "Regex non è valido o non è consentito."
       invalid_regex_with_message: "La regex '%{regex}' contiene un errore: %{message}"
       email_editable_enabled: "Prima di attivare questa impostazione, devi disabilitare 'email editable'."
@@ -2137,10 +2172,10 @@ it:
       unicode_usernames_avatars: "Gli avatar di sistema interni non supportano i nomi utente Unicode."
       list_value_count: "La lista deve contenere esattamente %{count} valori."
       markdown_linkify_tlds: "Non è possibile includere il valore '*'."
-      google_oauth2_hd_groups: "Prima di attivare questa impostazione, devi impostare 'google oauth2 hd'."
       search_tokenize_chinese_enabled: "Devi disattivare \"search_tokenize_chinese\" prima di attivare questa impostazione."
       search_tokenize_japanese_enabled: "Devi disattivare \"search_tokenize_japanese\" prima di attivare questa impostazione."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Non è possibile abilitare DiscourseConnect se è stata forzata l'autenticazione a due fattori 2FA."
+      delete_rejected_email_after_days: "Questa impostazione non può essere inferiore al valore dell'impostazione delete_email_logs_after_days né maggiore di %{max}"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2304,7 +2339,11 @@ it:
       backup_code: "Utilizza un codice di backup"
   second_factor_auth:
     challenge_not_found: "Impossibile trovare una richiesta 2FA nella sessione corrente."
+    challenge_expired: "È passato troppo tempo dall'ultima richiesta di verifica 2FA e non è più valida. Riprova."
+    challenge_not_completed: "Non hai completato la richiesta di verifica 2FA per eseguire questa azione. Completa la richiesta 2FA e riprova."
     actions:
+      grant_admin:
+        description: "Per garantire maggiore sicurezza, devi confermare la tua verifica 2FA prima che %{username} possa accedere come amministratore."
       discourse_connect_provider:
         description: "%{hostname} ha chiesto di confermare la tua autenticazione a due fattori (2FA). Sarai reindirizzato al sito una volta confermata la tua 2FA."
   admin:
@@ -2481,9 +2520,35 @@ it:
   new_version_mailer:
     title: "Mailer Nuova Versione"
     subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile"
+    text_body_template: |
+      Evviva, è finalmente disponibile una nuova versione di [Discourse](https://www.discourse.org)!
+
+      La tua versione: %{installed_version}
+      Nuova versione: **%{new_version}**
+
+      - Passa subito all'ultima versione utilizzando il nostro semplice strumento di **[aggiornamento da browser in un solo clic](%{base_url}/admin/upgrade)**
+
+      - Scopri le novità nelle [note di rilascio](https://meta.discourse.org/tag/release-notes) o visualizza il [log originale delle modifiche GitHub](https://github.com/discourse/discourse/commits/master)
+
+      - Visita [meta.discourse.org](https://meta.discourse.org) per scoprire notizie, discussioni e ricevere supporto su Discourse
   new_version_mailer_with_notes:
     title: "Mailer Nuova Versione con Note"
     subject_template: "[%{email_prefix}] aggiornamento disponibile"
+    text_body_template: |
+      Evviva, è finalmente disponibile una nuova versione di [Discourse](https://www.discourse.org)!
+
+      La tua versione: %{installed_version}
+      Nuova versione: **%{new_version}**
+
+      - Passa subito all'ultima versione utilizzando il nostro semplice strumento di **[aggiornamento da browser in un solo clic](%{base_url}/admin/upgrade)**
+
+      - Scopri le novità nelle [note di rilascio](https://meta.discourse.org/tag/release-notes) o visualizza il [log originale delle modifiche GitHub](https://github.com/discourse/discourse/commits/master)
+
+      - Visita [meta.discourse.org](https://meta.discourse.org) per scoprire notizie, discussioni e ricevere supporto su Discourse
+
+      ### Note di rilascio
+
+      %{notes}
   flag_reasons:
     off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa che non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio."
     inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](%{base_path}/guidelines)."
@@ -2491,7 +2556,7 @@ it:
     notify_moderators: "Il tuo messaggio è stato segnalato **all'attenzione dei moderatori**: la comunità ritiene che ci sia qualcosa nel messaggio che richiede l'intervento manuale di un membro dello staff."
     responder:
       off_topic: "Il messaggio è stato segnalato come **fuori-tema**: la comunità ritiene che non sia adatto all'argomento, così come definito dal titolo e dal primo messaggio."
-      inappropriate: "Il messaggio è stato segnalato come **inappropriato**: la comunità ritiene che sia offensivo, ingiurioso oppure rappresenti una violazione delle [nostre linee guida](%{base_path}/guidelines)."
+      inappropriate: "Il messaggio è stato segnalato come **inappropriato**: la comunità ritiene che sia offensivo, ingiurioso oppure rappresenti una violazione delle [nostre linee guida della community](%{base_path}/guidelines)."
       spam: "Il messaggio è stato segnalato come **spam**: la comunità ritiene che sia una pubblicità, o qualcosa eccessivamente promozionale invece di essere utile o pertinente all'argomento come previsto."
       notify_moderators: "Il messaggio è stato contrassegnato **all'attenzione del moderatore**: la comunità ritiene che qualcosa nel messaggio richieda l'intervento manuale di un membro dello staff."
   flags_dispositions:
@@ -2504,6 +2569,11 @@ it:
     one: "Questo argomento resterà temporaneamente chiuso per almeno %{count} ora a causa di un numero elevato di segnalazioni dalla comunità."
     other: "Questo argomento resterà temporaneamente chiuso per almeno %{count} ore a causa di un numero elevato di segnalazioni dalla comunità."
   system_messages:
+    reviewables_reminder:
+      subject_template: "Ci sono elementi nella coda di revisione che devono essere controllati"
+      text_body_template:
+        one: "%{mentions} elementi sono stati inviati oltre %{count} ora fa. [Si prega di rivederli](%{base_url}/review)."
+        other: "%{mentions} elementi sono stati inviati oltre %{count} ore fa. [Si prega di rivederli](%{base_url}/review)."
     private_topic_title: "Argomento #%{id}"
     contents_hidden: "Visita il messaggio per vederne i contenuti."
     post_hidden:
@@ -2562,6 +2632,7 @@ it:
     flags_agreed_and_post_deleted_for_responders:
       title: "Risposta rimossa dal messaggio segnalato da parte dello staff"
       subject_template: "Risposta rimossa dal messaggio segnalato da parte dello staff"
+      text_body_template: "Ciao,\n\nQuesto è un messaggio automatico generato da %{site_name} per informarti che [un messaggio](%{base_url}%{url}) al quale avevi risposto è stato rimosso. \n\n%{flag_reason}\n\nIl messaggio è stato segnalato dalla community, quindi un membro dello staff ha deciso di rimuoverlo. \n \n```markdown\n%{flagged_post_raw_content}\n```\nLa tua risposta era stata\n\n``` markdown\n%{flagged_post_response_raw_content}\n```\nPer ulteriori dettagli sul motivo della rimozione, consulta le [linee guida della community](%{base_url}/guidelines).\n"
     usage_tips:
       text_body_template: |
         Per leggere alcuni veloci suggerimenti su come iniziare se sei un nuovo utente [dai una lettura a questo articolo](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)
@@ -2610,9 +2681,18 @@ it:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "Congratulazioni per la promozione a un livello di attendibilità superiore!"
+      text_body_template: |
+        Ti abbiamo promosso a un [livello di attendibilità](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) superiore!
+
+        Hai raggiunto il Livello di attendibilità 2 poiché hai letto e partecipato attivamente in misura adeguata per essere considerato un membro esperto di questa community.
+
+        Da utente esperto, potresti trovare interessante [questo elenco di utili suggerimenti e trucchi](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Ti invitiamo a partecipare sempre più alle nostre attività: ci fa piacere vederti spesso qui.
     backup_succeeded:
       title: "Backup Riuscito"
       subject_template: "Backup completato correttamente"
+      text_body_template: "Il backup ha avuto successo. \n\nVisita la sezione [amministrazione > backup] (%{base_url}/admin/backup) per scaricare il nuovo backup.\n\nEcco il log:\n\n%{logs}\n"
     backup_failed:
       title: "Backup Fallito"
       subject_template: "Backup fallito"
@@ -2643,9 +2723,11 @@ it:
     bulk_invite_succeeded:
       title: "Invito di Massa Riuscito"
       subject_template: "Invito di massa processato con successo"
+      text_body_template: "Il tuo file di invito di utenti in massa è stato elaborato, %{sent} inviti inviati via e-mail, %{skipped} ignorati e %{warnings} avvisi. \n\n``` text\n%{logs}\n```\n"
     bulk_invite_failed:
       title: "Invito di Massa Fallito"
       subject_template: "Invito di massa processato con errori"
+      text_body_template: "Il tuo file di invito di utenti in massa è stato elaborato, %{sent} inviti inviati via e-mail, %{skipped} ignorati, %{warnings} avvisi e %{failed} errori. \n\nEcco il log:\n\n``` text\n%{logs}\n```\n"
     user_added_to_group_as_owner:
       title: "Aggiunto al gruppo come proprietario"
       subject_template: "Sei stato aggiunto come proprietario del gruppo %{group_name}"
@@ -3168,6 +3250,7 @@ it:
 
         %{respond_instructions}
     user_group_mentioned_pm:
+      title: "Gruppo utente menzionato in Messaggio Personale"
       subject_template: "[%{email_prefix}][MP]%{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3178,6 +3261,7 @@ it:
 
         %{respond_instructions}
     user_group_mentioned_pm_group:
+      title: "Gruppo utente menzionato in Messaggio Personale"
       subject_template: "[%{email_prefix}][MP]%{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3430,6 +3514,7 @@ it:
     suspicious_login:
       title: "Nuovo avviso di accesso"
       subject_template: "[%{site_name}] Nuovo accesso da %{location}"
+      text_body_template: "Ciao, \n\nabbiamo notato un accesso da un dispositivo o da una posizione che non utilizzi abitualmente. Eri tu? \n\n- Posizione: %{location} (%{client_ip}) \n- Browser: %{browser} \n- Dispositivo: %{device} - %{os} \n\nSe eri tu, va benissimo! Non c'è nient'altro da fare. \n\nSe non eri tu, ti preghiamo di [controllare le tue sessioni esistenti](%{base_url}/my/preferences/account) e prendere in considerazione la possibilità di cambiare la tua password.\n"
     post_approved:
       title: "Il tuo messaggio è stato approvato"
       subject_template: "[%{site_name}] Il tuo messaggio è stato approvato"
@@ -3469,9 +3554,13 @@ it:
     png_to_jpg_conversion_failure_message: "Si è verificato un errore durante la conversione da PNG a JPG."
     optimize_failure_message: "Si è verificato un errore nell'ottimizzare l'immagine caricata."
     download_failure: "Il download del file dal provider esterno non è riuscito."
-    create_multipart_failure: "Errore nel creare il caricamento multipart nell'archivio esterno."
-    abort_multipart_failure: "Errore nell’annullare il caricamento multipart nell'archivio esterno."
-    complete_multipart_failure: "Errore nel completare il caricamento multipart nell'archivio esterno."
+    size_mismatch_failure: "La dimensione del file caricato su S3 non corrispondeva alla dimensione prevista per lo stub di caricamento esterno. %{additional_detail}"
+    create_multipart_failure: "Errore nella creazione del caricamento multipart nell'archivio esterno."
+    abort_multipart_failure: "Errore nell’annullamento del caricamento multipart nell'archivio esterno."
+    complete_multipart_failure: "Impossibile completare il caricamento multipart nell'archivio esterno."
+    external_upload_not_found: "Il caricamento non è stato trovato nell'archivio esterno. %{additional_detail}"
+    checksum_mismatch_failure: "Il checksum del file che hai caricato non corrisponde. Il contenuto del file potrebbe essere cambiato durante il caricamento. Riprova."
+    cannot_promote_failure: "Il caricamento non può essere completato, potrebbe essere già stato fatto o non essere riuscito in precedenza."
     size_zero_failure: "Spiacenti, sembra che qualcosa sia andato storto, il file che stai tentando di caricare è di 0 byte. Per favore riprova."
     attachments:
       too_large: "Spiacenti, ma il file che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB)."
@@ -3528,6 +3617,12 @@ it:
     dark_rose: "Rosa scuro"
     wcag: "WCAG Chiaro"
     wcag_theme_name: "WCAG Chiaro"
+    dracula: "Dracula"
+    dracula_theme_name: "Dracula"
+    solarized_light: "Luce solare"
+    solarized_light_theme_name: "Luce solare"
+    solarized_dark: "Scuro solare"
+    solarized_dark_theme_name: "Scuro solare"
     wcag_dark: "WCAG Scuro"
     wcag_dark_theme_name: "WCAG Scuro"
     default_theme_name: "Predefinito"
@@ -3913,6 +4008,9 @@ it:
         other: '"%{tag_name}" è limitato alle seguenti categorie: %{category_names}'
       synonym: 'I sinonimi non sono ammessi. Utilizza invece "%{tag_name}".'
       has_synonyms: '"%{tag_name}" non può essere utilizzato perché ha dei sinonimi.'
+      restricted_tags_cannot_be_used_in_category:
+        one: 'L''etichetta "%{tags}" non può essere usata nella categoria "%{category}". Rimuovila.'
+        other: 'Le seguenti etichette non possono essere usate nella categoria "%{category}": %{tags}. Rimuovile.'
       category_does_not_allow_tags:
         one: 'La categoria "%{category}" non consente l''etichetta "%{tags}". Si prega di rimuoverla.'
         other: 'La categoria "%{category}" non consente le seguenti etichette: "%{tags}". Si prega di rimuoverle.'
@@ -3947,30 +4045,44 @@ it:
     title: "Configurazione Discourse"
     step:
       introduction:
+        title: "Parlaci della tua community"
         fields:
           title:
+            label: "Nome community"
             placeholder: "Il Ritrovo di Jane"
           site_description:
+            label: "Descrivi la tua community in una frase"
             placeholder: "Un posto per Jane e per i suoi amici dove discutere di cose forti"
+          contact_email:
+            label: "Punto di contatto"
+            placeholder: "esempio@utente.com"
+            description: "Persona o gruppo responsabile di questa community. Utilizzato per aggiornamenti critici e indicato nella <a href='%{base_path}/about' target='_blank'>tua pagina Informazioni</a> per contatti urgenti."
           default_locale:
             label: "Lingua"
       privacy:
+        title: "Esperienza dei membri"
         fields:
           login_required:
             placeholder: "Privato"
             extra_description: "Solo gli utenti registrati possono accedere a questa comunità"
+          invite_only:
+            placeholder: "Solo su invito"
+            extra_description: "Gli utenti devono essere invitati da utenti attendibili o dallo staff prima di potersi registrare."
           must_approve_users:
             placeholder: "Richiede Approvazione"
+            extra_description: "Gli utenti devono essere approvati dallo staff"
       ready:
         title: "Il tuo Discourse è Pronto!"
+        description: "Ecco fatto! Hai messo le basi per configurare la tua community Ora puoi entrare e dare un'occhiata in giro, scrivere un argomento di benvenuto e inviare inviti!<br><br>Buon divertimento!"
       styling:
+        title: "Aspetto e feeling"
         fields:
           color_scheme:
-            label: "Combinazione di colori"
+            label: "Schema colori"
           body_font:
-            label: "Carattere Corpo"
+            label: "Carattere del corpo"
           heading_font:
-            label: "Carattere Intestazione"
+            label: "Carattere dell'intestazione"
           styling_preview:
             label: "Anteprima"
           homepage_style:
@@ -3984,6 +4096,8 @@ it:
                 label: "Categorie con argomenti in evidenza"
               categories_and_latest_topics:
                 label: "Categorie e Argomenti Recenti"
+              categories_and_latest_topics_created_date:
+                label: "Categorie e argomenti recenti (in ordine di data di creazione)"
               categories_and_top_topics:
                 label: "Categorie e Argomenti Popolari"
               categories_boxes:
@@ -3993,23 +4107,31 @@ it:
               subcategories_with_featured_topics:
                 label: "Sottocategorie con argomenti in evidenza"
       branding:
+        title: "Loghi personalizzati"
         fields:
           logo:
             label: "Logo Primario"
+            description: "L'immagine del logo nell'angolo in alto a sinistra del tuo sito. Usa un'ampia immagine rettangolare con un'altezza di 120 e una proporzione superiore a 3:1"
           logo_small:
             label: "Logo quadrato"
+            description: "Una versione quadrata del tuo logo. Mostrata nell'angolo in alto a sinistra quando scorri verso il basso e nelle condivisioni su social media. Idealmente più grande di 512x512."
           favicon:
             label: "Icona del Browser"
+            description: "Icona utilizzata per rappresentare il tuo sito nei browser web che si veda bene in dimensioni ridotte. Si consiglia il formato PNG o JPG. Il logo quadrato è utilizzato per impostazione predefinita."
           large_icon:
             label: "Icona Grande"
+            description: "Icona usata per rappresentare il tuo sito sul dispositivi mobili, che si veda bene in grandi dimensioni. Idealmente più grande di 512 x 512. Per impostazione predefinita si usa il logo quadrato."
       corporate:
+        title: "La tua organizzazione"
         fields:
           company_name:
             label: "Nome azienda"
             placeholder: "Organizzazione d'esempio"
+            description: "Inserito nella pagina dei tuoi Termini di servizio. Sentiti libero di passare oltre se non esiste alcuna società."
           governing_law:
             label: "Diritto applicabile"
             placeholder: "Legge della California"
+            description: "Inserito nella pagina dei tuoi Termini di servizio. Sentiti libero di passare oltre se non esiste alcuna società."
           contact_url:
             label: "Sito Web"
             placeholder: "https://www.example.com/contact-us"
@@ -4017,6 +4139,7 @@ it:
           city_for_disputes:
             label: "Sede per eventuali controversie"
             placeholder: "San Francisco, California"
+            description: "Inserito nella pagina dei tuoi Termini di servizio. Sentiti libero di passare oltre se non esiste alcuna società."
           site_contact:
             label: "Messaggi Automatici"
             description: "Tutti i messaggi personali automatici di Discourse, come avvisi di segnalazione e notifiche di completamento dei backup, saranno inviati da questo utente."
@@ -4076,12 +4199,19 @@ it:
     conflict: "C'è stato un conflitto di aggiornamento che ti impedisce di compiere questa azione."
     reasons:
       post_count: "I primi messaggi di ogni utente devono essere approvati dallo staff. Vedi %{link}"
-      trust_level: "Le risposte degli utenti con un basso livello di fiducia devono essere approvate dallo staff. Vedi %{link}"
-      new_topics_unless_trust_level: "Gli argomenti iniziati da utenti con un basso livello di fiducia devono essere approvati dallo staff. Vedi %{link}"
-      fast_typer: "Un nuovo utente ha digitato il suo primo messaggio in modo sospettosamente rapido. Sembra il comportamento di un bot o di uno spammer. Vedi %{link}."
+      trust_level: "Le risposte degli utenti con un basso livello di attendibilità devono essere approvate dallo staff. Vedi %{link}"
+      new_topics_unless_trust_level: "Gli argomenti iniziati da utenti con un basso livello di attendibilità devono essere approvati dallo staff. Vedi %{link}"
+      fast_typer: "Un nuovo utente ha digitato il suo primo messaggio in modo troppo rapido. Sembra il comportamento di un bot o di uno spammer. Vedi %{link}."
       auto_silence_regex: "Nuovo utente il cui primo messaggio corrisponde all'impostazione %{link} ."
-      watched_word: "Questo post includeva una parola osservata. Vedi il tuo %{link}."
+      watched_word: "Questo messaggio includeva una parola osservata. Vedi il tuo %{link}."
+      staged: "I nuovi argomenti e messaggi per gli utenti temporanei devono essere approvati dallo staff. Vedi %{link}"
+      category: "I messaggi in questa categoria richiedono l'approvazione manuale da parte dello staff. Vedi %{link}."
+      must_approve_users: "Tutti i nuovi utenti devono essere approvati dallo staff. Vedi %{link}."
+      invite_only: "Tutti i nuovi utenti devono essere invitati. Vedi %{link}."
       email_auth_res_enqueue: "Questa email ha fallito un controllo DMARC, molto probabilmente non arriva da chi sembra provenire. Controlla le intestazioni email non elaborate per ulteriori informazioni."
+      email_spam: "Questa email è stata contrassegnata come spam dall'intestazione definita in %{link}."
+      suspect_user: "Questo nuovo utente ha inserito le informazioni del profilo senza leggere alcun argomento o messaggio, il che suggerisce che potrebbe essere uno spammer. Vedi %{link}."
+      contains_media: "Questo messaggio include contenuti multimediali incorporati. Vedi %{link}."
       queued_by_staff: "Un membro dello staff pensa che questo messaggio debba essere rivisto. Rimarrà nascosto fino ad allora."
       links:
         watched_word: lista delle parole osservate
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index fe9a4b4b2f..62d4e5f0b7 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -58,8 +58,6 @@ ja:
     bad_color_scheme: "テーマを更新できません。無効なカラーパレットです"
     other_error: "テーマの更新中に問題が発生しました"
     ember_selector_error: "#ember または .ember-view CSS セレクタは使用できません。これらの名前はランタイムに動的に生成されるため、時間の経過とともに変化し、最終的には CSS が破損するためです。別のセレクタを試してください。"
-    compile_error:
-      unrecognized_extension: "ファイル拡張子を認識できません: %{extension}"
     import_error:
       generic: テーマをインポート中にエラーが発生しました
       about_json: "インポートエラー: about.json が存在しないか無効です。これは Discourseテーマですか？"
@@ -549,7 +547,6 @@ ja:
   staff_category_name: "スタッフ"
   staff_category_description: "スタッフディスカッション用の非公開カテゴリです。トピックは管理者とモデレーターのみが閲覧できます。"
   discourse_welcome_topic:
-    title: "Discourse へようこそ"
     body: |2
 
       この固定トピックの最初の写真は、ようこそメッセージとしてホームページを初めて訪問するすべてのユーザーに表示されるものであるため、重要です！
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 7892e672c9..a31610a09e 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -59,8 +59,6 @@ ko:
     bad_color_scheme: "테마, 유효하지 않은 색상 팔레트를 업데이트할 수 없습니다"
     other_error: "테마를 업데이트하는 중에 문제가 발생했습니다"
     ember_selector_error: "#ember 또는 .ember-view CSS 선택기 사용은 허용되지 않습니다. 이러한 이름은 런타임에서 동적으로 생성되고 시간이 지남에 따라 변경되어 결국 CSS가 깨지기 때문입니다. 다른 선택기를 사용하세요."
-    compile_error:
-      unrecognized_extension: "인식할 수 없는 파일 확장자 : %{extension}"
     import_error:
       generic: 테마를 임포트하는 중에 오류가 발생했습니다.
       about_json: "임포트 오류: about.json이 없거나 유효하지 않습니다. Discourse용 테마가 맞는지 확인하세요."
@@ -555,7 +553,6 @@ ko:
   staff_category_name: "운영진"
   staff_category_description: "운영진 토론을 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다."
   discourse_welcome_topic:
-    title: "Discourse에 오신 것을 환영합니다"
     body: |2
 
       고정된 주제의 첫 문단은 홈페이지 방문자에게 환영 메시지로 표시되므로 매우 중요합니다!
@@ -2024,7 +2021,6 @@ ko:
         leading_trailing_slash: "정규식은 슬래시로 시작하거나 끝나서는 안 됩니다."
       unicode_usernames_avatars: "내부 시스템 아바타는 유니코드 아이디를 지원하지 않습니다."
       list_value_count: "목록에 정확히 %{count} 값을 포함해야 합니다."
-      google_oauth2_hd_groups: "이 설정을 활성화하기 전에 먼저 'google oauth2 hd'를 설정해야 합니다."
       search_tokenize_chinese_enabled: "이 설정을 활성화하기 전에 'search_tokenize_chinese'를 비활성화해야 합니다."
       search_tokenize_japanese_enabled: "이 설정을 활성화하기 전에 'search_tokenize_japanese'를 비활성화해야 합니다."
     placeholder:
@@ -4053,7 +4049,6 @@ ko:
           large_icon:
             label: "큰 아이콘"
       corporate:
-        title: "조직"
         fields:
           company_name:
             label: "회사 이름"
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index 6d1e414696..29d8f077b6 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -59,8 +59,6 @@ lt:
     bad_color_scheme: "Negalima atnaujinti temos, netinkama spalvų paletė"
     other_error: "Įvyko klaida atnaujinant temą"
     ember_selector_error: "Atsiprašome, naudoti #ember arba .ember-view CSS parinkiklius neleidžiama, nes šie pavadinimai dinamiškai generuojami vykdymo metu ir laikui bėgant keisis, o tai galiausiai sugadins CSS. Išbandykite kitą parinkiklį."
-    compile_error:
-      unrecognized_extension: "Neatpažintas failo plėtinys: %{extension}"
     import_error:
       generic: Importuojant šią temą įvyko klaida
       about_json: "Importo klaida: about.json neegzistuoja arba yra neteisingas. Ar tikrai tai Discourse tema?"
@@ -494,7 +492,6 @@ lt:
   staff_category_name: "Personalas"
   staff_category_description: "Privati kategorija personalo diskusijoms. Temos matomos tik administratoriams ir moderatoriams."
   discourse_welcome_topic:
-    title: "Sveiki atvykę į Discourse"
     body: |2
 
       Pirmoji šios prisegtos temos pastraipa bus matoma kaip sveikinimo žinutė visiems naujiems pagrindinio puslapio lankytojams. Tai svarbu!
@@ -1521,7 +1518,6 @@ lt:
       empty_selectable_avatars: "Prieš įgalindami šį nustatymą, pirmiausia turite įkelti bent du pasirinktus avatarus."
       allowed_unicode_usernames:
         leading_trailing_slash: "Reguliarioji išraiška neturi prasidėti ir baigtis pasviruoju brūkšniu."
-      google_oauth2_hd_groups: "Prieš įjungdami šį nustatymą, pirmiausia turite nustatyti „google oauth2 hd“."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 63bce41653..028a5c4cfb 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -398,7 +398,6 @@ nb_NO:
   staff_category_name: "Stab"
   staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer."
   discourse_welcome_topic:
-    title: "Velkommen til Discourse"
     body: |2
 
       Det første avsnittet av dette festede emnet vil være synlig som en velkomstmelding til alle nye besøkende på hjemmesiden. Det er viktig!
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 5086463479..1f09474316 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -58,8 +58,6 @@ nl:
     bad_color_scheme: "Kan thema niet bijwerken, ongeldig kleurenpalet"
     other_error: "Er is iets misgegaan bij het bijwerken van het thema"
     ember_selector_error: "Sorry - het gebruik van #ember of .ember-view CSS-selectors is niet toegestaan, omdat deze namen dynamisch worden gegenereerd tijdens runtime en in de loop van de tijd zullen veranderen, wat uiteindelijk resulteert in defecte CSS. Probeer een andere selector."
-    compile_error:
-      unrecognized_extension: "Niet-herkende bestandsextensie: %{extension}"
     import_error:
       about_json: "Belangrijke fout: about.json bestaat niet, of is ongeldig. Weet u zeker dat dit een Discourse-thema is?"
       about_json_values: "about.json bevat ongeldige waarden: %{errors}"
@@ -519,7 +517,6 @@ nl:
   staff_category_name: "Staf"
   staff_category_description: "Privécategorie voor stafgesprekken. Topics zijn alleen zichtbaar voor beheerders en moderators."
   discourse_welcome_topic:
-    title: "Welkom bij Discourse"
     body: |2
 
       De eerste alinea van dit vastgemaakte topic is op uw startpagina zichtbaar als een welkomstbericht voor alle nieuwe bezoekers. Dit is belangrijk!
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 375ca61e4b..7b9f1ab0ec 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -59,8 +59,6 @@ pl_PL:
     bad_color_scheme: "Nie można zaktualizować szablonu, nieprawidłowa paleta kolorów"
     other_error: "Coś poszło nie tak podczas aktualizacji szablonu"
     ember_selector_error: "Przepraszamy - używanie selektorów #ember lub .ember-view w CSS jest zabronione, ponieważ nazwy te są generowane dynamicznie w czasie pracy i z czasem się zmienią, co ostatecznie skończy się uszkodzenonym CSS. Wypróbuj inny selektor."
-    compile_error:
-      unrecognized_extension: "Nie rozpoznano rozszerzenia pliku: %{extension}"
     import_error:
       generic: Wystąpił błąd podczas importowania tego motywu
       upload: "Błąd tworzenia zasobu do przesłania: %{name}. %{errors}"
@@ -649,7 +647,6 @@ pl_PL:
   staff_category_name: "Zespół"
   staff_category_description: "Ukryta kategoria dla rozmów zespołu. Tematy są widoczne tylko dla adminów i moderatorów."
   discourse_welcome_topic:
-    title: "Witaj w Discourse"
     body: |2
 
       Pierwszy paragraf tego przypiętego tematu będzie widoczny jako wiadomość powitalna dla wszystkich odwiedzających stronę główną. Jest bardzo ważny!
@@ -1710,7 +1707,6 @@ pl_PL:
     google_oauth2_client_secret: "Client Secret twojej aplikacji w Google"
     google_oauth2_prompt: "Opcjonalna lista wartości łańcuchowych rozdzielanych spacjami, która określa, czy serwer autoryzacji monituje użytkownika o ponowne uwierzytelnienie i zgodę. Możliwe wartości można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> ."
     google_oauth2_hd: "Opcjonalna domena Google Apps Hosted, do której logowanie będzie ograniczone. Więcej informacji można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a>"
-    google_oauth2_hd_groups: "(eksperymentalne) Pobierz grupy dyskusyjne Google użytkowników w domenie hostowanej po uwierzytelnieniu. Pobrane grupy dyskusyjne Google mogą być używane do automatycznego przyznawania członkostwa w grupach Discourse (zobacz ustawienia grupy)."
     enable_twitter_logins: "Włącz uwierzytelnianie przez Twittera, wymaga twitter_consumer_key i twitter_consumer_secret. Zobacz <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfigurowanie logowania przez Twittera (i bogatych embedów) dla Discourse</a>."
     twitter_consumer_key: "Klucz klienta do uwierzytelnienia na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Sekret klienta dotyczący uwierzytelniania na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>stronie https://developer.twitter.com/apps</a>"
@@ -2240,7 +2236,6 @@ pl_PL:
       unicode_usernames_avatars: "Wewnętrzne awatary systemowe nie obsługują nazw użytkowników zawierających unicode."
       list_value_count: "Lista musi zawierać dokładnie %{count} wartości."
       markdown_linkify_tlds: "Nie możesz uwzględnić wartości '*'."
-      google_oauth2_hd_groups: "Musisz najpierw ustawić 'google oauth2 hd' przed włączeniem tego ustawienia."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Nie można włączyć DiscourseConnect, jeśli wymuszono 2FA."
     placeholder:
       discourse_connect_provider_secrets:
@@ -4618,7 +4613,6 @@ pl_PL:
               subcategories_with_featured_topics:
                 label: "Podkategorie z polecanymi tematami"
       branding:
-        title: "Branding społeczności"
         fields:
           logo:
             label: "Podstawowe logo"
@@ -4633,7 +4627,6 @@ pl_PL:
             label: "Duża ikona"
             description: "Ikona używana do reprezentowania Twojej witryny na urządzeniach mobilnych, która dobrze wygląda w większych rozmiarach. Najlepiej, jeśli jest większa niż 512x512. Domyślnie używane jest logo kwadratowe."
       corporate:
-        title: "Kontakt i organizacja"
         fields:
           company_name:
             label: "Nazwa firmy"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 6a1e94655e..5ec1cbd01f 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -58,8 +58,6 @@ pt:
     bad_color_scheme: "Não é possível atualizar o tema, a paleta de cores é inválida"
     other_error: "Ocorreu algo de errado ao atualizar o tema"
     ember_selector_error: "Não é permitido usar seletores CSS #ember ou .ember-view, porque esses nomes são gerados dinamicamente no tempo de execução e mudarão com o tempo, resultando em CSS corrompido. Experimente um seletor diferente."
-    compile_error:
-      unrecognized_extension: "Extensão de ficheiro desconhecida: %{extension}"
     import_error:
       generic: Ocorreu um erro ao importar esse tema
       about_json: "Erro de importação: about.json não existe ou é inválido. Tem a certeza de que este é um Tema do Discourse?"
@@ -475,8 +473,6 @@ pt:
   meta_category_description: "Discussão sobre este sítio, a sua organização, como funciona, e como podemos melhorá-lo."
   staff_category_name: "Pessoal"
   staff_category_description: "Categoria privada para discussões do pessoal. Os tópicos estão apenas visíveis para administradores e moderadores."
-  discourse_welcome_topic:
-    title: "Bem-vindo ao Discourse"
   category:
     topic_prefix: "Acerca da categoria %{category}"
     post_template: "%{replace_paragraph}\n\nUtilize os seguintes parágrafos para uma descrição mais longa, ou para estabelecer orientações ou regras da categoria:\n\n- Porque devem as pessoas utilizar esta categoria? Para que serve?\n\n- No que difere ao certo em relação às outras categorias que já temos?\n\n- O que devem conter, de maneira geral, os tópicos desta categoria?\n\n- Precisamos desta categoria? Podemos uni-la com outra categoria, ou subcategoria?\n"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index f76e4d44c8..f81ef59e73 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -59,8 +59,6 @@ pt_BR:
     bad_color_scheme: "Não é possível atualizar o tema, paleta de cores inválida"
     other_error: "Ocorreu um erro ao atualizar o tema"
     ember_selector_error: "Desculpe, usar #ember ou . seletores .ember-view CSS não é permitido, porque esses nomes são gerados dinamicamente durante a execução e mudarão ao longo do tempo, podendo resultar em um CSS quebrado. Tente um seletor diferente."
-    compile_error:
-      unrecognized_extension: "Extensão de arquivo não reconhecida: %{extension}"
     import_error:
       generic: Ocorreu um erro ao importar esse tema
       upload: "Erro ao enviar um arquivo: %{name}. %{errors}"
@@ -599,7 +597,6 @@ pt_BR:
   staff_category_name: "Equipe"
   staff_category_description: "Categoria particular para discussões da equipe. Tópicos só são visíveis para administradores(as) e moderadores(as)."
   discourse_welcome_topic:
-    title: "Boas-vindas ao Discourse"
     body: |2
 
       O primeiro parágrafo deste tópico fixado será visto como uma mensagem de boas-vindas a todos(as) os(as) novos(as) visitantes em sua página inicial. É muito importante!
@@ -1602,7 +1599,6 @@ pt_BR:
     google_oauth2_client_secret: "Segredo de cliente do seu app Google."
     google_oauth2_prompt: "Uma lista opcional delimitada por espaço de valores de linhas que especifica se o servidor de autorização solicita ao(à) usuário(a) reautenticação e consentimento. Acesse <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> para consultar os valores possíveis."
     google_oauth2_hd: "Um domínio opcional hospedado pelo Google Apps ao qual a entrada com conta será limitada. Acesse <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> para obter mais detalhes."
-    google_oauth2_hd_groups: "(experimental) Recupere os grupos do Google dos(as) usuários(as) no domínio ou autenticação hospedada. Grupos do Google recuperados podem ser usados para conceder associação automática ao grupo do Discourse"
     enable_twitter_logins: "Ative a autenticação do Twitter, requer twitter_consumer_key e twitter_consumer_secret. Acesse <a href='https://meta.discourse.org/t/13395' target='_blank'>Configurando a entrada com conta Twitter (e muitas inserções) para o Discourse</a>."
     twitter_consumer_key: "Chave do(a) consumidor(a) para autenticação do Twitter, registrada em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Segredo do(a) consumidor(a) para autenticação do Twitter, registrado em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2123,7 +2119,6 @@ pt_BR:
         leading_trailing_slash: "A expressão regular não deve começar e terminar com uma barra."
       unicode_usernames_avatars: "Os avatares internos do sistema não são compatíveis com nomes de usuário(as) Unicode."
       list_value_count: "A lista deve conter exatamente %{count} valores."
-      google_oauth2_hd_groups: "Você deve definir \"google oauth2 hd\" antes de ativar esta configuração."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.exemplo.com.br"
@@ -4399,7 +4394,6 @@ pt_BR:
               subcategories_with_featured_topics:
                 label: "Sub-Categorias com tópicos em destaque"
       branding:
-        title: "Marca da comunidade"
         fields:
           logo:
             label: "Logotipo primário"
@@ -4414,7 +4408,6 @@ pt_BR:
             label: "Ícone grande"
             description: "Ícone usado para representar seu site em dispositivos móveis e fique bem em tamanhos maiores. Idealmente maior que 512x512. O logo quadrado é usado por padrão."
       corporate:
-        title: "Contato & Organização"
         fields:
           company_name:
             label: "Nome da empresa"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 059eea8105..50f3dfb79c 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -328,8 +328,6 @@ ro:
   meta_category_description: "Discuții despre acest forum, organizare, funcționare și cum îl putem îmbunătăți."
   staff_category_name: "Echipa"
   staff_category_description: "Categorie privată pentru discuțiile personalului. Subiectele sunt vizibile numai pentru admini și moderatori."
-  discourse_welcome_topic:
-    title: "Bine ai venit la Discourse"
   category:
     topic_prefix: "Despre categoria %{category}"
     post_template: "%{replace_paragraph}\n\nFolosește următoarele paragrafe pentru a scrie o descriere mai lungă sau pentru a seta regulile ori îndreptarul categoriei:\n\n- De ce să folosească lumea această categorie? Care e destinația ei?\n\n- Prin ce anume se deosebește de alte categorii pe care le avem deja?\n\n- Ce ar trebui să conțină, în general, subiectele din această categorie?\n\n- Chiar avem nevoie de aceasta categorie? N-am putea-o combina cu o altă categorie sau subcategorie deja existentă?\n"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index cb06bc23a5..65b6a6669d 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -59,8 +59,6 @@ ru:
     bad_color_scheme: "Не удаётся обновить тему, недопустимая цветовая палитра"
     other_error: "При обновлении темы оформления что-то пошло не так."
     ember_selector_error: "К сожалению, использование CSS-селекторов #ember или .ember-view запрещено, поскольку эти имена создаются динамически во время выполнения кода и со временем будут меняться. Попробуйте другой селектор."
-    compile_error:
-      unrecognized_extension: "Нераспознанное расширение файла: %{extension}"
     import_error:
       generic: При импорте темы произошла ошибка
       upload: "Ошибка при создании ресурса загрузки: %{name}. %{errors}"
@@ -659,7 +657,7 @@ ru:
   staff_category_name: "Персонал"
   staff_category_description: "Приватный раздел для персонала, в котором темы видны только администраторам и модераторам."
   discourse_welcome_topic:
-    title: "Добро пожаловать в Discourse"
+    title: "Добро пожаловать в наше сообщество!"
     body: |2
 
       Первый абзац этой закреплённой темы будет виден всем новым посетителям как приветственное сообщение на основной странице форума. Это важно!
@@ -1730,7 +1728,9 @@ ru:
     google_oauth2_client_secret: "Client secret для Google-приложения."
     google_oauth2_prompt: "Необязательный список строковых значений, разделенных пробелами, который указывает, запрашивает ли сервер авторизации у пользователя повторную аутентификацию и согласие. См. <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>этот раздел</a> для указания возможных значений."
     google_oauth2_hd: "Необязательный домен, указанный в G Suite, доступ к которому будет ограничен. См. <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>этот раздел</a> для получения дополнительной информации."
-    google_oauth2_hd_groups: "(экспериментально) Получение групп Google пользователей в размещенном домене при аутентификации. Полученные группы Google можно использовать для предоставления автоматического членства в группе Discourse (см. настройки группы)."
+    google_oauth2_hd_groups: "(экспериментально) Получение групп Google пользователей в размещенном домене при аутентификации. Полученные группы Google можно использовать для предоставления автоматического членства в группе Discourse (см. настройки группы). Для получения дополнительной информации см. https://meta.discourse.org/t/226850."
+    google_oauth2_hd_groups_service_account_admin_email: "Адрес электронной почты, принадлежащий учётной записи администратора Google Workspace. Будет использоваться вместе со служебной учетной записью для получения информации о группе."
+    google_oauth2_hd_groups_service_account_json: "Ключевая информация в формате JSON для служебной учётной записи. Будет использоваться для получения информации о группе."
     enable_twitter_logins: "Включить аутентификацию Twitter, требуются twitter_consumer_key и twitter_consumer_secret. См. тему <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
     twitter_consumer_key: "Ключ пользователя для аутентификации в Twitter, зарегистрированный в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Секретный номер для проверки подлинности Twitter, зарегистрированный в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2211,6 +2211,7 @@ ru:
     enable_sitemap: "Создать карту сайта и включить её в файл robots.txt."
     sitemap_page_size: "Количество URL-адресов для включения в каждую страницу карты сайта. Значение не должно превышать 50 000"
     enable_user_status: "(экспериментально) Разрешить пользователям устанавливать собственное сообщение о статусе (эмодзи + описание)."
+    enable_onboarding_popups: "(экспериментально) Отображать всплывающие окна с советами, описывающими ключевые функции форума"
     short_title: "Краткое название будет использоваться на домашней странице, в панели запуска или в других местах, где пространство может быть ограничено. Оно должен быть не более 12 символов."
     dashboard_hidden_reports: "Разрешать скрывать отдельные отчёты из админки."
     dashboard_visible_tabs: "Закладки, которые будут отображаться в админке."
@@ -4588,7 +4589,7 @@ ru:
               subcategories_with_featured_topics:
                 label: "Подразделы с избранными темами"
       branding:
-        title: "Брендинг сообщества"
+        title: "Настройка логотипов"
         fields:
           logo:
             label: "Основной логотип"
@@ -4603,7 +4604,7 @@ ru:
             label: "Большая иконка"
             description: "Иконка, используемая для представления вашего сайта на мобильных устройствах, должна хорошо выглядеть при больших размерах. В идеале должна быть больше чем 512x512 пикселей. По умолчанию используется квадратный логотип."
       corporate:
-        title: "Организация и контакты"
+        title: "Ваша организация"
         fields:
           company_name:
             label: "Название компании"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index f5c5fdab8c..a47d22f741 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -314,8 +314,6 @@ sk:
   meta_category_description: "Diskusia o stránke, organizácii, ako funguje a ako ju môžme vylepšit"
   staff_category_name: "Zamestnanci"
   staff_category_description: "Súkromna kategória pre zamestnaneckú diskusiu. Témy su viditeľné len pre správcov a moderátorov diskusie"
-  discourse_welcome_topic:
-    title: "Vitajte v Discourse"
   category:
     topic_prefix: "O kategórii: %{category} "
     post_template: "%{replace_paragraph}\n\nDo tohoto odstavce dajte dlhší popis kategórie, alebo popíšte pokyny alebo pravidlá:\n\n- Prečo by ľudia mali použiť túto kategóriu? Na čo je určená?\n\n- V čom sa líši od ostatných existujúcich kategórií ktoré už máte?\n\n- Čo by vo všeobecnosti mala obsahovať téma v tejto kategórií?\n\n- Potrebujeme túto kategóriu? Môžeme ju spojiť s inóu kategóriou alebo pod-kategóriou?\n"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 6d405c7133..93c30bc340 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -59,8 +59,6 @@ sv:
     bad_color_scheme: "Kan inte uppdatera tema, ogiltig färgpalett"
     other_error: "Något blev fel när temat uppdaterades"
     ember_selector_error: "Tyvärr — det är inte tillåtet att använda CSS-selektorerna #ember eller .ember-view, eftersom dessa namn genereras dynamiskt under körning och kommer att ändras över tid, vilket resulterar i trasig CSS. Prova en annan selektor."
-    compile_error:
-      unrecognized_extension: "Okänt filnamnstillägg: %{extension}"
     import_error:
       generic: Det uppstod ett fel vid import av det temat
       upload: "Det uppstod ett fel under skapandet av uppladdningstillgång: %{name}. %{errors}"
@@ -608,7 +606,7 @@ sv:
   staff_category_name: "Personal"
   staff_category_description: "Privat kategori för personaldiskussioner. Ämnen är bara synliga för administratörer och moderatorer."
   discourse_welcome_topic:
-    title: "Välkommen till diskussionen"
+    title: "Välkommen till vårt forum!"
     body: |2
 
       Det första stycket i detta fästa ämne kommer att visas som ett välkomstmeddelande för alla nya besökare på din hemsida. Det är viktigt!
@@ -1625,7 +1623,9 @@ sv:
     google_oauth2_client_secret: "Klienthemlighet för din Google-applikation."
     google_oauth2_prompt: "En valfri mellanrumsavgränsad lista över strängvärden som anger huruvida auktoriseringsservern ber användaren om omautentisering och samtycke. Se möjliga värden i <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a>."
     google_oauth2_hd: "En valfri Google Apps Hosted-domän som inloggningen kommer att begränsas till. Se mer information på <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a>."
-    google_oauth2_hd_groups: "(experimentell) Hämta användarnas Google-grupper på värddomänen vid autentisering. Hämtade Google-grupper kan användas för att bevilja automatiskt medlemskap i grupper inom Discourse (se gruppinställningar)."
+    google_oauth2_hd_groups: "(experimentell) Hämta användarnas Google-grupper på värddomänen vid autentisering. Hämtade Google-grupper kan användas för att bevilja automatiskt medlemskap i grupper inom Discourse (se gruppinställningar). Mer information finns på https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "En e-postadress som tillhör ett Google Workspace-administratörskonto. Kommer att användas med tjänstkontouppgifterna för att hämta gruppinformation."
+    google_oauth2_hd_groups_service_account_json: "JSON-formaterad nyckelinformation för tjänstkontot. Kommer att användas för att hämta gruppinformation."
     enable_twitter_logins: "Aktivera Twitter-autentisering, kräver twitter_consumer_key och twitter_consumer_secret. Se <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfigurera Twitter-inloggning (och formaterade inbäddningar) för Discourse</a>."
     twitter_consumer_key: "Konsumentnyckel för Twitter-autentisering, registrerad på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Konsumenthemlighet för Twitter-autentisering, registrerad på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2106,6 +2106,7 @@ sv:
     enable_sitemap: "Skapa en webbplatskarta för din webbplats och inkludera den i filen robots.txt."
     sitemap_page_size: "Antal webbadresser som ska inkluderas på varje webbplatskartsida. Max 50.000"
     enable_user_status: "(experimentell) Tillåt användare att ställa in anpassat statusmeddelande (emoji + beskrivning)."
+    enable_onboarding_popups: "(experimentell) Aktivera pedagogiska popup-fönster som beskriver nyckelfunktioner för användare"
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Den bör begränsas till 12 tecken."
     dashboard_hidden_reports: "Tillåt att de specificerade rapporterna döljs från översiktspanelen."
     dashboard_visible_tabs: "Välj vilka flikar på översiktspanelen som ska vara synliga."
@@ -2175,7 +2176,7 @@ sv:
       unicode_usernames_avatars: "De interna systemavatarerna stöder inte Unicode-användarnamn."
       list_value_count: "Listan måste innehålla exakt %{count} värden."
       markdown_linkify_tlds: "Du kan inte inkludera ett värde av '*'."
-      google_oauth2_hd_groups: "Du måste först ange 'google oauth2 hd' innan du aktiverar denna inställning."
+      google_oauth2_hd_groups: "Du måste konfigurera alla 'google oauth2 hd'-inställningar innan du aktiverar den här inställningen."
       search_tokenize_chinese_enabled: "Du måste inaktivera 'search_tokenize_chinese' innan du aktiverar den här inställningen."
       search_tokenize_japanese_enabled: "Du måste inaktivera 'search_tokenize_japanese' innan du aktiverar den här inställningen."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Du kan inte aktivera DiscourseConnect om 2FA är obligatoriskt."
@@ -4166,7 +4167,7 @@ sv:
               subcategories_with_featured_topics:
                 label: "Underkategorier med utvalda ämnen"
       branding:
-        title: "Forumets logotyp"
+        title: "Anpassa logotyper"
         fields:
           logo:
             label: "Primär logo"
@@ -4181,7 +4182,7 @@ sv:
             label: "Stor ikon"
             description: "Ikon som används för att representera din webbplats på mobila enheter och som ser bra ut i större storlekar. Helst större än 512x512. Som standard används en fyrkantig logotyp."
       corporate:
-        title: "Kontakt och organisation"
+        title: "Din organisation"
         fields:
           company_name:
             label: "Företagsnamn"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index d6b8d0b8e4..7d4f0afb92 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -332,8 +332,6 @@ sw:
   meta_category_description: "Majadiliano kuhusu tovuti, shirika, jinsi inavyofanya kazi, na jinsi tunaweza kuiboresha."
   staff_category_name: "Wasaidizi"
   staff_category_description: "Kategoria binafsi kwa ajili ya majadiliano ya wasaidizi. Mada zitaonwa na wasimamizi na viongozi tu."
-  discourse_welcome_topic:
-    title: "Karibu kwenye Discourse"
   category:
     topic_prefix: "Kuhusu kategoria %{category}"
     errors:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 7abe0b142b..ecaa79b49b 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -59,8 +59,6 @@ tr_TR:
     bad_color_scheme: "Tema güncellenemiyor, geçersiz renk paleti"
     other_error: "Temanın güncellenmesi sırasında bir sorun oluştu"
     ember_selector_error: "Üzgünüz – #ember veya .ember-view CSS seçicilerinin kullanılması yasak, çünkü bu adlar çalışma zamanında dinamik olarak oluşturulur ve zamanla değişerek sonunda CSS'nin bozulmasına neden olur. Farklı bir seçici deneyin."
-    compile_error:
-      unrecognized_extension: "Tanınmayan dosya uzantısı: %{extension}"
     import_error:
       generic: Bu tema içe aktarılırken bir hata oluştu
       upload: "Yükleme öğesi oluşturulurken hata oluştu: %{name}. %{errors}"
@@ -592,7 +590,6 @@ tr_TR:
   staff_category_name: "Görevliler"
   staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece yönetici ve moderatörlere gözükür."
   discourse_welcome_topic:
-    title: "Forumumuza Hoşgeldiniz"
     body: |2
 
       Bu sabitlenmiş konunun ilk paragrafı, ana sayfanızdaki tüm yeni ziyaretçilere hoş geldiniz iletisi olarak görünecektir. Bu önemli!
@@ -1598,7 +1595,6 @@ tr_TR:
     google_oauth2_client_secret: "Google uygulamanıza ait client secret değeri."
     google_oauth2_prompt: "Yetkilendirme sunucusunun kullanıcıdan yeniden kimlik doğrulaması ve onay isteyip istemediğini belirten, isteğe bağlı, boşlukla ayrılmış bir dize değerleri listesi. Olası değerler için <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt adresine</a> bakın."
     google_oauth2_hd: "Oturum açmanın sınırlı olacağı isteğe bağlı bir Google Apps Barındırılan alan adı. Daha fazla ayrıntı için <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param adresine</a> bakın."
-    google_oauth2_hd_groups: "(deneysel) Kimlik doğrulamada barındırılan alandaki kullanıcıların Google gruplarını alın. Alınan Google grupları, otomatik Söylem grubu üyeliği vermek için kullanılabilir (grup ayarlarına bakın)."
     enable_twitter_logins: "Twitter kimlik doğrulamasını etkinleştir, twitter_consumer_key ve twitter_consumer_secret gerektirir. <a href='https://meta.discourse.org/t/13395' target='_blank'>Discourse için Twitter girişini (ve zengin yerleştirmeleri) yapılandırma sayfasına göz atın</a> ."
     twitter_consumer_key: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps adresinde</a> kayıtlı olan Twitter kimlik doğrulaması için 'consumer key'"
     twitter_consumer_secret: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps adresinde</a> kayıtlı olan Twitter kimlik doğrulaması için 'consumer secret'"
@@ -2057,6 +2053,7 @@ tr_TR:
     enable_sitemap: "Siteniz için bir site haritası oluşturun ve bunu robots.txt dosyasına ekleyin."
     sitemap_page_size: "Her site haritası sayfasına dahil edilecek URL sayısı. Maksimum 50.000"
     enable_user_status: "(deneysel) Kullanıcıların özel durum mesajı (emoji + açıklama) ayarlamasına izin verin."
+    enable_onboarding_popups: "(deneysel) Kullanıcılara temel özellikleri açıklayan eğitim pop-up'larını etkinleştirin"
     short_title: "Kısa başlık kullanıcının ana ekranında, başlatıcısında veya alanın sınırlı olabileceği diğer yerlerde kullanılır. En fazla 12 karakter olmalıdır."
     dashboard_hidden_reports: "Gösterge tablosundan belirtilen raporların gizlenmesine izin verin."
     dashboard_visible_tabs: "Hangi pano sekmelerinin görünür olacağını seçin."
@@ -2122,7 +2119,6 @@ tr_TR:
       unicode_usernames_avatars: "Dahili sistem avatarları Unicode kullanıcı adlarını desteklemez."
       list_value_count: "Liste tam olarak %{count} değerleri içermelidir."
       markdown_linkify_tlds: "'*' değerini ekleyemezsiniz."
-      google_oauth2_hd_groups: "Bu ayarı etkinleştirmeden önce 'google oauth2 hd'yi ayarlamalısınız."
       search_tokenize_chinese_enabled: "Bu ayarı etkinleştirmeden önce 'search_tokenize_chinese' özelliğini devre dışı bırakmalısınız."
       search_tokenize_japanese_enabled: "Bu ayarı etkinleştirmeden önce 'search_tokenize_japanese' özelliğini devre dışı bırakmalısınız."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "2FA zorunlu kılınmışsa DiscourseConnect'i etkinleştiremezsiniz."
@@ -3877,7 +3873,6 @@ tr_TR:
               subcategories_with_featured_topics:
                 label: "Öne Çıkan Konular İçeren Alt Kategoriler"
       branding:
-        title: "Topluluk Tanıtımı"
         fields:
           logo:
             label: "Birincil Görsel"
@@ -3888,7 +3883,6 @@ tr_TR:
           large_icon:
             label: "Büyük Simge"
       corporate:
-        title: "İletişim & Organizasyon"
         fields:
           company_name:
             label: "Şirket Adı"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index c8f9492a4b..4aa4c51d26 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -59,8 +59,6 @@ uk:
     bad_color_scheme: "Неможливо оновити тему, недійсна палітра кольорів"
     other_error: "Щось пішло не так з оновленням теми"
     ember_selector_error: "На жаль, використання селекторів CSS #ember або .ember-view заборонено, оскільки ці імена генеруються динамічно під час виконання та змінюватимуться з часом, що в кінцевому підсумку призведе до пошкодження CSS. Спробуйте інший селектор."
-    compile_error:
-      unrecognized_extension: "Нерозпізнане розширення файлу: %{extension}"
     import_error:
       generic: Під час імпорту цієї теми сталася помилка
       upload: "Помилка створення об’єкта завантаження: %{name}. %{errors}"
@@ -646,7 +644,6 @@ uk:
   staff_category_name: "Персонал"
   staff_category_description: "Приватна категорія для обговорень між персоналом. Теми бачать тільки адміністратори та модератори."
   discourse_welcome_topic:
-    title: "Ласкаво просимо в Discourse"
     body: |2
 
       Перший абзац цієї закріпленої теми буде відображатися як вітальне повідомлення для всіх нових відвідувачів на домашній сторінці. Це важливо!
@@ -1715,7 +1712,6 @@ uk:
     google_oauth2_client_secret: "Client secret для вашого Google додатка"
     google_oauth2_prompt: "Необов’язковий розділений пробілом список значень, який вказує, чи запитує сервер авторизацію користувача для повторної автентифікації та згоди. Див. <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> щодо можливих значень."
     google_oauth2_hd: "Необов’язковий домен, розміщений у Google Apps Hosted, до якого вхід буде обмежений. Див <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> для більш докладної інформації."
-    google_oauth2_hd_groups: "(експериментально) Отримати групи Google користувачів у розміщеному домені під час автентифікації. Отримані групи Google можна використовувати для надання автоматичного членства в групі Discourse (див. налаштування групи)."
     enable_twitter_logins: "Увімкніть автентифікацію Twitter, потрібні twitter_consumer_key та twitter_consumer_secret. Див. <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
     twitter_consumer_key: "Ключ користувача для аутентифікації в Twitter, зареєстрований за адресою <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Секретний номер для перевірки справжності Twitter, зареєстрований в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -2249,7 +2245,6 @@ uk:
       unicode_usernames_avatars: "Внутрішні аватари системи не підтримують імен користувачів Unicode."
       list_value_count: "Список повинен містити точно %{count} значення."
       markdown_linkify_tlds: "Не можна включати значення \"*\"."
-      google_oauth2_hd_groups: "Для увімкнення цього параметра ви повинні встановити 'google oauth2 hd'."
       search_tokenize_chinese_enabled: "Для увімкнення цього налаштування необхідно вимкнути 'search_tokenize_chinese'."
       search_tokenize_japanese_enabled: "Ви повинні відключити 'search_tokenize_japanese' перед увімкненням цього налаштування."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Ви не можете ввімкнути DiscourseConnect, якщо застосовано 2FA."
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 6cf62f22d9..9fbc551756 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -59,8 +59,6 @@ ur:
     bad_color_scheme: "تِھیم اَپ ڈَیٹ نہیں ہو سکتی، غلط رنگ پیلیٹ"
     other_error: "تِھیم اَپ ڈَیٹ کرتے ہوے کچھ غلط ہو گیا"
     ember_selector_error: "معذرت – #ember یا .ember-view CSS سلیکٹرز استعمال کرنے کی اجازت نہیں ہے، کیونکہ یہ نام متحرک طور پر رن ٹائم پر بنائے جاتے ہیں اور وقت کے ساتھ ساتھ تبدیل ہوتے جائیں گے، جس کے نتیجے میں CSS ٹوٹ جاتا ہے۔ کوئی مختلف سلیکٹر آزمائیں۔"
-    compile_error:
-      unrecognized_extension: "نامعلوم فائل ایکسٹینشن: %{extension}"
     import_error:
       generic: اس تھیم کو درآمد کرتے وقت ایک خرابی پیش آگئی
       about_json: "درآمد کی خرابی: about.json موجود نہیں ہے، یا غلط ہے۔ کیا آپ کو یقین ہے کہ یہ ایک ڈسکورس تھیم ہے؟"
@@ -587,7 +585,6 @@ ur:
   staff_category_name: "سٹاف"
   staff_category_description: "اسٹاف کی گفتگو کیلئے ذاتی زُمرہ۔ ٹاپک صرف ایڈمن اور ماڈریٹرز کو نظر آتے ہیں۔"
   discourse_welcome_topic:
-    title: "ڈسکورس میں خوش آمدید"
     body: |2
 
       اس پِن کیے گئے ٹاپک کا پہلا پیراگراف آپ کے ہَوم پیج پر تمام نئے زائرین کو ایک خوش آمدید پیغام کے طور پر نظر آئے گا۔ یہ اہم ہے!
@@ -1561,7 +1558,6 @@ ur:
     google_oauth2_client_secret: "آپ کی گُوگل ایپلی کیشن کا کلائنٹ سیکرٹ."
     google_oauth2_prompt: "خالی جگہ سے علیحدہ کردہ سٹرنگ وَیلِیوز کی ایک اختیاری فہرست جو اِس بات کی وضاحت کرتی ہے کہ اَوتھرائزیشن سرور صارف کو دوبارہ تصدیق اور رضامندی کیلئے پوچھتا ہے کہ نہیں۔ ممکنہ اقدار کیلئے <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> دیکھیے۔"
     google_oauth2_hd: "ایک اختیاری گُوگل اَیپس ہوسٹِڈ ڈومَین جس تک کہ سائن اِن محدود ہو گا۔ مزید تفصیلات کیلئے <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> ملاحظہ کریں۔"
-    google_oauth2_hd_groups: "(تجرباتی) توثیق پر میزبان ڈومین پر صارفین کے گوگل گروپس کو بازیافت کریں۔ بازیافت شدہ گوگل گروپس کو خودکار ڈسکورس گروپ ممبرشپ دینے کے لیے استعمال کیا جا سکتا ہے (گروپ سیٹنگز دیکھیں)۔"
     enable_twitter_logins: "ٹویٹر توثیق فعال کریں۔ twitter_consumer_key اور twitter_consumer_secret ضروری ہیں۔ دیکھیے <a href='https://meta.discourse.org/t/13395' target='_blank'>ڈسکورس کیلئے ٹویٹر لاگ اِن ترتیب دیں (اور رِچ اَیمبَیڈ)</a>۔"
     twitter_consumer_key: "ٹویٹر توثیق کیلئے کنزِیُومر کِی، <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/app</a> پر رجسٹر کردہ"
     twitter_consumer_secret: "ٹویٹر توثیق کیلئے کنزِیُومر سیکرٹ، <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/app</a> پر رجسٹر کردہ"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index b5dc212931..28c762e094 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -59,8 +59,6 @@ vi:
     bad_color_scheme: "Không thể cập nhật chủ đề, bảng màu không hợp lệ"
     other_error: "Đã xảy ra lỗi khi cập nhật chủ đề"
     ember_selector_error: "Xin lỗi - không cho phép sử dụng bộ chọn CSS #ember hoặc .ember-view vì những tên này được tạo động trong thời gian chạy và sẽ thay đổi theo thời gian, cuối cùng dẫn đến CSS bị hỏng. Hãy thử một bộ chọn khác."
-    compile_error:
-      unrecognized_extension: "Phần mở rộng tệp không được công nhận: %{extension}"
     import_error:
       generic: Đã xảy ra lỗi khi nhập chủ đề đó
       upload: "Lỗi khi tạo nội dung tải lên: %{name}. %{errors}"
@@ -493,7 +491,6 @@ vi:
   staff_category_name: "Nhân viên"
   staff_category_description: "Chuyên mục riêng dành cho nhân viên. Các chủ đề chỉ hiển thị với quản trị viên và điều hành viên."
   discourse_welcome_topic:
-    title: "Chào mừng đến với Discourse"
     body: |2
 
       Đoạn đầu tiên của chủ đề được ghim này sẽ hiển thị như một thông điệp chào mừng cho tất cả những khách truy cập mới trên trang chủ của bạn. Nó quan trọng!
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index e72a0778e6..81587c367e 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -59,11 +59,9 @@ zh_CN:
     bad_color_scheme: "无法更新主题，调色板无效"
     other_error: "更新主题时出错"
     ember_selector_error: "抱歉 - 不允许使用 #ember 或 .ember-view CSS 选择器，因为这些名称是在运行时动态生成的，并且会随着时间变化，最终会导致 CSS 损坏。尝试其他选择器。"
-    compile_error:
-      unrecognized_extension: "无法识别的文件扩展名：%{extension}"
     import_error:
       generic: 导入该主题时发生错误
-      upload: "创建上传资源错误： %{name}. %{errors}"
+      upload: "创建上传资产时出错：%{name}。%{errors}"
       about_json: "导入错误：about.json 不存在或无效。确定这是一个 Discourse 主题码？"
       about_json_values: "about.json 包含无效值：%{errors}"
       modifier_values: "about.json 修饰符包含无效值：%{errors}"
@@ -73,7 +71,7 @@ zh_CN:
       file_too_big: "未压缩的文件过大。"
       unknown_file_type: "您上传的文件似乎不是一个有效的 Discourse 主题。"
       not_allowed_theme: "`%{repo}` 不在允许的主题列表中（请检查 `allowed_theme_repos` 全局设置）。"
-      ssh_key_gone: "你等待安装主题的时间太长，SSH 密钥过期。请再试一次。"
+      ssh_key_gone: "您安装主题等待的时间太长，并且 SSH 密钥已过期。请再试一次。"
     errors:
       component_no_user_selectable: "主题组件无法由用户选择"
       component_no_default: "主题组件不能是默认主题"
@@ -129,6 +127,7 @@ zh_CN:
         unsubscribe_not_allowed: "当不允许此用户通过电子邮件退订时，就会发生这种情况。"
         email_not_allowed: "当电子邮件地址不在许可名单中或位于屏蔽名单中时，就会发生这种情况。"
       unrecognized_error: "无法识别的错误"
+    secure_uploads_placeholder: "已编辑：此站点已启用安全上传，请访问话题或点击“查看媒体”以查看附加的上传。"
     view_redacted_media: "查看媒体"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -192,7 +191,7 @@ zh_CN:
       page_publishing_requirements: "如果启用了安全媒体，则无法启用页面发布。"
       s3_backup_requires_s3_settings: "除非提供 '%{setting_name}'，否则无法将 S3 用作备份位置。"
       s3_bucket_reused: "您无法将同一个存储桶同时用作 's3_upload_bucket' 和 's3_backup_bucket'。请选择一个不同的存储桶或为每个存储桶使用不同的路径。"
-      secure_uploads_requirements: "在启用安全上传之前，必须先启用 S3 上传。"
+      secure_uploads_requirements: "必须先启用 S3 上传，然后才能启用安全上传。"
       share_quote_facebook_requirements: "您必须设置 Facebook 应用 ID 才能为 Facebook 启用引用共享。"
       second_factor_cannot_enforce_with_socials: "您无法在启用社交登录的情况下强制执行双重身份验证。您必须首先通过以下方式禁用登录：%{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录，则无法强制执行双重身份验证。"
@@ -200,10 +199,10 @@ zh_CN:
       local_login_cannot_be_disabled_if_second_factor_enforced: "如果强制执行双重身份验证，则无法禁用本地登录。先禁用强制双重身份验证，然后再禁用本地登录。"
       cannot_enable_s3_uploads_when_s3_enabled_globally: "您无法启用 S3 上传，因为 S3 上传已全局启用，启用此站点级设置可能会导致上传出现严重问题"
       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}。"
-      strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "如果启用了“composer media optimization image enabled”，则无法去除图片元数据。在去除图片元数据之前，禁用“已启用作曲家媒体优化图像”。"
-      twitter_summary_large_image_no_svg: "用于 twitter:image 元数据的 Twitter 摘要图像不能是 .svg 图像。"
+      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'。"
+      twitter_summary_large_image_no_svg: "用于 twitter:image 元数据的 Twitter 摘要图片不能是 .svg 图片。"
     conflicting_google_user_id: '此帐户的 Google 帐号 ID 已更改；出于安全原因，需要管理人员干预。请联系管理人员并将他们指向 <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
       invalid_address: "抱歉，我们无法为此网页生成预览，因为找不到服务器 '%{hostname}'。您的帖子中只会显示链接，而不会显示预览。:cry:"
@@ -224,8 +223,8 @@ zh_CN:
 
       <p>否则，请<a href="%{base_url}/password-reset">重置密码</a>。</p>
     not_found_template_link: |
-      <p>这个给<a href="%{base_url}">%{site_name}</a>发出的邀请无法再被兑换。请让邀请你的人给你发送新的邀请。</p>
-    user_exists: "不用邀请 <b>%{email}</b> 了，他们已经有一个账户了！"
+      <p>无法再兑换此加入 <a href="%{base_url}">%{site_name}</a> 的邀请。请让邀请您的人向您发送新的邀请。</p>
+    user_exists: "不需要邀请 <b>%{email}</b>，他们已经拥有帐户！"
     invite_exists: "您已经邀请 <b>%{email}</b>。"
     invalid_email: "%{email} 不是有效的电子邮件地址。"
     rate_limit:
@@ -235,11 +234,11 @@ zh_CN:
     disabled_errors:
       discourse_connect_enabled: "邀请已被禁用，因为 DiscourseConnect 已启用。"
       invalid_access: "您没有权限查看请求的资源。"
-    requires_groups: "邀请未保存，因为指定的话题无法访问。需要添加以下群组之一： %{groups}。"
-    domain_not_allowed: "您的电子邮件域名不符合邀请条件。"
+    requires_groups: "未保存邀请，因为指定的话题不可访问。添加以下群组之一：%{groups}。"
+    domain_not_allowed: "您的电子邮件不能用于兑换此邀请。"
     max_redemptions_allowed_one: "对于电子邮件邀请，应为 1。"
     redemption_count_less_than_max: "应小于 %{max_redemptions_allowed}。"
-    email_xor_domain: "电子邮件和域名字段不允许同时出现"
+    email_xor_domain: "电子邮件和网域字段不允许同时出现"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     max_rows: "前 %{max_bulk_invites} 个邀请已发出。尝试将文件拆分成更小的部分。"
@@ -249,7 +248,7 @@ zh_CN:
     max_redemptions_limit: "应介于 2 和 %{max_limit} 之间。"
   topic_invite:
     failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入此话题：%{group_names}。"
-    not_pm: "你只能邀请接收私人消息。"
+    not_pm: "您只能邀请加入私信。"
     user_exists: "抱歉，该用户已被邀请。您一次只可以邀请一个用户加入话题。"
     muted_topic: "抱歉，该用户已将此话题设为免打扰。"
     receiver_does_not_allow_pm: "抱歉，该用户不允许您向他们发送私信。"
@@ -326,8 +325,8 @@ zh_CN:
   links_require_trust: "抱歉，您的帖子中不能包含链接。"
   too_many_links:
     other: "抱歉，新用户在一个帖子中仅能发布 %{count} 个链接。"
-  contains_blocked_word: "抱歉，您不能使用“%{word}”这个词；这是不被允许的内容。"
-  contains_blocked_words: "抱歉，您不能发帖。不允许的内容： %{words}。"
+  contains_blocked_word: "抱歉，您不能使用 '%{word}'；这是不被允许的。"
+  contains_blocked_words: "抱歉，您不能发帖。不允许的字词：%{words}。"
   spamming_host: "抱歉，您不能发布指向该主机的链接。"
   user_is_suspended: "被封禁的用户不允许发帖。"
   topic_not_found: "出了点问题。或许此话题在您查看时已被关闭或删除。"
@@ -380,14 +379,14 @@ zh_CN:
   bookmarks:
     errors:
       already_bookmarked_post: "您不能将同一个帖子加入书签两次。"
-      already_bookmarked: "您不能将同一个 %{type} 添加书签两次。"
+      already_bookmarked: "您不能将同一个%{type}加入书签两次。"
       too_many: "抱歉，您不能添加超过 %{limit} 个书签，请访问 <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> 移除一些书签。"
       cannot_set_past_reminder: "您不能设置时间为过去的书签提醒。"
       cannot_set_reminder_in_distant_future: "您不能设置时间距离现在超过 10 年以后的书签提醒。"
       time_must_be_provided: "必须为所有提醒设置时间"
-      for_topic_must_use_first_post: "只能使用最早发布的内容来为主题创建书签"
-      bookmarkable_id_type_required: "添加书签的名称和类型是必须的。"
-      invalid_bookmarkable: "无法将 %{type} 加入书签。"
+      for_topic_must_use_first_post: "您只能使用第一个帖子为话题添加书签。"
+      bookmarkable_id_type_required: "需要加入书签的记录的名称和类型。"
+      invalid_bookmarkable: "无法将%{type}加入书签。"
     reminders:
       at_desktop: "下次我使用桌面设备时"
       later_today: "今天晚些时候"
@@ -472,7 +471,7 @@ zh_CN:
 
       这样，每个人都可以更轻松地阅读具有少量嵌套回复的话题，而不是查看大量的个别回复。
     dominating_topic: 您在这里发布了超过 %{percent}% 的回复，想听听其他人的发言吗？
-    get_a_room: 您已回复@%{reply_username} %{count} 次，您知道您可以向他们发送私信吗？
+    get_a_room: 您已回复 @%{reply_username} %{count} 次，您知道您可以向他们发送个人消息吗？
     too_many_replies: |
       ### 您已达到此话题的回复上限
 
@@ -568,7 +567,7 @@ zh_CN:
               too_many: "该操作的关注词过多"
             base:
               invalid_url: "替换 URL 无效"
-              invalid_tag_list: "替换标签名单无效"
+              invalid_tag_list: "替换标签列表无效"
         sidebar_section_link:
           attributes:
             linkable_type:
@@ -576,13 +575,13 @@ zh_CN:
       <<: *errors
   uncategorized_category_name: "未分类"
   general_category_name: "常规"
-  general_category_description: "在这里创建不属于任何其他现有类别的主题。"
+  general_category_description: "在此处创建不属于任何其他现有类别的话题。"
   meta_category_name: "站点反馈"
   meta_category_description: "有关此站点、其组织、运作方式以及如何改进的讨论。"
   staff_category_name: "管理人员"
   staff_category_description: "适用于管理人员讨论的不公开类别。话题仅对管理员和版主可见。"
   discourse_welcome_topic:
-    title: "欢迎来到 Discourse"
+    title: "欢迎来到我们的社区！"
     body: |2
 
       此置顶话题的第一段是所有新访客在首页看到的欢迎消息。这很重要！
@@ -614,7 +613,7 @@ zh_CN:
       permission_conflict: "任何被允许访问子类别的组也必须被允许访问父类别。以下群组可以访问子类别之一，但无法访问父类别：%{group_names}。"
       disallowed_topic_tags: "此话题包含此类别不允许的标签：%{tags}"
       disallowed_tags_generic: "此话题包含禁止的标签。"
-      slug_contains_non_ascii_chars: "包含非ASCII字符"
+      slug_contains_non_ascii_chars: "包含非 ASCII 字符"
     cannot_delete:
       uncategorized: "此类别比较特殊。它旨在作为没有类别的话题的存放区域；不能删除。"
       has_subcategories: "无法删除此类别，因为它有子类别。"
@@ -629,17 +628,17 @@ zh_CN:
   post:
     image_placeholder:
       broken: "此图片已损坏"
-      blocked_hotlinked_title: "图片托管主机在另一个站点。点击在新标签页中打开。"
+      blocked_hotlinked_title: "图片托管在另一个站点上。点击以在新标签页中打开。"
       blocked_hotlinked: "外部图片"
     media_placeholder:
-      blocked_hotlinked_title: "媒体托管主机在另一个站点上。点击以在新标签页中打开。"
+      blocked_hotlinked_title: "媒体托管在另一个站点上。点击以在新标签页中打开。"
       blocked_hotlinked: "外部媒体"
-    hidden_bidi_character: "双向字符可以更改文本渲染的顺序。这可以用来掩盖恶意代码。"
+    hidden_bidi_character: "双向字符可以更改文本的呈现顺序。这可以用来掩盖恶意代码。"
     has_likes:
       other: "%{count} 个赞"
     cannot_permanently_delete:
-      many_posts: "您不能永久删除此主题，因为还有其他帖子。"
-      wait_or_different_admin: "您必须等待 %{time_left} 才能永久删除此帖子，否则必须由其他管理员执行此操作。"
+      many_posts: "您不能永久删除此话题，因为还有其他帖子。"
+      wait_or_different_admin: "您必须等待 %{time_left}才能永久删除此帖子，否则必须由其他管理员执行此操作。"
   rate_limiter:
     slow_down: "您执行此操作的次数过多，请稍后再试。"
     too_many_requests: "您执行此操作的次数过多。请等待 %{time_left}后再试。"
@@ -652,7 +651,7 @@ zh_CN:
       public_group_membership: "您加入/离开群组的频率太快了。请等待 %{time_left}后再试。"
       topics_per_day: "您已经达到每天允许的最大新话题数。您可以在 %{time_left}后创建更多新话题。"
       pms_per_day: "您已经达到每天允许的最大消息数。您可以在 %{time_left}后创建更多新消息。"
-      create_like: "哇哦！你一直在分享很多爱！今天你已经达到了每日点赞上限，不过，随着你的信任等级提升，你将获得更高的每日点赞上限。你可以在 %{time_left} 后再次点赞。"
+      create_like: "哇！您一直在分享很多爱！今天您已经达到 24 小时点赞上限，不过，随着您的信任级别提升，您将获得更高的每日点赞上限。您可以在 %{time_left}后再次点赞。"
       create_bookmark: "您已经达到每日书签的最大数量。您可以在 %{time_left}后创建更多书签。"
       edit_post: "您已经达到每日编辑的最大数量。您可以在 %{time_left}后提交更多编辑。"
       live_post_counts: "您请求实时帖子数量的频率太快了。请等待 %{time_left}后再试。"
@@ -840,7 +839,7 @@ zh_CN:
     pm_title: "正在进行的话题的备份草稿"
     pm_body: "包含备份草稿的话题"
   user_activity:
-    no_log_search_queries: "搜索日志查询当前已禁用（管理员可以在站点设置中启用它们）。"
+    no_log_search_queries: "搜索日志查询当前已被禁用（管理员可以在站点设置中启用它们）。"
   email_settings:
     pop3_authentication_error: "提供的 POP3 凭据存在问题，请检查用户名和密码并重试。"
     imap_authentication_error: "提供的 IMAP 凭据存在问题，请检查用户名和密码并重试。"
@@ -1281,26 +1280,26 @@ zh_CN:
         mutes_count: 被设为免打扰的次数
       description: "被许多其他用户设为免打扰和/或忽略的用户。"
     top_users_by_likes_received:
-      title: "收到最多喜欢的用户"
+      title: "获赞最多的用户"
       labels:
         user: 用户
         qtt_like: 获赞
-      description: "获得最多赞的前 10 名用户。"
+      description: "获赞最多的前 10 名用户。"
     top_users_by_likes_received_from_inferior_trust_level:
-      title: "收到最多来自低信任级别用户喜欢的用户"
+      title: "从信任级别较低的用户那里获赞最多的用户"
       labels:
         user: 用户
         trust_level: 信任级别
         qtt_like: 获赞
-      description: "从低等级用户收到喜欢最多的10个高级用户"
+      description: "被信任级别更低的用户赞的更高信任级别的前 10 名用户。"
     top_users_by_likes_received_from_a_variety_of_people:
-      title: "从各种用户收到最多喜欢的用户"
+      title: "从各种用户收到赞最多的用户"
       labels:
         user: 用户
         qtt_like: 获赞
-      description: "获得广泛喜欢的前10名用户。"
+      description: "从各种用户收到赞最多的前 10 名用户。"
   dashboard:
-    group_email_credentials_warning: '群组的电子邮件凭证有问题 <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>。在此问题解决之前，不会从群组收件箱发送电子邮件。 %{error}'
+    group_email_credentials_warning: '群组 <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> 的电子邮件凭证有问题。在此问题解决之前，不会从群组收件箱发送电子邮件。%{error}'
     rails_env_warning: "您的服务器正在以%{env}模式运行。"
     host_names_warning: "您的 config/database.yml 文件使用的是默认的 localhost 主机名。请更新为您的站点主机名。"
     sidekiq_warning: 'Sidekiq 未运行。许多任务，例如发送电子邮件，是通过 Sidekiq 异步执行的。请确保至少运行一个 Sidekiq进程。<a href="https://github.com/mperham/sidekiq" target="_blank">在此处了解 Sidekiq</a>。'
@@ -1327,8 +1326,8 @@ zh_CN:
     unreachable_themes: "我们无法检查以下主题的更新："
     watched_word_regexp_error: "'%{action}' 关注词的正则表达式无效。请检查您的<a href='%{base_path}/admin/customize/watched_words'>关注词设置</a>，或禁用“关注词正则表达式”站点设置。"
   site_settings:
-    allow_bulk_invite: "允许通过上传CSV文件进行批量邀请"
-    disabled: "已"
+    allow_bulk_invite: "允许通过上传 CSV 文件批量邀请"
+    disabled: "已禁用"
     display_local_time_in_user_card: "打开用户卡片时，根据用户的时区显示当地时间。"
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632; 的字词"
     delete_old_hidden_posts: "自动删除被隐藏超过 30 天的帖子。"
@@ -1348,8 +1347,8 @@ zh_CN:
     min_personal_message_title_length: "消息允许的最小标题长度（以字符为单位）"
     max_emojis_in_title: "话题标题中允许的最大表情数量"
     min_search_term_length: "最小有效搜索词长度（以字符为单位）"
-    search_tokenize_chinese: "即使在非中文网站上也强制搜索以将中文标记化"
-    search_tokenize_japanese: "即使在非日文网站上也强制搜索以将日文标记化"
+    search_tokenize_chinese: "即使在非中文站点上也强制搜索将中文词例化"
+    search_tokenize_japanese: "即使在非日语站点上也强制搜索将日语词例化"
     search_prefer_recent_posts: "如果搜索大型论坛的速度很慢，此选项会首先尝试索引最近的帖子"
     search_recent_posts_size: "在索引中保留多少个最近的帖子"
     log_search_queries: "记录用户执行的搜索查询"
@@ -1369,11 +1368,11 @@ zh_CN:
     contact_email: "此站点主要负责人的电子邮件地址。用于重要通知，也显示在 <a href='%{base_path}/about' target='_blank'>/about</a> 页面上用于紧急事项。"
     contact_url: "此站点的联系 URL。显示在 <a href='%{base_path}/about' target='_blank'>/about</a> 页面上以应对紧急事项。"
     crawl_images: "从远程 URL 检索图片以插入正确的宽度和高度尺寸。"
-    download_remote_images_to_local: "通过下载将远程(hotlinked)图像并转换为本地图像；即使将来从远程站点删除图像，这也能保留内容。"
+    download_remote_images_to_local: "通过下载将远程（热链接）图片转换为本地图片；即使图片将来从远程站点移除，这也会保留内容。"
     download_remote_images_threshold: "将远程图片下载到本地所需的最小磁盘空间（百分比）"
     disabled_image_download_domains: "永远不会从这些网域下载远程图片。以 | 分隔的列表。"
-    block_hotlinked_media: "防止用户在他们的帖子中引入远程(hotlinked)媒体。未通过 'download_remote_images_to_local' 下载的远程媒体将被替换成一个占位符链接。"
-    block_hotlinked_media_exceptions: "不受 block_hotlinked_media 设置影响的基本 URL 列表。包括协议(例如：https://example.com)。"
+    block_hotlinked_media: "阻止用户在他们的帖子中引入远程（热链接）媒体。未通过 'download_remote_images_to_local' 下载的远程媒体将被替换为占位符链接。"
+    block_hotlinked_media_exceptions: "不受 block_hotlinked_media 设置影响的基础 URL 列表。包括协议（例如，https://example.com）。"
     editing_grace_period: "发帖后 (n) 秒内，编辑不会在帖子历史记录中创建新版本。"
     editing_grace_period_max_diff: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订（信任级别 0 和 1）"
     editing_grace_period_max_diff_high_trust: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订（信任级别 2 及更高）"
@@ -1382,7 +1381,7 @@ zh_CN:
     tl2_post_edit_time_limit: "信任级别 2 及更高的作者可以在发帖后的 (n) 分钟内编辑他们的帖子。设置为 0 表示永远可以编辑。"
     edit_history_visible_to_public: "允许所有人查看被编辑过的帖子的先前版本。禁用时，只有管理人员可以查看。"
     delete_removed_posts_after: "被作者移除的帖子将在 (n) 小时后自动删除。如果设置为 0，帖子将被立即删除。"
-    notify_users_after_responses_deleted_on_flagged_post: "当帖子被标记并被删除时，所有回复帖子并且回复被删除的用户都会收到通知。"
+    notify_users_after_responses_deleted_on_flagged_post: "当帖子由于被举报而遭到移除时，所有回复帖子并且回复被移除的用户都会收到通知。"
     max_image_width: "帖子中图片的最大缩略图宽度"
     max_image_height: "帖子中图片的最大缩略图高度"
     responsive_post_image_sizes: "调整灯箱预览图片的大小以允许以下像素比率的高 DPI 屏幕。移除所有值将禁用自适应图片。"
@@ -1395,8 +1394,8 @@ zh_CN:
     show_pinned_excerpt_mobile: "在移动视图中显示置顶话题的摘录。"
     show_pinned_excerpt_desktop: "在桌面视图中显示置顶话题的摘录。"
     post_onebox_maxlength: "Onebox Discourse 帖子的最大长度（以字符为单位）。"
-    blocked_onebox_domains: "一个永远不会被 onebox 的域名列表，例如：wikipedia.org\n(通配符 * ? 不支持)"
-    block_onebox_on_redirect: "阻止重定向 URL 的 Onebox。"
+    blocked_onebox_domains: "一个永远不会被归类的域名列表，例如：wikipedia.org（不支持通配符*？）"
+    block_onebox_on_redirect: "阻止重定向 URL 的归类。"
     allowed_inline_onebox_domains: "如果在没有标题的情况下链接，将以微型形式进行 Onebox 处理的网域列表"
     enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_allowlist 站点设置并在所有网域上允许内联 Onebox。"
     force_custom_user_agent_hosts: "对所有请求使用自定义 Onebox 用户代理的主机。（对于限制用户代理访问的主机特别有用）。"
@@ -1415,22 +1414,22 @@ zh_CN:
     favicon: "您的站点的网站图标，请参阅 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://zh.wikipedia.org/wiki/Favicon</a>。如果要正确地通过 CDN 分发，它必须是 png 图片。将调整为 32x32。如果留空，将使用 large_icon。"
     apple_touch_icon: "用于 Apple 触控设备的图标。将自动调整为 180x180。如果留空，将使用 large_icon。"
     opengraph_image: "默认 OpenGraph 图片，当页面没有其他合适的图片时使用。如果留空，将使用 large_icon。"
-    twitter_summary_large_image: "Twitter 卡片“摘要大图” (宽度至少应为 280，高度至少应为 150，不能为 .svg)。如果留空，则使用 opengraph_image 生成常规卡片元数据，只要它不是 .svg"
+    twitter_summary_large_image: "Twitter 卡片 'summary large image'（宽度至少应为 280，高度至少为 150，不能为 .svg）。如果留空，则使用 opengraph_image（前提是也不能为 .svg）生成常规卡片元数据。"
     notification_email: "发送所有重要系统电子邮件时使用的 from: 电子邮件地址。此处指定的网域必须正确设置 SPF、DKIM 和反向 PTR 记录才能收到电子邮件。"
     email_custom_headers: "以 | 分隔的自定义电子邮件标头列表。"
     email_subject: "标准电子邮件的可自定义主题格式。请参阅 <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "向用户提供有关他们无法访问特定话题的更多详细信息。注意：这不太安全，因为用户会知道 URL 是否链接到有效话题。"
     enforce_second_factor: "强制用户启用双重身份验证。选择“所有”可以强制所有用户。选择“管理人员”仅强制管理人员。"
     force_https: "强制您的站点仅使用 HTTPS。警告：在您验证 HTTPS 已完全设置并在任何地方都可以正常工作之前，请勿启用此功能！您是否检查过您的 CDN、所有社交登录以及任何外部徽标/依赖项，以确保它们都与 HTTPS 兼容？"
-    same_site_cookies: "使用相同的站点 cookie，它们消除了支持的浏览器（宽松或严格）上的所有跨站点请求伪造载体。警告：严格仅适用于强制登录并使用外部身份验证方法的站点。"
+    same_site_cookies: "使用相同的站点 Cookie，它们在支持的浏览器上消除了所有跨站点请求伪造向量（宽松或严格）。警告：“严格”仅适用于强制登录并使用外部身份验证方法的站点。"
     summary_score_threshold: "将帖子包含在“总结此话题”中所需的最低分数"
     summary_posts_required: "启用“总结此话题”之前话题中的最少帖子数。对此设置的更改将在一周内追溯应用。"
     summary_likes_required: "启用“总结此话题”之前话题中的最少赞数。对此设置的更改将在一周内追溯应用。"
     summary_percent_filter: "当用户点击“总结此话题”时，显示前百分之几的帖子"
     summary_max_results: "“总结此话题”返回的最大帖子数量"
-    summary_timeline_button: "在时间线中显示“总结”按钮"
-    enable_personal_messages: "已弃用，请改用“启用个人消息的群组”设置。允许信任级别 1(可通过最小信任配置发送消息)用户创建消息和回复消息。请注意，员工无论如何都可以随时发送消息。"
-    personal_message_enabled_groups: "允许这些组内的用户创建消息和回复消息。信任级别组包括该数字以上的所有信任级别，例如，选择信任级别_1也允许信任级别_2、3、4的用户发送PM。请注意，无论怎样，员工都可以发送消息。"
+    summary_timeline_button: "在时间线中显示“摘要”按钮"
+    enable_personal_messages: "已弃用，请改用 'personal message enabled groups' 设置。允许信任级别 1（可通过最小信任级别配置来发送消息）用户创建消息和回复消息。请注意，管理人员不受限制。"
+    personal_message_enabled_groups: "允许这些组中的用户创建消息和回复消息。信任级别组包括高于该数字的所有信任级别，例如选择 trust_level_1 还允许 trust_level_2、3、4 用户发送 PM。请注意，管理人员不受限制。"
     enable_system_message_replies: "即使禁用了个人消息，也允许用户回复系统消息"
     enable_chunked_encoding: "启用服务器的分块编码响应。此功能适用于大多数设置，但某些代理可能会缓冲，导致响应延迟"
     long_polling_base_url: "用于长轮询的基础 URL（当 CDN 提供动态内容时，请务必将其设置为来源拉取）例如：http://origin.site.com"
@@ -1449,9 +1448,9 @@ zh_CN:
     tl2_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl2（成员）每天的编辑限值"
     tl3_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl3（常规）每天的编辑限值"
     tl4_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl4（领导者）每天的编辑限值"
-    tl2_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl2(成员)每天的标记限值"
-    tl3_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl3 (活跃用户)每天的标记限值"
-    tl4_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl4 (领导者)每天的标记限值"
+    tl2_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl2（成员）每天的举报限值"
+    tl3_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl3（常规）每天的举报限值"
+    tl4_additional_flags_per_day_multiplier: "通过乘以此数字来提升 tl4（领导者）每天的举报限值"
     num_users_to_silence_new_user: "如果新用户的帖子收到来自此数量的不同用户的 num_spam_flags_to_silence_new_user spam 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
     num_tl3_flags_to_silence_new_user: "如果新用户的帖子收到来自 num_tl3_users_to_silence_new_user 个信任级别为 3 的不同用户的此数量的举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
     num_tl3_users_to_silence_new_user: "如果新用户的帖子收到此数量的来自信任级别为 3 的不同用户的 num_tl3_flags_to_silence_new_user 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
@@ -1486,7 +1485,7 @@ zh_CN:
     allowed_iframes: "Discourse 可以安全地在帖子中允许的 iframe src 网域前缀列表"
     allowed_crawler_user_agents: "应被允许访问站点的网络抓取工具的用户代理。警告！设置此项将禁止此处未列出的所有抓取工具！"
     blocked_crawler_user_agents: "用户代理字符串中唯一不区分大小写的字词，用于标识不应被允许访问站点的网抓取工具。如果定义了许可名单，则不适用。"
-    slow_down_crawler_user_agents: '网络爬虫的 User agents 应该按照“减慢爬虫速率”设置中的配置进行速率限制。每个值的长度必须至少为 3 个字符。'
+    slow_down_crawler_user_agents: '网络爬虫的用户代理应该按照“减慢爬虫速率”设置中的配置进行速率限制。每个值的长度必须至少为 3 个字符。'
     slow_down_crawler_rate: "如果指定了 slow_down_crawler_user_agents，则此速率将应用于所有抓取工具（请求之间的延迟秒数）"
     content_security_policy: "启用内容安全策略"
     content_security_policy_report_only: "启用仅内容安全策略报告"
@@ -1498,7 +1497,7 @@ zh_CN:
     post_menu: "确定帖子菜单中显示的条目以及显示顺序。示例：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "除非点击扩展省略号，否则在帖子菜单中默认隐藏的菜单项。"
     share_links: "确定分享对话框中显示的条目以及显示顺序。"
-    allow_username_in_share_links: "允许在分享链接中包含用户名。这对基于独特访客的徽章奖励很有用。"
+    allow_username_in_share_links: "允许用户名包含在分享链接中。这对于根据唯一身份访客奖励徽章很有用。"
     site_contact_username: "用于发送所有自动消息的有效管理人员用户名。如果留空，将使用默认系统帐户。"
     site_contact_group_name: "要被邀请到所有自动消息的有效群组名称。"
     send_welcome_message: "向所有新用户发送带有快速入门指南的欢迎消息。"
@@ -1506,7 +1505,7 @@ zh_CN:
     send_tl2_promotion_message: "向新的信任级别 2 用户发送有关升级的消息。"
     suppress_reply_directly_below: "当帖子下方只有一个回复时，不在帖子上显示可展开的回复计数。"
     suppress_reply_directly_above: "当帖子上方只有一个回复时，不在帖子上显示可展开的“回复给”字段。"
-    remove_full_quote: "如果(a)它出现在一个帖子的开头，(b)它是整个帖子的，以及(c)它来自紧接着的前一个帖子，则自动删除引语。详见 <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>删除直接回复中的完整引语</a>"
+    remove_full_quote: "如果 (a) 引号出现在帖子的开头，(b) 是整个帖子的引号，以及 (c) 来自紧接帖子的引号，则自动删除引号。有关详细信息，请参阅<a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>从直接回复中移除完整引号</a>"
     suppress_reply_when_quoting: "发布引用回复时，不在帖子上显示可展开的“回复给”字段。"
     max_reply_history: "展开“回复给”字段时要展开的最大回复数"
     topics_per_period_in_top_summary: "默认热门话题摘要中显示的热门话题数。"
@@ -1521,13 +1520,13 @@ zh_CN:
     enable_badges: "启用徽章系统"
     max_favorite_badges: "用户可以选择的最大徽章数"
     enable_whispers: "允许管理人员在话题中进行不公开交流。"
-    whispers_allowed_groups: "允许指定组的成员在话题内进行私人交流。"
+    whispers_allowed_groups: "允许指定群组的成员在话题内进行不公开交流。"
     allow_index_in_robots_txt: "在 robots.txt 中指定此站点允许被网络搜索引擎索引。在特殊情况下，您可以永久<a href='%{base_path}/admin/customize/robots'>替换 robots.txt</a>。"
     blocked_email_domains: "不允许用户用于注册帐户的以 | 分隔的电子邮件网域列表。示例：mailinator.com|trashmail.net"
     allowed_email_domains: "用户注册帐户时必须使用的以 | 分隔的电子邮件网域列表。警告：不允许使用除所列网域以外的电子邮件网域的用户！"
-    normalize_emails: "检查规范化的电子邮件是否是唯一的。正常化的电子邮件删除了用户名中的所有点以及 + 和 @ 符号之间的所有内容。"
+    normalize_emails: "检查规范化电子邮件是否唯一。规范化电子邮件移除了用户名中的所有点以及 + 和 @ 符号之间的所有内容。"
     auto_approve_email_domains: "使用此网域列表中电子邮件地址的用户将自动获得批准。"
-    hide_email_address_taken: "在注册或忘记密码的过程中，不要告知用户有一个给定的电子邮件地址的账户存在。对于 \"忘记密码 \"的请求，需要完整的电子邮件。"
+    hide_email_address_taken: "在注册或忘记密码的过程中，不要告知用户存在一个使用给定电子邮件地址的帐户。对于“忘记密码”请求，需要完整的电子邮件。"
     log_out_strict: "退出时，退出用户在所有设备上的会话"
     version_checks: "Ping Discourse Hub 以获取版本更新并在 <a href='%{base_path}/admin' target='_blank'>/admin</a> 信息中心上显示新版本消息"
     new_version_emails: "当有新版本的 Discourse 时，向 contact_email 地址发送一封电子邮件。"
@@ -1572,7 +1571,9 @@ zh_CN:
     google_oauth2_client_secret: "您的 Google 应用的客户端密钥。"
     google_oauth2_prompt: "可选的以空格分隔的字符串值列表，指定授权服务器是否提示用户进行重新身份验证和同意。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'> https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> 了解可能的值。"
     google_oauth2_hd: "登录将受限的可选 Google Apps 托管网域。请参阅 <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> 以了解详情。"
-    google_oauth2_hd_groups: "(实验性的)在认证时检索用户在托管域上的 Google groups。检索到的 Google groups 可以用来自动授予 Discourse 群组成员资格(见群组设置)。"
+    google_oauth2_hd_groups: "（实验性）在进行身份验证时检索用户在托管网域上的 Google 群组。检索到的 Google 群组可用于自动授予 Discourse 群组成员资格。有关更多信息，请参阅 https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "属于 Google Workspace 管理员帐号的电子邮件地址。将与服务帐户凭据一起使用以获取群组信息。"
+    google_oauth2_hd_groups_service_account_json: "服务帐户的 JSON 格式密钥信息。将用于获取群组信息。"
     enable_twitter_logins: "启用 Twitter 身份验证，需要 twitter_consumer_key 和 twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395' target='_blank'>为 Discourse 配置 Twitter 登录（和丰富的嵌入）</a>。"
     twitter_consumer_key: "Twitter 身份验证的使用者密钥，在 <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> 中注册"
     twitter_consumer_secret: "Twitter 身份验证的使用者密钥代码，在 <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> 中注册"
@@ -1608,8 +1609,8 @@ zh_CN:
     top_topics_formula_first_post_likes_multiplier: "热门话题中第一个帖子点赞因子 (n) 值的公式：`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: "热门话题中每个帖子的最少点赞因子 (n) 值的公式：`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     enable_safe_mode: "允许用户进入安全模式以调试插件。"
-    enable_experimental_sidebar_hamburger: "允许启用实验性侧边栏和用户汉堡下拉菜单。"
-    enable_sidebar: "启用侧边栏（实验性）"
+    enable_experimental_sidebar_hamburger: "允许启用实验性边栏和用户汉堡下拉菜单。"
+    enable_sidebar: "启用实验性边栏。"
     rate_limit_create_topic: "创建话题后，用户必须等待 (n) 秒才能创建另一个话题。"
     rate_limit_create_post: "发帖后，用户必须等待 (n) 秒才能创建另一个帖子。"
     rate_limit_new_user_create_topic: "创建话题后，新用户必须等待 (n) 秒才能创建另一个话题。"
@@ -1622,7 +1623,7 @@ zh_CN:
     max_personal_messages_per_day: "用户每天可以创建的新个人消息话题的最大数量。"
     max_invites_per_day: "用户每天可以发送的最大邀请数。"
     max_topic_invitations_per_day: "用户每天可以发送的最大话题邀请数。"
-    max_topic_invitations_per_minute: "用户每分钟可发送的最大话题邀请数。"
+    max_topic_invitations_per_minute: "用户每分钟可以发送的最大话题邀请数。"
     max_logins_per_ip_per_hour: "每个 IP 地址每小时允许的最大登录次数"
     max_logins_per_ip_per_minute: "每个 IP 地址每分钟允许的最大登录次数"
     max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。设置为 0 将禁用帖子删除。"
@@ -1653,8 +1654,8 @@ zh_CN:
     external_emoji_url: "表情符号图片的外部服务的 URL。留空将禁用。"
     use_site_small_logo_as_system_avatar: "使用站点的小徽标代替系统用户的头像。要求存在徽标。"
     restrict_letter_avatar_colors: "用于字母头像背景的 6 位十六进制颜色值列表。"
-    enable_listing_suspended_users_on_search: "让普通用户能够找到被暂停的用户。"
-    selectable_avatars_mode: "允许用户从 selectable_avatars 列表中选择一个头像，并将自定义头像上传限制在选定的信任级别。"
+    enable_listing_suspended_users_on_search: "使普通用户能够找到被封禁的用户。"
+    selectable_avatars_mode: "允许用户从 selectable_avatars 列表中选择头像，并将自定义头像上传限制在所选信任级别。"
     selectable_avatars: "用户可以选择的头像列表。"
     allow_all_attachments_for_group_messages: "允许群组消息的所有电子邮件附件。"
     png_to_jpg_quality: "转换后的 JPG 文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
@@ -1701,7 +1702,7 @@ zh_CN:
     min_trust_to_edit_wiki_post: "编辑标记为 Wiki 的帖子所需的最低信任级别。"
     min_trust_to_edit_post: "编辑帖子所需的最低信任级别。"
     min_trust_to_allow_self_wiki: "制作用户自己的帖子 Wiki 所需的最低信任级别。"
-    min_trust_to_send_messages: "已弃用，改用 “启用个人消息的群组” 设置。创建新的个人消息所需的最低信任级别。"
+    min_trust_to_send_messages: "已弃用，请改用 'personal message enabled groups' 设置。创建新的个人消息所需的最低信任级别。"
     min_trust_to_send_email_messages: "通过电子邮件发送个人消息所需的最低信任级别。"
     min_trust_to_flag_posts: "举报帖子所需的最低信任级别"
     min_trust_to_post_links: "在帖子中包含链接所需的最低信任级别"
@@ -1719,8 +1720,8 @@ zh_CN:
     max_mentions_per_post: "任何人可以在帖子中使用的提及通知的最大数量。"
     max_users_notified_per_group_mention: "当群组被提及时可能会收到通知的最大用户数（超过阈值后将不发送通知）"
     enable_mentions: "允许用户提及其他用户。"
-    here_mention: "用于 @ 提及的名称，允许特权用户通知参与该主题的最多 'max_here_mentioned' 人。必须不是一个现有的用户名。"
-    max_here_mentioned: "@here 提到的最大人数."
+    here_mention: "用于 @ 提及的名称，允许特权用户通知参与话题的 'max_here_mentioned' 人。必须不是一个现有的用户名。"
+    max_here_mentioned: "@here 提及的最大人数。"
     min_trust_level_for_here_mention: "允许提及 @here 的最低信任级别。"
     create_thumbnails: "创建太大而无法放入帖子的缩略图和灯箱图片。"
     email_time_window_mins: "在发送任何通知电子邮件之前等待 (n) 分钟，让用户有机会编辑和完成他们的帖子。"
@@ -1772,7 +1773,7 @@ zh_CN:
     topic_view_duration_hours: "每个 IP/用户每 N 小时计算一次新话题浏览"
     user_profile_view_duration_hours: "每个 IP/用户每 N 小时计算一次新用户个人资料浏览"
     levenshtein_distance_spammer_emails: "在匹配垃圾信息发布者电子邮件时，仍然允许模糊匹配的字符数差异。"
-    max_new_accounts_per_registration_ip: "如果已经有 (n) 个来自此 IP 的信任级别 0 帐户（并且没有一个是管理人员或者是 TL2 或更高级别），则停止接受来自该 IP 的新注册。"
+    max_new_accounts_per_registration_ip: "如果已经有 (n) 个来自此 IP 的信任级别 0 帐户（并且没有一个是管理人员或者是 TL2 或更高级别），则停止接受来自该 IP 的新注册。设为 0 将禁用限制。"
     min_ban_entries_for_roll_up: "点击“汇总”按钮时，如果至少有 (N) 个条目，将创建一个子网禁止条目"
     max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽电子邮件条目。"
     max_age_unmatched_ips: "在 (N) 天后删除不匹配的已屏蔽 IP 条目。"
@@ -1826,7 +1827,7 @@ zh_CN:
     raw_email_max_length: "应为传入电子邮件存储的字符数。"
     raw_rejected_email_max_length: "应为被拒的传入电子邮件存储的字符数。"
     delete_rejected_email_after_days: "删除超过 (n) 天的被拒电子邮件。"
-    require_change_email_confirmation: "要求非管理人员用户在改变他们的旧电子邮件地址之前确认他们的旧电子邮件地址。不适用于管理人员用户，他们总是需要确认他们的旧电子邮件地址。"
+    require_change_email_confirmation: "要求非管理人员用户在更改之前确认他们的旧电子邮件地址。不适用于管理人员用户，他们始终需要确认他们的旧电子邮件地址。"
     manual_polling_enabled: "使用 API 推送电子邮件以进行电子邮件回复。"
     pop3_polling_enabled: "通过 POP3 轮询以进行电子邮件回复。"
     pop3_polling_ssl: "连接到 POP3 服务器时使用 SSL。（推荐）"
@@ -1905,14 +1906,14 @@ zh_CN:
     enable_mobile_theme: "移动设备使用适合移动设备的主题，并且可以切换到完整站点。如果您想使用完全自适应的自定义样式表，请禁用此选项。"
     dominating_topic_minimum_percent: "在被提醒过度主导某个话题之前，用户必须在某个话题中发布的帖子所占的百分比。"
     disable_avatar_education_message: "禁用更改头像的教育消息。"
-    pm_warn_user_last_seen_months_ago: "在创建新的 PM 时，如果目标接收者超过 n 个月前未看到，则会警告用户。"
+    pm_warn_user_last_seen_months_ago: "在创建新的 PM 时，如果目标接收者已经超过 n 个月前无活动，则警告用户。"
     suppress_uncategorized_badge: "不在话题列表中显示未分类话题的徽章。"
     header_dropdown_category_count: "标题下拉菜单中可以显示的类别数量。"
     permalink_normalizations: "在匹配永久链接之前应用以下正则表达式，例如：/(topic.*)\\?.*/\\1 将从话题路由中去除查询字符串。格式为正则表达式+字符串。使用 \\1 等访问捕获"
     global_notice: "向所有访客显示紧急、突发、不可关闭的全局横幅通知，更改为空将隐藏（允许使用 HTML）。"
     disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑通知。"
-    disable_category_edit_notifications: "禁用话题分类编辑通知"
-    disable_tags_edit_notifications: "禁用话题标签编辑通知"
+    disable_category_edit_notifications: "禁用话题类别编辑通知。"
+    disable_tags_edit_notifications: "禁用话题标签编辑通知。"
     notification_consolidation_threshold: "合并通知前，收到的赞或成员资格请求通知的数量。设置为 0 将禁用。"
     likes_notification_consolidation_window_mins: "以分钟计的持续时间，被赞的通知在达到此阈值后会被合并到单个通知中。可以通过 `SiteSetting.notification_consolidation_threshold` 配置阈值。"
     automatically_unpin_topics: "当用户到达底部时自动取消置顶话题。"
@@ -1932,11 +1933,11 @@ zh_CN:
     display_name_on_posts: "在帖子中显示用户的全名以及他们的用户名。"
     show_time_gap_days: "如果两个帖子间隔此天数，在话题中显示时间间隔。"
     short_progress_text_threshold: "当一个话题的帖子数量超过此数值后，进度条将只显示当前帖子数量。如果更改进度条的宽度，则可能需要更改此值。"
-    default_code_lang: "应用于代码块的默认编程语言语法高亮(auto, nohighlight, ruby, python 等)。这个值也必须存在于 \"高亮语言 \"的站点设置中。"
+    default_code_lang: "应用于代码块的默认编程语言语法突出显示（auto、nohighlight、ruby、python 等）。此值还必须存在于 `highlighted languages` 站点设置中。"
     warn_reviving_old_topic_age: "当有人开始回复上次回复时间超过此天数的话题时，将显示警告。设置为 0 将禁用。"
     autohighlight_all_code: "即使未显式声明语言，也强制向所有预格式化代码块应用代码高亮显示。"
     highlighted_languages: "包括语法高亮显示规则。（警告：包含太多语言可能会影响性能）请参阅：<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> 查看演示"
-    show_copy_button_on_codeblocks: "为代码块添加一个按钮，将块的内容复制到用户的剪贴板上。"
+    show_copy_button_on_codeblocks: "向代码块添加一个按钮，以将块内容复制到用户的剪贴板。"
     embed_any_origin: "允许嵌入任意来源的内容。这对于带有静态 HTML 的移动应用是必需的。"
     embed_topics_list: "支持话题列表的 HTML 嵌入"
     embed_set_canonical_url: "将嵌入话题的规范 URL 设置为嵌入内容的 URL。"
@@ -1953,11 +1954,12 @@ zh_CN:
     delete_merged_stub_topics_after_days: "在自动删除完全合并的存根话题之前等待的天数。设置为 0 将从不删除存根话题。"
     bootstrap_mode_min_users: "禁用引导模式所需的最小用户数（设置为 0 将禁用）"
     prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
-    secure_media: '已弃用：改用 secure_uploads 设置，将在 Discourse 3.0 中删除。'
-    secure_media_allow_embed_images_in_emails: "已弃用：使用 secure_uploads_allow_embed_images_in_emails，将在 Discourse 3.0 中删除。"
-    secure_uploads_allow_embed_images_in_emails: "如果小于 'secure media max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全上传。"
-    secure_media_max_email_embed_image_size_kb: "已弃用：使用 secure_uploads_max_email_embed_image_size_kb，将在 Discourse 3.0 中删除。"
-    secure_uploads_max_email_embed_image_size_kb: "如果启用了 'secure media allow embed in emails' 设置，将被嵌入到电子邮件的安全上传的大小限制；如果不启用，则此设置无效。"
+    secure_media: '已弃用：改用 secure_uploads 设置，将在 Discourse 3.0 中移除。'
+    secure_uploads: '限制对所有上传（图片、视频、音频、文本、pdf、zip 等）的访问。如果启用“需要登录”，则只有登录用户才能访问上传。否则，访问将仅限于私信和不公开类别中的媒体上传。警告：此设置比较复杂，需要深入理解管理操作。请参阅 <a target="_blank" href="https://meta.discourse.org/t/-/140017">Meta 安全上传话题</a>以了解详情。'
+    secure_media_allow_embed_images_in_emails: "已弃用：使用 secure_uploads_allow_embed_images_in_emails，将在 Discourse 3.0 中移除。"
+    secure_uploads_allow_embed_images_in_emails: "如果小于 'secure uploads max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全图片。"
+    secure_media_max_email_embed_image_size_kb: "已弃用：使用 secure_uploads_max_email_embed_image_size_kb，将在 Discourse 3.0 中移除。"
+    secure_uploads_max_email_embed_image_size_kb: "如果启用了 'secure uploads allow embed in emails' 设置，将被嵌入到电子邮件的安全图片的大小限制；如果不启用，则此设置无效。"
     slug_generation_method: "选择一种缩略名生成方法。'encoded' 将生成百分比编码字符串。'none' 将完全禁用缩略名。"
     enable_emoji: "启用表情符号"
     enable_emoji_shortcuts: "常见的笑脸文字（如 :) :p :(）将被转换为表情符号"
@@ -1976,7 +1978,7 @@ zh_CN:
     max_allowed_message_recipients: "消息中允许的最大收件人数。"
     watched_words_regular_expressions: "关注词是正则表达式。"
     enable_diffhtml_preview: "使用 diffHTML 同步预览而不是完全重新呈现的实验性功能"
-    enable_fast_edit: "启用帖文行内选中编辑"
+    enable_fast_edit: "允许对小部分帖子文本进行内联编辑。"
     old_post_notice_days: "帖子通知变旧前的天数"
     new_user_notice_tl: "查看新用户帖子通知所需的最低信任级别。"
     returning_user_notice_tl: "查看回访用户帖子通知所需的最低信任级别。"
@@ -2035,7 +2037,7 @@ zh_CN:
     tags_sort_alphabetically: "按照字母顺序显示标签。默认按流行度显示。"
     tags_listed_by_group: "在<a href='%{base_path}/tags' target='_blank'>标签页面</a>上按标签组列出标签。"
     tag_style: "标签徽章的视觉样式。"
-    pm_tags_allowed_for_groups: "允许所包含的小组成员对任何个人信息进行标记"
+    pm_tags_allowed_for_groups: "允许所包含群组的成员标记任何个人消息"
     min_trust_level_to_tag_topics: "为话题添加标签所需的最低信任级别"
     suppress_overlapping_tags_in_list: "如果标签与话题标题中的字词完全匹配，则不显示标签"
     remove_muted_tags_from_latest: "不在最新话题列表中显示仅使用已被设为免打扰的标签标记的话题。"
@@ -2049,9 +2051,10 @@ zh_CN:
     push_notifications_icon: "出现在通知角的徽章图标。建议使用具有透明度的 96×96 单色 PNG。"
     base_font: "用于站点上大多数文本的基字体。可以通过 `--font-family` CSS 自定义属性替换主题。"
     heading_font: "用于站点上标题的字体。可以通过 `--heading-font-family` CSS 自定义属性替换主题。"
-    enable_sitemap: "为你的网站生成一个网站地图，并将其纳入 robots.txt 文件。"
+    enable_sitemap: "为您的站点生成站点地图并将其包含在 robots.txt 文件中。"
     sitemap_page_size: "每个站点地图页面中包含的 URL 数量。最大 50.000"
-    enable_user_status: "(试验性)允许用户设置自定义状态信息(表情符号+描述)。"
+    enable_user_status: "（实验性）允许用户设置自定义状态消息（表情符号 + 描述）。"
+    enable_onboarding_popups: "（实验性）启用向用户描述关键功能的教育弹出窗口"
     short_title: "短标题将用于用户的主屏幕、启动器或其他空间可能有限的地方。应被限制为 12 个字符。"
     dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
     dashboard_visible_tabs: "选择可见的信息中心标签页。"
@@ -2063,18 +2066,18 @@ zh_CN:
     share_quote_visibility: "确定何时显示引用分享按钮：从不、仅匿名用户或所有用户。"
     create_revision_on_bulk_topic_moves: "当话题被批量移入新类别时，为第一个帖子创建修订。"
     allow_changing_staged_user_tracking: "允许管理员用户更改暂存用户的类别和标签通知偏好设置。"
-    use_email_for_username_and_name_suggestions: "使用电子邮件地址的第一部分作为用户名和名字的建议。请注意，这使得公众更容易猜到完整的用户电子邮件地址(因为很大一部分人共享共同的服务，如`gmail.com')。"
-    use_name_for_username_suggestions: "在建议用户名时使用用户的全名。"
-    suggest_weekends_in_date_pickers: "在日期选择器建议中包括周末(周六和周日) (如果你仅在工作日，周一至周五使用 Discourse，请禁用此选项)。"
-    splash_screen: "在加载站点资源时显示临时负载屏幕"
-    default_sidebar_categories: "选定的类别将默认显示在侧边栏的类别部分。"
-    default_sidebar_tags: "选定的标签将默认显示在侧边栏的标签部分。"
-    enable_new_user_profile_nav_groups: "实验：所选组的用户将显示新的用户资料导航菜单"
+    use_email_for_username_and_name_suggestions: "使用电子邮件地址的第一部分作为用户名和名称建议。请注意，这使公众更容易猜测完整的用户电子邮件地址（因为很大一部分人共享共同的服务，如 `gmail.com`）。"
+    use_name_for_username_suggestions: "建议用户名时使用用户的全名。"
+    suggest_weekends_in_date_pickers: "在日期选择器建议中包括周末（周六和周日）（如果您仅在工作日（周一至周五）使用 Discourse，请禁用此选项）。"
+    splash_screen: "在加载站点资源时显示临时加载屏幕"
+    default_sidebar_categories: "所选类别将默认显示在边栏的“类别”版块下。"
+    default_sidebar_tags: "所选标签将默认显示在边栏的“标签”版块下。"
+    enable_new_user_profile_nav_groups: "实验性：将向所选群组的用户显示新的用户个人资料导航菜单"
     errors:
       invalid_css_color: "颜色无效。输入颜色名称或十六进制值。"
       invalid_email: "无效的电子邮件地址。"
       invalid_username: "没有使用该用户名的用户。"
-      valid_username: "已存在一个使用了该用户名的用户"
+      valid_username: "存在一个使用该用户名的用户。"
       invalid_group: "没有使用该名称的群组。"
       invalid_integer_min_max: "值必须介于 %{min} 和 %{max}之间。"
       invalid_integer_min: "值必须为 %{min} 或更大。"
@@ -2089,7 +2092,7 @@ zh_CN:
       invalid_json: "无效的 JSON。"
       invalid_reply_by_email_address: "值必须包含 '%{reply_key}' 并且与通知电子邮件不同。"
       invalid_alternative_reply_by_email_addresses: "所有值必须包含 '%{reply_key}' 并且与通知电子邮件不同。"
-      invalid_domain_hostname: "不得包含* 或?字符。"
+      invalid_domain_hostname: "不得包括 * 或 ? 字符。"
       pop3_polling_host_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling host'。"
       pop3_polling_username_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling username'。"
       pop3_polling_password_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling password'。"
@@ -2097,9 +2100,9 @@ zh_CN:
       reply_by_email_address_is_empty: "在启用通过电子邮件回复之前，您必须先设置 'reply by email address'。"
       email_polling_disabled: "在启用通过电子邮件回复之前，您必须先启用手动或者 POP3 轮询。"
       user_locale_not_enabled: "在启用此设置之前，您必须先启用 'allow user locale'。"
-      personal_message_enabled_groups_invalid: "你必须为此设置指定至少一个组。如果你不希望除了管理人员以外的任何人发送 PM，请选择管理人员组。"
+      personal_message_enabled_groups_invalid: "您必须为此设置指定至少一个群组。如果您不希望管理人员以外的任何人发送 PM，请选择管理人员群组。"
       invalid_regex: "正则表达式无效或不被允许。"
-      invalid_regex_with_message: "正则表达式 '%{regex}' 有一个错误: %{message}"
+      invalid_regex_with_message: "正则表达式 '%{regex}' 有一个错误：%{message}"
       email_editable_enabled: "在启用此设置之前，您必须先禁用 'email editable'。"
       staged_users_disabled: "在启用此设置之前，您必须先启用 'staged users'。"
       reply_by_email_disabled: "在启用此设置之前，您必须先启用 'reply by email'。"
@@ -2120,12 +2123,12 @@ zh_CN:
         leading_trailing_slash: "正则表达式不得以斜杠作开头或结尾。"
       unicode_usernames_avatars: "内部系统头像不支持 Unicode 用户名。"
       list_value_count: "该列表必须恰好包含 %{count} 个值。"
-      markdown_linkify_tlds: "你不能包含一个'*'的值。"
-      google_oauth2_hd_groups: "在启用此设置之前，您必须先设置 “google oauth2 hd”。"
-      search_tokenize_chinese_enabled: "在启用此设置之前，你必须禁用'search_tokenize_chinese'。"
-      search_tokenize_japanese_enabled: "在启用此设置之前，你必须禁用'search_tokenize_japanese'。"
-      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "如果强制执行 2FA，你不能启用 DiscourseConnect。"
-      delete_rejected_email_after_days: "这个设置不能低于 delete_email_logs_after_days 的设置，也不能大于 %{max}。"
+      markdown_linkify_tlds: "您不能包含 '*' 的值。"
+      google_oauth2_hd_groups: "在启用此设置之前，您必须配置所有 'google oauth2 hd' 设置。"
+      search_tokenize_chinese_enabled: "在启用此设置之前，您必须禁用 'search_tokenize_chinese'。"
+      search_tokenize_japanese_enabled: "在启用此设置之前，您必须禁用 'search_tokenize_japanese'。"
+      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "如果强制执行双重身份验证，则无法启用 DiscourseConnect。"
+      delete_rejected_email_after_days: "此设置不能设置为低于 delete_email_logs_after_days 设置或大于 %{max}"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2235,7 +2238,7 @@ zh_CN:
     reset_not_allowed_from_ip_address: "您无法从该 IP 地址请求密码重置。"
     suspended: "您在 %{date}之前无法登录。"
     suspended_with_reason: "帐户已被封禁至 %{date}：%{reason}"
-    suspended_with_reason_forever: "账户被停用： %{reason}"
+    suspended_with_reason_forever: "帐户被封禁：%{reason}"
     errors: "%{errors}"
     not_available: "不可用，试试 %{suggestion}？"
     something_already_taken: "出了点问题，可能该用户名或电子邮件已被注册，试试点击忘记密码链接。"
@@ -2255,7 +2258,7 @@ zh_CN:
     reserved_username: "不允许使用该用户名。"
     missing_user_field: "您尚未完成所有用户字段"
     auth_complete: "身份验证完成。"
-    click_to_continue: "单击此处继续。"
+    click_to_continue: "点击此处继续。"
     already_logged_in: "抱歉！此邀请面向目前没有帐户的新用户。"
     second_factor_title: "双重身份验证"
     second_factor_description: "请输入应用中的必需身份验证代码："
@@ -2270,13 +2273,13 @@ zh_CN:
       backup_code: "改用备份代码"
   second_factor_auth:
     challenge_not_found: "在当前会话中找不到双重身份验证。"
-    challenge_expired: "自双重身份验证开始以来已经过去了太多时间，它已经失效。请再试一次。"
-    challenge_not_completed: "你还没有完成双重身份验证来执行这个动作。请完成双重身份验证后重试。"
+    challenge_expired: "自双重身份验证开始以来已经过去太多时间，它不再有效。请再试一次。"
+    challenge_not_completed: "您尚未完成执行此操作的双重身份验证。请完成双重身份验证，然后重试。"
     actions:
       grant_admin:
-        description: "对于额外的安全措施，你需要先确认双重身份验证，然后才能授予 %{username} 管理员访问权限。"
+        description: "对于额外的安全措施，您需要在 %{username} 被授予管理员访问权限之前确认您的双重身份验证。"
       discourse_connect_provider:
-        description: "%{hostname} 已要求确认你的 2FA。一旦确认了你的 2FA，你就会被重定向到该网站。"
+        description: "%{hostname} 已要求您确认您的双重身份验证。确认双重身份验证后，您将被重定向回该站点。"
   admin:
     email:
       sent_test: "已发送！"
@@ -2285,7 +2288,7 @@ zh_CN:
         updating_username: "正在更新用户名…"
         changing_post_ownership: "正在更改帖子所有权…"
         merging_given_daily_likes: "正在合并每日赞…"
-        merging_post_timings: "正在合并帖子时间…"
+        merging_post_timings: "正在合并帖子时间数据…"
         merging_user_visits: "正在合并用户访问…"
         updating_site_settings: "正在更新站点设置…"
         updating_user_stats: "正在更新用户统计信息…"
@@ -2444,20 +2447,20 @@ zh_CN:
     title: "测试邮件"
     subject_template: "[%{email_prefix}] 电子邮件能否递送成功测试"
     text_body_template: |
-      这是一封测试邮件，来自
+      这是一封测试电子邮件，来自
 
       [**%{base_url}**][0]
 
-      我们希望你能顺利收到这封测试邮件。
+      我们希望您能顺利收到这封测试电子邮件。
 
-      下面是一个[验证电子邮件发送配置的方便检查表][1]。
+      下面是[验证电子邮件递送配置的方便核对清单][1]。
 
-      祝你好运，
+      祝您好运，
 
-      你在 [Discourse]的朋友(https://www.discourse.org)
+      您在 [Discourse](https://www.discourse.org) 的朋友
 
-      [0]: %{base_url}
-      [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839
+      [0]：%{base_url}
+      [1]：https://meta.discourse.org/t/email-delivery-configuration-checklist/209839
   new_version_mailer:
     title: "新版本邮件"
     subject_template: "[%{email_prefix}] 新 Discourse 版本，有可用更新"
@@ -2496,10 +2499,10 @@ zh_CN:
     spam: "您的帖子被举报为**垃圾信息**：社区认为它是广告，像是在过度地推广着什么，而不是预期中与话题有关的内容。"
     notify_moderators: "您的帖子被举报为**需要版主注意**：社区认为帖子需要管理人员手动干预。"
     responder:
-      off_topic: "该帖子被标记为**偏离话题**：鉴于话题标题和第一个帖子，社区成员认为它不适合该话题。"
-      inappropriate: "该帖子被标记为**不合适**：社区成员认为它具有攻击性、辱骂性，或违反了[我们的社区准则](%{base_path}/guidelines)。"
-      spam: "该帖子被标记为**垃圾信息**：社区成员认为它是一个广告，是过度宣传性质的东西，而不是像预期的那样对主题有用或相关。"
-      notify_moderators: "该帖子被标记为**需版主关注**：社区成员认为该帖子的某些内容需要工作人员手动干预。"
+      off_topic: "该帖子被举报为**偏离话题**：鉴于话题标题和第一个帖子，社区认为它不适合该话题。"
+      inappropriate: "该帖子被举报为**不恰当**：社区认为它具有冒犯性、辱骂性或违反[我们的社区准则](%{base_path}/guidelines)。"
+      spam: "该帖子被举报为**垃圾信息**：社区认为这是一个广告，本质上是过度宣传的东西，而不是像预期的那样有用或与话题相关。"
+      notify_moderators: "该帖子被举报为**需要版主注意**：社区认为帖子需要管理人员手动干预。"
   flags_dispositions:
     agreed: "感谢通知我们。我们认为这是个问题，正在进行调查。"
     agreed_and_deleted: "感谢通知我们。我们认为这是个问题，并且已将该帖子移除。"
@@ -2510,9 +2513,9 @@ zh_CN:
     other: "由于大量社区举报，此话题被临时关闭至少 %{count} 小时。"
   system_messages:
     reviewables_reminder:
-      subject_template: "审核队列中有一些需要审核的项目"
+      subject_template: "审核队列中有需要审核的条目"
       text_body_template:
-        other: "%{mentions} 项目是在 %{count} 小时前提交的。[请审查它们](%{base_url}/review)。"
+        other: "%{mentions} 条目是在超过 %{count} 小时以前提交的。[请审核](%{base_url}/review)。"
     private_topic_title: "话题 #%{id}"
     contents_hidden: "请访问帖子以查看内容。"
     post_hidden:
@@ -2593,28 +2596,28 @@ zh_CN:
 
         请阅读我们的[社区准则](%{base_url}/guidelines)以了解详情。
     flags_agreed_and_post_deleted_for_responders:
-      title: "回复被管理人员从举报帖子中删除"
-      subject_template: "工作人员从被标记的帖子中删除了回复"
+      title: "管理人员从被举报的帖子中移除了回复"
+      subject_template: "管理人员从被举报的帖子中移除了回复"
       text_body_template: |
-        你好，
+        您好，
 
-        这是一条来自 %{site_name} 的自动信息，让你知道你回复的 [post](%{base_url}%{url}) 已被删除。
+        这是一条来自 %{site_name} 的自动消息，旨在告诉您，您回复的[帖子](%{base_url}%{url})已被移除。
 
         %{flag_reason}
 
-        这个帖子被社区成员标记了问题，一个工作人员选择了删除它。
+        此帖子被社区举报，一个管理人员选择了将其移除。
 
         ``markdown
         %{flagged_post_raw_content}
         ``
 
-        你对它的回应
+        您的回应
 
         ``markdown
         %{flagged_post_response_raw_content}
         ``
 
-        关于删除原因的详细信息，请查看我们的[社区指南](%{base_url}/guidelines)。
+        关于移除原因的详细信息，请查看我们的[社区准则](%{base_url}/guidelines)。
     usage_tips:
       text_body_template: |
         有关作为新用户入门的一些快速提示，请[查看此博文](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
@@ -2667,22 +2670,22 @@ zh_CN:
     tl2_promotion_message:
       subject_template: "恭喜您的信任级别提升！"
       text_body_template: |
-        我们已经将你提升到另一个[信任等级](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        我们已将您提升到另一个[信任级别](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
 
-        达到信任等级2意味着你已经阅读并积极参与，足以被视为这个社区的成员。
+        达到信任级别 2 意味着您已阅读并积极参与，足以被视为此社区的成员。
 
-        作为一个有经验的用户，你可能会欣赏[这个方便的技巧和窍门列表](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+        作为有经验的用户，您可能需要[这份方便的提示和技巧列表](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
 
-        我们邀请你继续参与 - 我们喜欢有你在身边。
+        我们邀请您继续参与 - 我们很高兴有您在身边。
     backup_succeeded:
       title: "备份成功"
       subject_template: "备份成功完成"
       text_body_template: |
         备份成功。
 
-        访问 [管理 > 备份选项](%{base_url}/admin/backups) 下载您的新备份。
+        访问[管理员 > 备份版块](%{base_url}/admin/backups)下载您的新备份。
 
-        这是日志：
+        下面是日志：
 
         %{logs}
     backup_failed:
@@ -2691,32 +2694,32 @@ zh_CN:
       text_body_template: |
         备份失败。
 
-        这是日志：
+        下面是日志：
 
         %{logs}
     restore_succeeded:
       title: "恢复成功"
       subject_template: "恢复成功完成"
       text_body_template: |
-        恢复成功。
+        还原成功。
 
-        这是日志：
+        下面是日志：
 
         %{logs}
     restore_failed:
       title: "恢复失败"
       subject_template: "恢复失败"
       text_body_template: |
-        恢复失败。
+        还原失败。
 
-        这是日志：
+        下面是日志：
 
         %{logs}
     bulk_invite_succeeded:
       title: "批量邀请成功"
       subject_template: "批量用户邀请处理成功"
       text_body_template: |
-        你的批量用户邀请文件已被处理， %{sent}个邀请已发送，其中 %{skipped} 个跳过和 %{warnings} 个警告。
+        您的批量用户邀请文件已被处理，%{sent} 个邀请已发送，其中 %{skipped} 个跳过，包含 %{warnings} 个警告。
 
         ``` text
         %{logs}
@@ -2725,7 +2728,7 @@ zh_CN:
       title: "批量邀请失败"
       subject_template: "批量用户邀请已被处理，但存在错误"
       text_body_template: |
-        你的批量用户邀请文件已被处理， %{sent}个邀请已发送，其中 %{skipped} 个跳过， %{warnings} 个警告和 %{failed} 个错误。
+        您的批量用户邀请文件已被处理， %{sent} 个邀请已发送，其中 %{skipped} 个跳过，包含 %{warnings} 个警告和 %{failed} 个错误。
 
         下面是日志：
 
@@ -2956,11 +2959,11 @@ zh_CN:
       title: "拒绝太多收件人的电子邮件"
       subject_template: "[%{email_prefix}] 电子邮件问题 - 收件人太多"
       text_body_template: |
-        抱歉，你向 %{destination} (标题为 %{former_title})发送的电子邮件未成功。
+        抱歉，您向 %{destination}（标题为 %{former_title}）发送的电子邮件未成功。
 
-        你试图给超过 %{max_recipients_count} 的人发送电子邮件，我们的系统自动将你的电子邮件标记为垃圾邮件。
+        您试图给超过 %{max_recipients_count} 人发送电子邮件，我们的系统自动将您的电子邮件标记为垃圾邮件。
 
-        如果你认为这是一个错误，[联系工作人员](%{base_url}/about)。
+        如果您认为这是一个错误，请[联系管理人员](%{base_url}/about)。
     email_error_notification:
       title: "电子邮件错误通知"
       subject_template: "[%{email_prefix}] 电子邮件问题 - POP 身份验证错误"
@@ -3128,7 +3131,7 @@ zh_CN:
     posted_by: "由 %{username} 于 %{post_date}发表"
     pm_participants: "参与者：%{participants}"
     more_pm_participants:
-      other: "%{participants} 和 %{count} 其他的"
+      other: "%{participants} 和其他 %{count} 人"
     invited_group_to_private_message_body: |
       %{username} 邀请 @%{group_name} 加入消息
 
@@ -3285,8 +3288,8 @@ zh_CN:
 
         %{respond_instructions}
     user_group_mentioned_pm:
-      title: "私信提及的用户群组"
-      subject_template: "[%{email_prefix}] [私信] %{topic_title}"
+      title: "提及用户群组的私信"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3296,8 +3299,8 @@ zh_CN:
 
         %{respond_instructions}
     user_group_mentioned_pm_group:
-      title: "私信提及的用户群组"
-      subject_template: "[%{email_prefix}] [私信] %{topic_title}"
+      title: "提及用户群组的私信"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3356,7 +3359,7 @@ zh_CN:
       title: "帐户被封禁"
       subject_template: "[%{email_prefix}] 您的帐户已被封禁"
       text_body_template: |
-        您已被论坛暂停登录。
+        您已被论坛封禁。
 
         原因 - %{reason}
     account_silenced:
@@ -3565,17 +3568,17 @@ zh_CN:
       title: "新登录提醒"
       subject_template: "[%{site_name}] 来自%{location}的新登录"
       text_body_template: |
-        你好，
+        您好，
 
-        我们注意到从你从不常用的设备或位置登录。这是你吗？
+        我们注意到从您不常用的设备或位置登录。这是您吗？
 
          - 位置：%{location} (%{client_ip})
          - 浏览器：%{browser}
          - 设备：%{device} – %{os}
 
-        如果这是你，太好了！你无需执行任何操作。
+        如果这是您，太好了！您无需执行任何操作。
 
-        如果不是你，请[审核你的已登录会话](%{base_url}/my/preferences/account)并考虑更改密码。
+        如果不是您，请[检查您现有的会话](%{base_url}/my/preferences/security)并考虑更改您的密码。
     post_approved:
       title: "您的帖子已被批准"
       subject_template: "[%{site_name}] 您的帖子已被批准"
@@ -3613,29 +3616,29 @@ zh_CN:
     store_failure: "无法保存用户 #%{user_id} 的上传 #%{upload_id}。"
     file_missing: "抱歉，您必须提供要上传的文件。"
     empty: "抱歉，您提供的文件是空的。"
-    failed: "抱歉，您上传失败。请再试一次。"
+    failed: "抱歉，上传失败。请再试一次。"
     png_to_jpg_conversion_failure_message: "从 PNG 转换为 JPG 时出错。"
     optimize_failure_message: "优化上传的图片时出错。"
-    download_failure: "从外部下载文件失败。"
-    size_mismatch_failure: "上传至S3的文件大小与外部上传存根的预期大小不一致。%{additional_detail}"
+    download_failure: "从外部提供商下载文件失败。"
+    size_mismatch_failure: "上传到 S3 的文件大小与外部上传存根的预期大小不匹配。%{additional_detail}"
     create_multipart_failure: "无法在外部存储中创建分段上传。"
     abort_multipart_failure: "无法中止外部存储中的分段上传。"
     complete_multipart_failure: "无法在外部存储中完成分段上传。"
-    external_upload_not_found: "在外部存储中未找到上传。 %{additional_detail}"
-    checksum_mismatch_failure: "您上传的文件的校验和不匹配。在上传时文件内容可能已更改。请再试一次。"
-    cannot_promote_failure: "上传无法完成，可能已经完成或失败了。"
-    size_zero_failure: "抱歉，好像出了点问题，您要上传的文件大小是 0 字节。请再试一次。"
+    external_upload_not_found: "在外部存储中找不到上传。%{additional_detail}"
+    checksum_mismatch_failure: "您上传的文件的校验和不匹配。上传时文件内容可能已更改。请再试一次。"
+    cannot_promote_failure: "上传无法完成，可能已经完成或之前失败。"
+    size_zero_failure: "抱歉，好像出了点问题，您要上传的文件是 0 字节。请再试一次。"
     attachments:
-      too_large: "抱歉，您尝试上传的文件过大（最大大小为 %{max_size_kb}KB）。"
-      too_large_humanized: "抱歉，你要上传的文件太大(最大尺寸是 %{max_size})。"
+      too_large: "抱歉，您尝试上传的文件过大（大小上限为 %{max_size_kb}KB）。"
+      too_large_humanized: "抱歉，您尝试上传的文件太大（大小上限为 %{max_size}）。"
     images:
-      too_large: "抱歉，您尝试上传的图片过大（最大大小为 %{max_size_kb}KB），请调整大小并重试。"
-      too_large_humanized: "对不起，你要上传的图片太大(最大尺寸为 %{max_size})，请调整大小后再试。"
-      larger_than_x_megapixels: "抱歉，您尝试上传的图片过大（最大大小为 %{max_image_megapixels}00 万像素），请调整大小并重试。"
+      too_large: "抱歉，您尝试上传的图片过大（大小上限为 %{max_size_kb}KB），请调整大小并重试。"
+      too_large_humanized: "抱歉，您尝试上传的图片太大（大小上限为 %{max_size}），请调整大小并重试。"
+      larger_than_x_megapixels: "抱歉，您尝试上传的图片过大（大小上限为 %{max_image_megapixels}00 万像素），请调整大小并重试。"
       size_not_found: "抱歉，我们无法确定图片的大小。也许您的图片已被损坏？"
     placeholders:
       too_large: "（图片大小超过 %{max_size_kb}KB）"
-      too_large_humanized: "(图像大于 %{max_size})"
+      too_large_humanized: "（图片大于 %{max_size}）"
   avatar:
     missing: "抱歉，我们找不到与该电子邮件地址关联的任何头像。您可以尝试重新上传吗？"
   flag_reason:
@@ -3680,12 +3683,12 @@ zh_CN:
     dark_rose: "黑红"
     wcag: "WCAG 亮"
     wcag_theme_name: "WCAG 亮"
-    dracula: "德拉库拉"
-    dracula_theme_name: "德拉库拉"
-    solarized_light: "Solarized 亮色"
-    solarized_light_theme_name: "Solarized 亮色"
-    solarized_dark: "Solarized 暗色"
-    solarized_dark_theme_name: "Solarized 暗色"
+    dracula: "Dracula"
+    dracula_theme_name: "Dracula"
+    solarized_light: "Solarized 浅色"
+    solarized_light_theme_name: "Solarized 浅色"
+    solarized_dark: "Solarized 深色"
+    solarized_dark_theme_name: "Solarized 深色"
     wcag_dark: "WCAG 暗"
     wcag_dark_theme_name: "WCAG 暗"
     default_theme_name: "默认"
@@ -4337,9 +4340,9 @@ zh_CN:
       synonym: '不允许使用同义词。改用“%{tag_name}”。'
       has_synonyms: '无法使用“%{tag_name}”，因为有同义词。'
       restricted_tags_cannot_be_used_in_category:
-        other: '以下标签不能在 "%{category}" 类别中使用： %{tags}。请删除它们。'
+        other: '“%{tags}”标签不能在“%{category}”类别中使用。请将其移除。'
       category_does_not_allow_tags:
-        other: '“%{category}”类别不允许使用以下标签：“%{tags}”。请删除它们。'
+        other: '“%{category}”类别不允许使用“%{tags}”标签。请将其移除。'
     required_tags_from_group:
       other: "您必须至少包含 %{count} 个%{tag_group_name}标签。此组中的标签包括：%{tags}。"
     invalid_target_tag: "不能是同义词的同义词"
@@ -4350,7 +4353,7 @@ zh_CN:
     register:
       button: "注册"
       title: "注册管理员帐户"
-      help: "注册新帐户以开始."
+      help: "注册新帐户以开始。"
       no_emails: "很抱歉，在设置过程中没有定义管理员电子邮件，因此完成配置可能很困难。请在配置文件中添加开发者电子邮件或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>从控制台创建管理员帐户</a>。"
     confirm_email:
       title: "确认您的电子邮件"
@@ -4361,7 +4364,7 @@ zh_CN:
   safe_mode:
     title: "进入安全模式"
     description: "安全模式允许您在不加载插件或主题的情况下测试您的站点。"
-    no_themes: "禁用主题和组件"
+    no_themes: "禁用主题和主题组件"
     no_unofficial_plugins: "禁用非官方插件"
     no_plugins: "禁用所有插件"
     enter: "进入安全模式"
@@ -4370,37 +4373,37 @@ zh_CN:
     title: "Discourse 设置"
     step:
       introduction:
-        title: "告诉我们你的社区情况"
+        title: "告诉我们您的社区情况"
         fields:
           title:
-            label: "社区名字"
+            label: "社区名称"
             placeholder: "朱桦的环聊"
           site_description:
-            label: "用一句话来描述你的社区"
+            label: "用一句话描述您的社区"
             placeholder: "朱桦和她的朋友讨论新奇事物的地方"
           contact_email:
             label: "联系人"
             placeholder: "example@user.com"
-            description: "负责这个社区的人或团体。用于重要的更新，并列在 <a href='%{base_path}/about' target='_blank'>你的关于页面</a> ，以便紧急联系。"
+            description: "负责此社区的个人或群组。用于重要动态，并在<a href='%{base_path}/about' target='_blank'>您的“关于”页面</a>上列出以供紧急联系。"
           default_locale:
             label: "语言"
       privacy:
-        title: "会员体验"
+        title: "成员体验"
         fields:
           login_required:
             placeholder: "不公开"
             extra_description: "只有登录用户才能访问此社区"
           invite_only:
             placeholder: "仅限邀请"
-            extra_description: "用户必须由受信任的用户或工作人员邀请，否则用户可以自行注册"
+            extra_description: "用户必须由受信任的用户或管理人员邀请，否则用户可以自行注册"
           must_approve_users:
             placeholder: "需要审批"
-            extra_description: "用户必须得到工作人员的批准"
+            extra_description: "用户必须得到管理人员的批准"
       ready:
         title: "您的 Discourse 已就绪！"
-        description: "就是这样！你已经完成了建立社区的基础工作。现在你可以进去看一看，写一个欢迎话题，然后发送邀请！<br><br>玩得开心！"
+        description: "就是这样！您已经完成建立社区的基础工作。现在，您可以进去看一看，撰写一个欢迎话题，然后发送邀请！<br><br>玩得开心！"
       styling:
-        title: "外观和感觉"
+        title: "外观"
         fields:
           color_scheme:
             label: "配色方案"
@@ -4422,41 +4425,41 @@ zh_CN:
               categories_and_latest_topics:
                 label: "类别和最新话题"
               categories_and_latest_topics_created_date:
-                label: "类别和最新话题(按话题创建日期排序)"
+                label: "类别和最新话题（按话题创建日期排序）"
               categories_and_top_topics:
                 label: "类别和热门话题"
               categories_boxes:
                 label: "类别框"
               categories_boxes_with_topics:
-                label: "带有话题的类别框"
+                label: "包含话题的类别框"
               subcategories_with_featured_topics:
-                label: "有特色主题的子类别"
+                label: "包含精选话题的子类别"
       branding:
-        title: "社区品牌"
+        title: "自定义徽标"
         fields:
           logo:
             label: "主要徽标"
-            description: "在你网站左上方的标志。使用一个高度为120，长宽比大于3:1的宽长方形图像。"
+            description: "您的站点左上角的徽标。使用高度为 120 且宽高比大于 3:1 的宽矩形图片。"
           logo_small:
             label: "方形徽标"
-            description: "你的标志的一个方形版本。在页面向下滚动时显示在左上方，在社交平台上分享时也是如此。最理想的尺寸是至少512x512。"
+            description: "您徽标的方形版本。向下滚动时以及在社交平台上分享时显示在左上角。理想情况下至少为 512x512。"
           favicon:
             label: "浏览器图标"
-            description: "用来在网络浏览器中代表你网站的图标，在小尺寸下看起来很好。建议使用PNG或JPG。默认使用方形标志。"
+            description: "用于在 Web 浏览器中表示您的站点的图标，在小尺寸下看起来不错。建议使用 PNG 或 JPG。默认使用方形徽标。"
           large_icon:
             label: "大图标"
-            description: "用来代表你网站在移动设备上的图标，在较大的尺寸下看起来很好。最好大于512x512。默认情况下使用方形标志。"
+            description: "用于在移动设备上表示您的站点的图标，在较大尺寸下看起来不错。理想情况下大于 512x512。默认使用方形标志。"
       corporate:
-        title: "联系和组织"
+        title: "您的组织"
         fields:
           company_name:
             label: "公司名称"
             placeholder: "示例组织"
-            description: "在你的服务条款页面中输入。如果没有公司，请跳过。"
+            description: "在您的“服务条款”页面中输入。如果没有公司，请随意跳过。"
           governing_law:
             label: "适用法律"
             placeholder: "加州法律"
-            description: "在你的服务条款页面中输入。如果没有公司，请跳过。"
+            description: "在您的“服务条款”页面中输入。如果没有公司，请随意跳过。"
           contact_url:
             label: "网页"
             placeholder: "https://www.example.com/contact-us"
@@ -4464,7 +4467,7 @@ zh_CN:
           city_for_disputes:
             label: "争议之城"
             placeholder: "加利福尼亚州旧金山"
-            description: "在你的服务条款页面中输入。如果没有公司，请跳过。"
+            description: "在您的“服务条款”页面中输入。如果没有公司，请随意跳过。"
           site_contact:
             label: "自动消息"
             description: "所有自动 Discourse 个人消息都将从此用户发送，例如举报警告和备份完成通知。"
@@ -4522,24 +4525,24 @@ zh_CN:
     missing_version: "您必须提供版本参数"
     conflict: "有一个更新冲突阻止您执行该操作。"
     reasons:
-      post_count: "每个用户的前几个帖子都必须得到工作人员的批准。见 %{link}。"
-      trust_level: "低信任度的用户必须由工作人员批准回复。见 %{link}。"
-      new_topics_unless_trust_level: "低信任级别的用户必须有工作人员批准的主题。见 %{link}。"
-      fast_typer: "新用户输入第一个帖子的速度快得可疑，怀疑是机器人或广告用户所为。请参阅 %{link}。"
-      auto_silence_regex: "第一个帖子匹配 %{link} 设置的新用户。"
-      watched_word: "这篇主题包括一个关注词。检查你的设置： %{link}。"
-      staged: "暂存用户的新主题和帖子必须得到管理人员的批准。见 %{link}。"
-      category: "发布于此类别的帖子需要工作人员手动批准。见 %{link}。"
-      must_approve_users: "所有新用户都必须经过工作人员的审核。见 %{link}。"
-      invite_only: "所有的新用户都应该被邀请。见 %{link}。"
+      post_count: "每个用户的前几个帖子都必须得到管理人员的批准。请参阅%{link}。"
+      trust_level: "低信任级别的用户的回复必须由管理人员批准。请参阅%{link}。"
+      new_topics_unless_trust_level: "低信任级别的用户的话题必须由管理人员批准。请参阅%{link}。"
+      fast_typer: "新用户输入第一个帖子的速度快得可疑，怀疑是机器人或垃圾信息发布者所为。请参阅%{link}。"
+      auto_silence_regex: "第一个帖子与%{link}设置匹配的新用户。"
+      watched_word: "此帖子包括一个关注词。请查看您的%{link}。"
+      staged: "暂存用户的新话题和帖子必须由管理人员批准。请参阅%{link}。"
+      category: "此类别中的帖子要求管理人员手动审批。请参阅%{link}。"
+      must_approve_users: "所有新用户都必须由管理人员审批。请参阅%{link}。"
+      invite_only: "所有新用户都应受到邀请。请参阅%{link}。"
       email_auth_res_enqueue: "此电子邮件未通过 DMARC 检查，它很可能不是来自表面看起来的人。检查原始电子邮件标头以获取更多信息。"
-      email_spam: "此电子邮件被 %{link} 中定义的标头标记为垃圾邮件。"
-      suspect_user: "这个新用户在没有阅读任何主题或帖子的情况下输入了个人资料信息，这强烈表明他们可能是垃圾邮件发送者。见 %{link}。"
-      contains_media: "这个帖子帖子包含嵌入式媒体。见 %{link}。"
+      email_spam: "此电子邮件因%{link}中定义的标头被举报为垃圾邮件。"
+      suspect_user: "此新用户在没有阅读任何话题或帖子的情况下输入了个人资料信息，这强烈表明他们可能是垃圾信息发布者。请参阅%{link}。"
+      contains_media: "此帖子包括嵌入式媒体。请参阅%{link}。"
       queued_by_staff: "一名管理人员认为此帖子需要审核。在此之前，它将保持隐藏。"
       links:
-        watched_word: 列出关注的关键字
-        category: 分类设置
+        watched_word: 关注词的列表
+        category: 类别设置
     actions:
       agree:
         title: "同意…"
@@ -4623,7 +4626,7 @@ zh_CN:
   notification_level:
     ignore_error: "抱歉，您不能忽略该用户。"
     mute_error: "抱歉，您无法将该用户设为免打扰。"
-    error: "对不起，你不能改变该用户的通知级别。"
+    error: "抱歉，您无法更改该用户的通知级别。"
     invalid_value: '"%{value}" 不是一个有效的通知级别。'
   discord:
     not_in_allowed_guild: "身份验证失败。您不是允许的 Discord 公会的成员。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 9771a35885..9e8378076f 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -408,6 +408,10 @@ zh_TW:
           attributes:
             word:
               too_many: "超出描述該動作的字數"
+        sidebar_section_link:
+          attributes:
+            linkable_type:
+              invalid: "無效"
       <<: *errors
   uncategorized_category_name: "尚未分類"
   general_category_name: "一般"
@@ -416,7 +420,6 @@ zh_TW:
   staff_category_name: "管理員"
   staff_category_description: "讓工作人員進行討論的私人分類。此分類下的討論話題只有管理員與板主才看得到。"
   discourse_welcome_topic:
-    title: "歡迎來到 Discourse"
     body: |2
 
       置頂主題的第一段是訪客在主頁看到的歡迎消息。這很重要！
@@ -1225,6 +1228,8 @@ zh_TW:
     top_topics_formula_first_post_likes_multiplier: "熱門主題公式中首貼讚的數量的因子的值（n）：`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: "熱門主題公式中贊和貼文數量的比例的最小值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     enable_safe_mode: "允許使用者進入安全模式以偵錯插件（plugins）。"
+    enable_experimental_sidebar_hamburger: "允許啟用實驗側選單和漢堡下拉選單。"
+    enable_sidebar: "啟用實驗性側選單。"
     rate_limit_create_topic: "建立新討論話題之後，使用者必須間隔多少秒 (n) 才能再建立新討論話題"
     rate_limit_create_post: "建立新貼文之後，使用者必須間隔多少秒 (n) 才能再建立新貼文"
     rate_limit_new_user_create_topic: "建立一個話題後，新使用者必須等待 (n) 秒才能建立另一個新話題"
@@ -1549,6 +1554,8 @@ zh_TW:
     push_notifications_prompt: "顯示使用者同意提示"
     short_title: "短標題將用於使用者的主螢幕、啟動器或其他可能空白鍵有限的地方，它應限制為12個字。"
     dashboard_general_tab_activity_metrics: "選擇在一般頁面中要顯示為活躍指標的報告"
+    default_sidebar_categories: "選定的分類將預設顯示在側選單的分類段落中。"
+    default_sidebar_tags: "選定的標籤將預設顯示在側選單的標籤段落中。"
     errors:
       invalid_email: "無效的電子郵件地址"
       invalid_username: "沒有使用者使用該使用者名稱。"
@@ -1608,7 +1615,7 @@ zh_TW:
   most_recent_poster: "當前大部分貼文作者"
   frequent_poster: "頻繁發文者"
   redirected_to_top_reasons:
-    new_user: "歡迎來到我們的社區！這是我們最近的熱門主題。"
+    new_user: "歡迎來到我們的社群！這是最近的熱門主題。"
     not_seen_in_a_month: "歡迎回來！我們已經好久沒見到你了。這些是你不在時的最熱門主題。"
   merge_posts:
     edit_reason:
@@ -2743,7 +2750,7 @@ zh_TW:
       name: 資深
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授與</a>全域編輯、置頂、關閉、存檔、分割和合併、更多的讚
       long_description: |
-        當您達到信任等級4 時，將授予此徽章。您是該工作人員所選擇的社區的領導者，並且您在此處為您的行動和單詞中的其他社區樹立了積極的榜樣。您可以編輯所有貼文，採用常見主題版主操作，例如置頂，關閉，取消列表，存檔，拆分和合併。
+        當您達到信任等級 4 時，將授予此徽章。您是工作人員所選擇的社群領導者，您在此處以您的行動和文字，為其他社群成員樹立積極的榜樣。您可以編輯所有文章，執行諸如置頂、關閉、取消顯示、封存、拆分和合併等管理功能。
     welcome:
       name: 歡迎
       description: 得到一個贊
@@ -2758,7 +2765,7 @@ zh_TW:
       name: 年度紀念日
       description: 一年活躍使用者，至少發了一個貼文
       long_description: |
-        當您成為該年度會員並且該年度至少有一個貼文時，將頒發此徽章。感謝您堅持並為我們的社區做出貢獻，沒有你我們無法做到。
+        當您成為會員滿一年，並且在該年度至少有一個貼文，則會授予此徽章。感謝您堅持為我們的社群做出貢獻。沒有你我們做不到。
     nice_post:
       name: 不錯的回覆
       description: 回覆被讚了 10 次
diff --git a/plugins/discourse-details/config/locales/server.cs.yml b/plugins/discourse-details/config/locales/server.cs.yml
index 041b2f0bd0..3e6ee06247 100644
--- a/plugins/discourse-details/config/locales/server.cs.yml
+++ b/plugins/discourse-details/config/locales/server.cs.yml
@@ -5,3 +5,7 @@
 # https://translate.discourse.org/
 
 cs:
+  site_settings:
+    details_enabled: 'Zahrnout možnost přidat k příspěvku rozšiřitelné detaily. Tuto funkci najdete ve vyskakovací nabídce panelu nástrojů kompozitoru. Pokud toto nastavení změníte, musíte všechny příspěvky znovu vytvořit pomocí příkazu "rake posts:rebake".'
+  details:
+    excerpt_details: "(klikněte pro více podrobností)"
diff --git a/plugins/discourse-local-dates/config/locales/client.cs.yml b/plugins/discourse-local-dates/config/locales/client.cs.yml
index cab5bfb3ee..8545a75f45 100644
--- a/plugins/discourse-local-dates/config/locales/client.cs.yml
+++ b/plugins/discourse-local-dates/config/locales/client.cs.yml
@@ -7,7 +7,38 @@
 cs:
   js:
     discourse_local_dates:
+      relative_dates:
+        today: dnes v %{time}
+        tomorrow: zítra v %{time}
+        yesterday: včera v %{time}
+        countdown:
+          passed: datum uplynulo
+      title: Vložit datum / čas
       create:
         form:
+          insert: Vložit
+          advanced_mode: Pokročilý mód
+          simple_mode: Jednoduchý mód
+          format_description: "Formát použitý pro zobrazení data uživateli. Použijte Z pro zobrazení posunu a zz pro název časové zóny."
+          timezones_title: Časová pásma k zobrazení
+          timezones_description: Pro zobrazení dat v náhledu a záložním zobrazení se použijí časová pásma.
+          recurring_title: Opakování
+          recurring_description: "Definujte opakování události. Možnost opakování generovanou formulářem můžete také ručně upravit a použít jeden z následujících klíčů: roky, čtvrtletí, měsíce, týdny, dny, hodiny, minuty, sekundy, milisekundy."
+          recurring_none: Bez opakování
+          invalid_date: Nesprávné datum, zkontrolujte, zda je datum a čas správně.
           date_title: Datum
           time_title: Čas
+          format_title: Formát data
+          timezone: Časové pásmo
+          until: dokud...
+          current_timezone: "Aktuální časové pásmo:"
+          recurring:
+            every_day: "každý den"
+            every_week: "každý týden"
+            every_two_weeks: "každé dva týdny"
+            every_month: "každý měsíc"
+            every_two_months: "každé dva měsíce"
+            every_three_months: "každé tři měsíce"
+            every_six_months: "každých šest měsíců"
+            every_year: "každý rok"
+      default_title: "%{site_name} událost"
diff --git a/plugins/discourse-local-dates/config/locales/client.de.yml b/plugins/discourse-local-dates/config/locales/client.de.yml
index 6d8741e350..b1a902eb3c 100644
--- a/plugins/discourse-local-dates/config/locales/client.de.yml
+++ b/plugins/discourse-local-dates/config/locales/client.de.yml
@@ -41,4 +41,4 @@ de:
             every_three_months: "Alle 3 Monate"
             every_six_months: "Alle 6 Monate"
             every_year: "Jedes Jahr"
-      default_title: "%{site_name} Termin"
+      default_title: "%{site_name}-Ereignis"
diff --git a/plugins/discourse-local-dates/config/locales/client.it.yml b/plugins/discourse-local-dates/config/locales/client.it.yml
index ef4c68e39d..57cff10673 100644
--- a/plugins/discourse-local-dates/config/locales/client.it.yml
+++ b/plugins/discourse-local-dates/config/locales/client.it.yml
@@ -31,6 +31,7 @@ it:
           format_title: Formato data
           timezone: Fuso orario
           until: Fino a...
+          current_timezone: "Fuso orario attuale:"
           recurring:
             every_day: "Ogni giorno"
             every_week: "Ogni settimana"
@@ -40,3 +41,4 @@ it:
             every_three_months: "Ogni tre mesi"
             every_six_months: "Ogni sei mesi"
             every_year: "Ogni anno"
+      default_title: "Evento %{site_name}"
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
index cf68e1bdbd..034a5c77f4 100644
--- a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
@@ -41,4 +41,4 @@ zh_CN:
             every_three_months: "每三个月"
             every_six_months: "每六个月"
             every_year: "每年"
-      default_title: "%{site_name} 事件"
+      default_title: "%{site_name}事件"
diff --git a/plugins/discourse-local-dates/config/locales/server.cs.yml b/plugins/discourse-local-dates/config/locales/server.cs.yml
index 041b2f0bd0..d97001b5e7 100644
--- a/plugins/discourse-local-dates/config/locales/server.cs.yml
+++ b/plugins/discourse-local-dates/config/locales/server.cs.yml
@@ -5,3 +5,8 @@
 # https://translate.discourse.org/
 
 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ý pro zobrazení data v e-mailech."
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index 7ecd1891b8..10ddb78504 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -7,49 +7,49 @@
 cs:
   site_settings:
     discourse_narrative_bot_enabled: "Povolit Discourse Narrative Bot (discobot)"
-    disable_discourse_narrative_bot_welcome_post: "Vypnout uvítací příspěvek od Discourse robota průvodce"
-    discourse_narrative_bot_ignored_usernames: "Uživatelská jména, která by měl Discourse robot průvodce ignorovat"
-    discourse_narrative_bot_disable_public_replies: "Vypnout veřejné odpovědi Discourse robota průvodce"
-    discourse_narrative_bot_welcome_post_type: "Typ uvítacího příspěvku, který by měl Discourse robot průvodce poslat"
-    discourse_narrative_bot_welcome_post_delay: "Počkat (n) vteřin, než Discourse robot průvodce odešle uvítací příspěvek."
-    discourse_narrative_bot_skip_tutorials: "Discourse Narrative Bot tutoriály pro přeskočení"
+    disable_discourse_narrative_bot_welcome_post: "Zakázat uvítací příspěvek od Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Uživatelská jména, která by měl Discourse Narrative Bot ignorovat"
+    discourse_narrative_bot_disable_public_replies: "Zakázat veřejné odpovědi od Discourse Narrative Bot"
+    discourse_narrative_bot_welcome_post_type: "Typ uvítacího příspěvku, který by měl Discourse Narrative Bot odesílat"
+    discourse_narrative_bot_welcome_post_delay: "Před odesláním uvítacího příspěvku Discourse Narrative Bot počkat (n) sekund."
+    discourse_narrative_bot_skip_tutorials: "Discourse Narrative Bot kurzy k přeskočení"
   badges:
     certified:
       name: Certifikován(a)
-      description: "Dokončil náš tutorial pro nové uživatele"
+      description: "Dokončil(a) výukový program pro nové uživatele"
       long_description: |
-        Tento odznak je udělen za úspěšné dokončení interaktivního tutoriálu pro nové uživatele. Udělali jste krok, abyste se naučili základní nástroje diskuse a nyní jste certifikováni!
+        Tento odznak je udělen po úspěšném dokončení interaktivního kurzu pro nové uživatele. Převzali jste iniciativu naučit se základní nástroje diskuse a nyní jste certifikováni!
     licensed:
       name: Licencován(a)
-      description: "Dokončen náš pokročilý uživatelský tutoriál"
+      description: "Dokončil(a) náš výukový kurz pro pokročilé uživatele"
       long_description: |
-        Tento odznak je udělen za úspěšné dokončení pokročilého interaktivního tutoriálu pro uživatele. Zvládli jste pokročilé nástroje diskuse — a nyní jste plně licencováni!
+        Tento odznak se uděluje po úspěšném absolvování interaktivního kurzu pro pokročilé uživatele. Zvládli jste pokročilé diskusní nástroje - a nyní máte plnou licenci!
   discourse_narrative_bot:
-    bio: "Ahoj, já nejsem člověk. Jsem robot, který Vás může naučit něco o tomto webu. Pro chcete-li se mnou komunikovat, pošlete mi zprávu nebo kdekoliv zmiňte ****."
+    bio: "Ahoj, nejsem skutečná osoba. Jsem bot, který vás může naučit něco o tomto webu. Chcete-li se mnou komunikovat, pošlete mi zprávu nebo mě zmiňte jménem."
     tl2_promotion_message:
-      subject_template: "Teď, když jste byli povýšeni, je čas se dozvědět o některých pokročilých funkcích!"
+      subject_template: "Teď, když jste povýšili, je čas seznámit se s některými pokročilými funkcemi!"
       text_body_template: |
         Odpovězte na tuto zprávu pomocí `@%{discobot_username} %{reset_trigger}`, abyste se dozvěděli více o tom, co můžete udělat.
     timeout:
       message: |-
-        Ahoj @%{username}, jen se ozývám, protože jsem od Vás nějakou dobu nic neslyšel.
+        Ahoj @%{username}, jen se hlásím, protože jsem o tobě už dlouho neslyšel.
 
-        - Pro pokračování mi kdykoliv odpovězte.
+        - Chceš-li pokračovat, odpověz mi kdykoli.
 
-        - Pokud byste chtěli tento krok přeskočit, řekněte "%{skip_trigger}".
+        - Pokud chceš tento krok přeskočit, řekni `%{skip_trigger}`.
 
-        - Pro opětovný začátek řekněte "%{reset_trigger}".
+        - Chceš-li začít znovu, řekni `%{reset_trigger}`.
 
-        Pokud raději nechcete, je to taky OK. Jsem robot. Neraníte mé pocity. :sob:
+        Pokud nechceš, je to také v pořádku. Jsem robot. Mým citům neublížíš. :sob:
     dice:
       trigger: "hodit"
       invalid: |-
         Omlouvám se, ale je matematicky nemožné hodit tuto kombinaci kostek. :confounded:
       not_enough_dice:
-        one: "Mám jen %{count} kostky. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
+        one: "Mám jen %{count} kostku. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
         few: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
         many: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
-        other: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
+        other: "Mám jen %{count} kostky. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
       out_of_range: |-
         Víš, že [maximální počet stěn](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pro matematicky férovou kostku je 120?
       results: |-
@@ -57,16 +57,16 @@ cs:
     quote:
       trigger: "citace"
       "1":
-        quote: "Uprostřed každé těžkosti leží příležitost"
+        quote: "Uprostřed každého problému se nachází příležitost."
         author: "Albert Einstein"
       "2":
-        quote: "Nemá cenu mít svobodu, pokud nemáte svobodu dělat chyby."
+        quote: "Svoboda nemá cenu, pokud s ní není spojena svoboda chybovat."
         author: "Mahatma Gandhi"
       "3":
-        quote: "Neplačte proto, že je po všem, radujte se, protože se to stalo."
+        quote: "Neplač, protože to skončilo. Usměj se, protože se to stalo."
         author: "Dr Seuss"
       "4":
-        quote: "Pokud chcete udělat nějakou správnou věc, tak ji udělejte sami."
+        quote: "Pokud chceš něco udělat správně, udělej to sám."
         author: "Charles-Guillaume Étienne"
       "5":
         quote: "Věř tomu, že na to máš, a budeš na půli cesty k úspěchu."
@@ -75,16 +75,16 @@ cs:
         quote: "Život je jako bonboniéra, nikdy nevíš, co ochutnáš."
         author: "Máma Forresta Gumpa"
       "7":
-        quote: "Je to malý krůček pro člověka, ale velký skok pro lidstvo."
+        quote: "Malý krok pro člověka, vleký skok pro lidstvo."
         author: "Neil Armstrong"
       "8":
-        quote: "Udělejte každý den jednu věc, která vás děsí."
+        quote: "Každý den udělejte jednu věc, která vás děsí."
         author: "Eleanor Roosevelt"
       "9":
-        quote: "Chyby jsou vždy odpustitelné, pokud má člověk odvahu je přiznat."
+        quote: "Chyby jsou vždy odpustitelné, když má daná osoba odvahu je přiznat."
         author: "Bruce Lee"
       "10":
-        quote: "Cokoli si mysl člověka dokáže představit a věřit, toho může dosáhnout."
+        quote: "Cokoli si dokáže lidská mysl představit a čemu uvěří, toho může člověk dosáhnout."
         author: "Napoleon Hill"
       "11":
         quote: "Mír doma, mír ve světě."
@@ -100,18 +100,18 @@ cs:
     magic_8_ball:
       trigger: "štěstí"
       answers:
-        "1": "To je jisté"
-        "2": "Naprostá pravda"
-        "3": "Bez zaváhání"
-        "4": "Rozhodně ano"
+        "1": "Je to jisté"
+        "2": "Je to rozhodně tak"
+        "3": "Bezpochyby"
+        "4": "Určitě ano"
         "5": "Na to se můžeš spolehnout"
-        "6": "Podle mě ano"
-        "7": "Asi jo"
+        "6": "Jak to vidím já, ano"
+        "7": "S největší pravděpodobností"
         "8": "Vypadá to dobře"
         "9": "Ano"
         "10": "Dle znamení ano"
         "11": "Odpověď je nejasná, zkuste to znovu"
-        "12": "Zeptej se později"
+        "12": "Zeptej se znovu později"
         "13": "To ti teď raději neřeknu"
         "14": "To nyní nedokážu předpovědět"
         "15": "Soustřeď se a zeptej se znovu"
@@ -130,10 +130,10 @@ cs:
         reply: |-
           Ahoj! Pokud chceš zjistit, co umím, napiš `@%{discobot_username} %{help_trigger}`.
         tracks: |-
-          V současné době vím, jak dělat následující věci:
+          V současné době umím dělat následující věci:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Zahajuje interaktivní výukový kurz právě pro vás, v osobní zprávě. `{name-of-tutorial}` může být jeden z: `%{tracks}`.
+          > Spustí interaktivní výukový kurz speciálně pro vás, v osobní zprávě. `{name-of-tutorial}` může být jeden z: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -143,32 +143,33 @@ cs:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Můžete se na ni spolehnout
+        discobot_disabled: Ve svých předvolbách jste mě zakázali. Musíte povolit tipy pro nové uživatele aby jste se mnou mohli komunikovat.
       do_not_understand:
         first_response: |-
           Dík za odpověď!
 
-          Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle neporozumněl. :frowning:
-        track_response: Můžete to zkusit znovu, nebo pokud chcete tento krok přeskočit, řekněte „%{skip_trigger}“. Jinak začněte znovu a řekněte „%{reset_trigger}“.
+          Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle moc nerozuměl. :frowning:
+        track_response: Můžeš to zkusit znovu, nebo pokud chceš tento krok přeskočit, řekni „%{skip_trigger}“. Jinak pro začnutí znovu řekni „%{reset_trigger}“.
         second_response: |-
-          Promiň. Stále to nechápu. :anguished:
+          Promiň, pořád to nechápu. :anguished:
 
-          Jsem jen robot, ale pokud chcete oslovit skutečnou osobu, podívejte se na [naši kontaktní stránku] (%{base_path}/ o).
+          Jsem jen bot, ale pokud chceš oslovit skutečnou osobu, podívej se na [naši kontaktní stránku] (%{base_path}/ o).
 
-          Mezitím ti nebudu stát v cestě.
+          Mezitím se ti budu klidit z cesty.
     new_user_narrative:
-      reset_trigger: "tutoriál"
-      title: "Nový certifikát dokončení uživatelského kurzu"
-      cert_title: "Jako uznání úspěšného dokončení nového uživatelského tutoriálu"
+      reset_trigger: "kurz"
+      title: "Certifikát o absolvování výukového kurzu pro nové uživatele"
+      cert_title: "Za úspěšné absolvování výukového kurzu pro nové uživatele"
       hello:
         title: "Zdravím!"
         message: |-
-          Děkujeme za připojení k %{title}a vítáme vás!
+          Děkujeme, že jste se připojili k %{title}, a vítáme vás!
 
-          - Jsem jen robot, ale [náš přátelský personál] (%{base_uri}/ o) je zde také, aby vám pomohl, pokud byste potřebovali kontaktovat skutečnou osobu.
+          - Jsem jen robot, ale [náš přátelský personál](%{base_uri}/about) je tu také, pokud se potřebujete na někoho obrátit.
 
-          - Z bezpečnostních důvodů dočasně omezujeme, co mohou noví uživatelé dělat. Jak vás budeme lépe poznávat, získáte [nové schopnosti] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (a [badges](%{base_uri}/ odznaky)).
+          - Z bezpečnostních důvodů dočasně omezujeme možnosti nových uživatelů. Jakmile vás poznáme, získáte [nové schopnosti](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (a [badges](%{base_uri}/badges)).
 
-          - Vždy věříme v [chování civilizované komunity] (%{base_uri}/ pokyny).
+          - Za všech okolností věříme v [civilizované chování komunity](%{base_uri}/guidelines).
       onebox:
         instructions: |-
           Dále, můžete se mnou sdílet jeden z těchto odkazů? Odpovězte ** samotným odkazem na řádku ** a automaticky se rozbalí o šikovný souhrn.
@@ -288,6 +289,12 @@ cs:
 
           (A ano, moje uživatelské jméno je napsáno _disco_, stejně jako v 70. letech taneční šílenství. Mám [rád noční život!] (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
+        instructions: |-
+          Máme rádi přátelské diskuse a potřebujeme vaši pomoc, abychom [udrželi civilizovanou atmosféru](%{guidelines_url}). Pokud uvidíte nějaký problém, označte ho prosím aby jste o něm dali soukromě jeho autorovi nebo [našemu ochotnému personálu](%{about_url}) vědět. Existuje mnoho důvodů, proč byste mohli chtít příspěvek označit, od neškodného návrhu na rozdělení tématu až po jasné porušení komunitních standardů. Pokud vyberete možnost **Něco jiného**, zahájíte diskusi v soukromé zprávě s moderátory, kde můžete položit další otázky.
+
+          > :imp: Napsal jsem tu něco nepěkného
+
+          Klidně tento příspěvek **označte** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> a jako důvod vyberte **Je to nevhodné**!
         reply: "[Naši personál (%{base_uri}/ skupiny / zaměstnanci) bude soukromě informováni o vaší vlajce. Pokud příspěvek označí dostatek členů komunity, bude také preventivně automaticky skryt. (Vzhledem k tomu, že jsem ve skutečnosti nenapsal ošklivý příspěvek :angel:, šel jsem napřed \na prozatím vlaječku odstranil)"
         not_found: |-
           Ach ne, můj ošklivý příspěvek ještě nebyl označen jako nevhodný. :worried: Můžete jej označit jako nevhodný pomocí ** vlaječky ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Nezapomeňte použít tlačítko Zobrazit více <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> k odhalení dalších akcí pro každý příspěvek.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index 1d1bab960a..47fbd4db53 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -222,7 +222,7 @@ zh_CN:
 
           - 或者，按编辑器中的 <kbd><b>B</b></kbd> 或 <kbd><i>I</i></kbd> 按钮
         reply: |-
-          真棒！HTML 和 BBCode 也可用于格式化 - 想了解更多，请[试试此教程](https://commonmark.org/help) :nerd:
+          真棒！HTML 和 BBCode 也可用于格式化 – 要了解详情，请[试试此教程](https://commonmark.org/help) :nerd:
         not_found: |-
           哇，我在你的回复中没有找到任何格式。:pencil2:
 
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index 847bca7d07..aebced6caa 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -42,7 +42,7 @@ de:
     poll_must_be_open_to_vote: "Die Umfrage muss zum Abstimmen gestartet sein."
     one_vote_per_user: "Für diese Umfrage ist nur eine Stimme erlaubt."
     max_vote_per_user:
-      one: Nur %{count} Stimmen sind für diese Umfrage erlaubt.
+      one: Für diese Umfrage ist nur %{count} Stimme erlaubt.
       other: Für diese Umfrage sind maximal %{count} Stimmen erlaubt.
     min_vote_per_user:
       one: Für diese Umfrage ist mindestens %{count} Stimme erforderlich.
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 0857a765a7..b2ba752527 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -40,6 +40,13 @@ it:
     user_cant_post_in_topic: "Non puoi votare perché non puoi pubblicare messaggi in questo argomento."
     topic_must_be_open_to_vote: "L'argomento deve essere aperto per poter votare."
     poll_must_be_open_to_vote: "Il sondaggio deve essere aperto per poter votare."
+    one_vote_per_user: "È consentito solo 1 voto per questo sondaggio."
+    max_vote_per_user:
+      one: È consentito solo %{count} voto per questo sondaggio.
+      other: È consentito un massimo di %{count} voti per questo sondaggio.
+    min_vote_per_user:
+      one: Almeno %{count} voto è richiesto per questo sondaggio.
+      other: Almeno %{count} voti sono richiesti per questo sondaggio.
     topic_must_be_open_to_toggle_status: "L'argomento deve essere aperto per commutare lo stato."
     only_staff_or_op_can_toggle_status: "Solo un membro dello staff o l'autore originale possono commutare lo stato di un sondaggio."
     insufficient_rights_to_create: "Non sei autorizzato a creare sondaggi."
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 8de5912f55..c0d30d54ac 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -40,9 +40,9 @@ zh_CN:
     poll_must_be_open_to_vote: "投票必须处于开放状态才能投票。"
     one_vote_per_user: "本投票只允许投 1 票。"
     max_vote_per_user:
-      other: 本次投票最多允许 %{count} 张投票。
+      other: 本投票最多允许投 %{count} 票。
     min_vote_per_user:
-      other: 本投票需要至少有 %{count} 张投票。
+      other: 本投票至少需要 %{count} 票。
     topic_must_be_open_to_toggle_status: "话题必须处于开放状态才能切换状态。"
     only_staff_or_op_can_toggle_status: "只有管理人员或者发布投票的人才能切换投票状态。"
     insufficient_rights_to_create: "您无权创建投票。"
diff --git a/plugins/styleguide/config/locales/client.de.yml b/plugins/styleguide/config/locales/client.de.yml
index 174ce624de..a1389bb483 100644
--- a/plugins/styleguide/config/locales/client.de.yml
+++ b/plugins/styleguide/config/locales/client.de.yml
@@ -86,9 +86,9 @@ de:
         spinners:
           title: "Spinner"
         empty_state:
-          title: "Leerer Zustand"
+          title: "Empty State"
         rich_tooltip:
-          title: "Reichhaltiger Tooltip"
+          title: "Rich Tooltip"
           description: "Beschreibung"
           header: "Kopfzeile"
-          hover_to_see: "Bewege den Mauszeiger, um einen Tooltip zu sehen"
+          hover_to_see: "Bewege den Mauszeiger darüber, um einen Tooltipp zu sehen"
diff --git a/plugins/styleguide/config/locales/client.it.yml b/plugins/styleguide/config/locales/client.it.yml
index c9818beec4..d52fab671f 100644
--- a/plugins/styleguide/config/locales/client.it.yml
+++ b/plugins/styleguide/config/locales/client.it.yml
@@ -86,7 +86,9 @@ it:
         spinners:
           title: "Icone di Caricamento"
         empty_state:
-          title: "Status Vuoto"
+          title: "Stato Vuoto"
         rich_tooltip:
+          title: "Descrizione estesa"
           description: "Descrizione"
           header: "Intestazione"
+          hover_to_see: "Passa il mouse per vedere una descrizione"
diff --git a/plugins/styleguide/config/locales/client.zh_CN.yml b/plugins/styleguide/config/locales/client.zh_CN.yml
index 67acc94a8f..0d25352e63 100644
--- a/plugins/styleguide/config/locales/client.zh_CN.yml
+++ b/plugins/styleguide/config/locales/client.zh_CN.yml
@@ -90,5 +90,5 @@ zh_CN:
         rich_tooltip:
           title: "富工具提示"
           description: "描述"
-          header: "页眉"
-          hover_to_see: "悬停查看工具提示"
+          header: "标头"
+          hover_to_see: "悬停以查看工具提示"
diff --git a/public/403.cs.html b/public/403.cs.html
index d48a37e025..5ef5374179 100644
--- a/public/403.cs.html
+++ b/public/403.cs.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Toto nemůžete udělat (403)</title>
+  <title>To nemůžete (403)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,7 +20,7 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>Nemůžete zobrazit tento zdroj!</p>
+    <p>Tento zdroj nelze zobrazit!</p>
 
     <p>Toto bude nahrazeno volitelnou Discourse stránkou 403.</p>
   </div>

From 6b788d7329c454915e61cbac70314743918e6cd9 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 19 Oct 2022 18:54:32 +0300
Subject: [PATCH 221/332] FIX: Skip all post validations if necessary (#18625)

When PostRevisor is called with 'skip_validations: true' it can save
the post twice and one of the calls passes the correct 'validate: false'
argument, but the other one does not.
---
 lib/post_revisor.rb           |  2 +-
 spec/lib/post_revisor_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index d38cfa3df6..7a79689566 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -560,7 +560,7 @@ class PostRevisor
       @post.last_editor_id = PostRevision.where(post_id: @post.id).order(number: :desc).pluck_first(:user_id) || @post.user_id
       @post.version -= 1
       @post.public_version -= 1
-      @post.save
+      @post.save(validate: @validate_post)
     else
       revision.save
     end
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index 19f40a6b8b..4d32af66fc 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -1303,6 +1303,20 @@ RSpec.describe PostRevisor do
           .and change { DraftSequence.where(user_id: user.id, draft_key: draft_key).first.sequence }.by(1)
       end
     end
+
+    context 'when skipping validations' do
+      fab!(:post) { Fabricate(:post, raw: 'aaa', skip_validation: true) }
+
+      it 'can revise multiple times and remove unnecessary revisions' do
+        subject.revise!(admin, { raw: 'bbb' }, skip_validations: true)
+        expect(post.errors).to be_empty
+
+        # Revert to old version which was invalid to destroy previously created
+        # post revision and trigger another post save.
+        subject.revise!(admin, { raw: 'aaa' }, skip_validations: true)
+        expect(post.errors).to be_empty
+      end
+    end
   end
 
   context 'when the review_every_post setting is enabled' do

From 58e59e357964533c2734b054e78f5c0824ca60f8 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 19 Oct 2022 17:04:49 +0100
Subject: [PATCH 222/332] DEV: Remove all use of Ember/jQuery globals in core
 (#18670)

---
 .../discourse-common/addon/config/environment.js         | 9 +++------
 .../discourse-common/addon/lib/legacy-resolver.js        | 2 +-
 .../javascripts/discourse-common/addon/resolver.js       | 2 +-
 .../javascripts/discourse/app/components/d-tooltip.js    | 2 +-
 .../discourse/app/components/reviewable-item.js          | 3 +--
 .../discourse/app/initializers/ember-events.js           | 3 ++-
 .../app/initializers/ember-link-component-extension.js   | 2 +-
 app/assets/javascripts/discourse/app/lib/click-track.js  | 2 +-
 app/assets/javascripts/discourse/app/lib/formatter.js    | 2 +-
 app/assets/javascripts/discourse/app/lib/lightbox.js     | 3 +--
 .../javascripts/discourse/app/lib/link-hashtags.js       | 2 +-
 .../javascripts/discourse/app/lib/link-mentions.js       | 2 +-
 .../javascripts/discourse/app/lib/plugin-connectors.js   | 3 +--
 .../app/pre-initializers/theme-errors-handler.js         | 2 +-
 .../tests/acceptance/custom-html-template-test.js        | 3 +--
 .../javascripts/discourse/tests/acceptance/modal-test.js | 5 +----
 .../acceptance/plugin-outlet-connector-class-test.js     | 7 +------
 .../tests/acceptance/plugin-outlet-decorator-test.js     | 5 +----
 .../acceptance/plugin-outlet-multi-template-test.js      | 5 +----
 .../acceptance/plugin-outlet-single-template-test.js     | 3 +--
 .../discourse/tests/helpers/select-kit-helper.js         | 2 +-
 app/assets/javascripts/discourse/tests/setup-tests.js    | 2 +-
 .../javascripts/discourse/tests/test-boot-ember-cli.js   | 2 +-
 .../discourse/tests/unit/ember/resolver-test.js          | 5 +----
 24 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
index cc5f76fe17..f4dc97ced1 100644
--- a/app/assets/javascripts/discourse-common/addon/config/environment.js
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -13,18 +13,15 @@ export function setEnvironment(e) {
 }
 
 export function isTesting() {
-  // eslint-disable-next-line no-undef
-  return Ember.testing || environment === "testing";
+  return environment === "testing";
 }
 
 // Generally means "before we migrated to Ember CLI"
-// eslint-disable-next-line no-undef
-let _isLegacy = Ember.VERSION.startsWith("3.12");
 export function isLegacyEmber() {
-  deprecated("`isLegacyEmber()` is now deprecated and always returns true", {
+  deprecated("`isLegacyEmber()` is now deprecated and always returns false", {
     dropFrom: "3.0.0.beta1",
   });
-  return _isLegacy;
+  return false;
 }
 
 export function isDevelopment() {
diff --git a/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js b/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js
index 66cc058216..6ac223c53a 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js
@@ -1,4 +1,4 @@
-/* global Ember */
+import Ember from "ember";
 import { classify, dasherize, decamelize } from "@ember/string";
 import deprecated from "discourse-common/lib/deprecated";
 import { findHelper } from "discourse-common/lib/helpers";
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index 7fc67738b0..2c18d4fb7c 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -1,4 +1,4 @@
-/* global Ember */
+import Ember from "ember";
 import { dasherize, decamelize } from "@ember/string";
 import deprecated from "discourse-common/lib/deprecated";
 import { findHelper } from "discourse-common/lib/helpers";
diff --git a/app/assets/javascripts/discourse/app/components/d-tooltip.js b/app/assets/javascripts/discourse/app/components/d-tooltip.js
index e462e2d542..cb88fd9cef 100644
--- a/app/assets/javascripts/discourse/app/components/d-tooltip.js
+++ b/app/assets/javascripts/discourse/app/components/d-tooltip.js
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import { schedule } from "@ember/runloop";
 import tippy from "tippy.js";
+import Ember from "ember";
 
 export default class DiscourseTooltip extends Component {
   tagName = "";
@@ -20,7 +21,6 @@ export default class DiscourseTooltip extends Component {
       // Ember.ViewUtils.getViewBounds is a private API,
       // but it's not going to be dropped without a public deprecation warning,
       // see: https://stackoverflow.com/a/50125938/3206146
-      // eslint-disable-next-line no-undef
       const viewBounds = Ember.ViewUtils.getViewBounds(this);
       const element = viewBounds.firstNode;
       const parent = viewBounds.parentElement;
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 2ce56fd43b..fed71c9789 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -9,6 +9,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { action, set } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 import { inject as service } from "@ember/service";
+import Ember from "ember";
 
 let _components = {};
 
@@ -108,9 +109,7 @@ export default Component.extend({
     let dasherized = dasherize(type);
     let templatePath = `components/${dasherized}`;
     let template =
-      // eslint-disable-next-line no-undef
       Ember.TEMPLATES[`${templatePath}`] ||
-      // eslint-disable-next-line no-undef
       Ember.TEMPLATES[`javascripts/${templatePath}`];
     _components[type] = template ? dasherized : null;
     return _components[type];
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
index 4d3aafaf25..231b01712c 100644
--- a/app/assets/javascripts/discourse/app/initializers/ember-events.js
+++ b/app/assets/javascripts/discourse/app/initializers/ember-events.js
@@ -1,3 +1,5 @@
+import Ember from "ember";
+
 let initializedOnce = false;
 
 export default {
@@ -10,7 +12,6 @@ export default {
       return;
     }
 
-    // eslint-disable-next-line no-undef
     Ember.EventDispatcher.reopen({
       events: {
         touchend: "touchEnd",
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js b/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
index c94eaae550..9c2b8e768e 100644
--- a/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
+++ b/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
@@ -1,3 +1,4 @@
+import Ember from "ember";
 let initializedOnce = false;
 
 export default {
@@ -8,7 +9,6 @@ export default {
       return;
     }
 
-    // eslint-disable-next-line no-undef
     Ember.LinkComponent.reopen({
       attributeBindings: ["name"],
     });
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index bbce8cdcc6..fffea0068e 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -10,9 +10,9 @@ import { selectedText } from "discourse/lib/utilities";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import deprecated from "discourse-common/lib/deprecated";
 import { getOwner } from "discourse-common/lib/get-owner";
+import jQuery from "jquery";
 
 export function isValidLink(link) {
-  // eslint-disable-next-line no-undef
   if (link instanceof jQuery) {
     link = link[0];
 
diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js
index 7410bb05c4..8465df26a1 100644
--- a/app/assets/javascripts/discourse/app/lib/formatter.js
+++ b/app/assets/javascripts/discourse/app/lib/formatter.js
@@ -1,6 +1,7 @@
 import { helperContext, makeArray } from "discourse-common/lib/helpers";
 import deprecated from "discourse-common/lib/deprecated";
 import I18n from "I18n";
+import jQuery from "jquery";
 
 export function shortDate(date) {
   return moment(date).format(I18n.t("dates.medium.date_year"));
@@ -50,7 +51,6 @@ export function longDateNoYear(dt) {
 }
 
 export function updateRelativeAge(elems) {
-  // eslint-disable-next-line no-undef
   if (elems instanceof jQuery) {
     elems = elems.toArray();
     deprecated("updateRelativeAge now expects a DOM NodeList", {
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js
index 39d2d156ea..27704d0fcd 100644
--- a/app/assets/javascripts/discourse/app/lib/lightbox.js
+++ b/app/assets/javascripts/discourse/app/lib/lightbox.js
@@ -34,8 +34,7 @@ export default function (elem, siteSettings) {
       mainClass: "mfp-zoom-in",
       tClose: I18n.t("lightbox.close"),
       tLoading: spinnerHTML,
-      // eslint-disable-next-line no-undef
-      prependTo: Ember.testing && document.getElementById("ember-testing"),
+      prependTo: isTesting() && document.getElementById("ember-testing"),
 
       gallery: {
         enabled: true,
diff --git a/app/assets/javascripts/discourse/app/lib/link-hashtags.js b/app/assets/javascripts/discourse/app/lib/link-hashtags.js
index 9d4201b3c1..5dee24413c 100644
--- a/app/assets/javascripts/discourse/app/lib/link-hashtags.js
+++ b/app/assets/javascripts/discourse/app/lib/link-hashtags.js
@@ -2,13 +2,13 @@ import deprecated from "discourse-common/lib/deprecated";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
+import jQuery from "jquery";
 
 const categoryHashtags = {};
 const tagHashtags = {};
 const checkedHashtags = new Set();
 
 export function linkSeenHashtags(elem) {
-  // eslint-disable-next-line no-undef
   if (elem instanceof jQuery) {
     elem = elem[0];
 
diff --git a/app/assets/javascripts/discourse/app/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js
index 5d1cf91889..0ce78017c6 100644
--- a/app/assets/javascripts/discourse/app/lib/link-mentions.js
+++ b/app/assets/javascripts/discourse/app/lib/link-mentions.js
@@ -3,6 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 import { formatUsername } from "discourse/lib/utilities";
 import getURL from "discourse-common/lib/get-url";
 import { userPath } from "discourse/lib/url";
+import jQuery from "jquery";
 
 let maxGroupMention;
 
@@ -67,7 +68,6 @@ function updateFound(mentions, usernames) {
 }
 
 export function linkSeenMentions(elem, siteSettings) {
-  // eslint-disable-next-line no-undef
   if (elem instanceof jQuery) {
     elem = elem[0];
 
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
index bcee944c05..16ff7a63a6 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
@@ -1,5 +1,6 @@
 import { buildRawConnectorCache } from "discourse-common/lib/raw-templates";
 import deprecated from "discourse-common/lib/deprecated";
+import Ember from "ember";
 
 let _connectorCache;
 let _rawConnectorCache;
@@ -65,14 +66,12 @@ function findClass(outletName, uniqueName) {
 function buildConnectorCache() {
   _connectorCache = {};
 
-  // eslint-disable-next-line no-undef
   findOutlets(Ember.TEMPLATES, (outletName, resource, uniqueName) => {
     _connectorCache[outletName] = _connectorCache[outletName] || [];
 
     _connectorCache[outletName].push({
       outletName,
       templateName: resource.replace("javascripts/", ""),
-      // eslint-disable-next-line no-undef
       template: Ember.TEMPLATES[resource],
       classNames: `${outletName}-outlet ${uniqueName}`,
       connectorClass: findClass(outletName, uniqueName),
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js b/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
index 3b4159a28b..4299d09233 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
@@ -8,6 +8,7 @@ import identifySource, {
   consolePrefix,
   getThemeInfo,
 } from "discourse/lib/source-identifier";
+import Ember from "ember";
 
 const showingErrors = new Set();
 
@@ -52,7 +53,6 @@ function reportToLogster(name, error) {
   };
 
   // TODO: To be moved out into a logster-provided lib
-  // eslint-disable-next-line no-undef
   Ember.$.ajax(getURL("/logs/report_js_error"), {
     data,
     type: "POST",
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
index ac57b552a8..117084efd7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
@@ -2,15 +2,14 @@ import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
+import Ember from "ember";
 
 acceptance("CustomHTML template", function (needs) {
   needs.hooks.beforeEach(() => {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES["top"] = hbs`<span class='top-span'>TOP</span>`;
   });
 
   needs.hooks.afterEach(() => {
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES["top"];
   });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
index f585a83ed2..f2257ab9f3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
@@ -10,6 +10,7 @@ import { test } from "qunit";
 import I18n from "I18n";
 import { hbs } from "ember-cli-htmlbars";
 import showModal from "discourse/lib/show-modal";
+import Ember from "ember";
 
 acceptance("Modal", function (needs) {
   let _translations;
@@ -53,7 +54,6 @@ acceptance("Modal", function (needs) {
     await triggerKeyEvent("#main-outlet", "keydown", "Escape");
     assert.ok(!exists(".d-modal:visible"), "ESC should close the modal");
 
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       "modal/not-dismissable"
     ] = hbs`{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}`;
@@ -78,7 +78,6 @@ acceptance("Modal", function (needs) {
   });
 
   test("rawTitle in modal panels", async function (assert) {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES["modal/test-raw-title-panels"] = hbs``;
     const panels = [
       { id: "test1", rawTitle: "Test 1" },
@@ -97,9 +96,7 @@ acceptance("Modal", function (needs) {
   });
 
   test("modal title", async function (assert) {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES["modal/test-title"] = hbs``;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       "modal/test-title-with-body"
     ] = hbs`{{#d-modal-body}}test{{/d-modal-body}}`;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index 09f3e59226..19e6c5d401 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -9,6 +9,7 @@ import { action } from "@ember/object";
 import { extraConnectorClass } from "discourse/lib/plugin-connectors";
 import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
+import Ember from "ember";
 
 const PREFIX = "javascripts/single-test/connectors";
 
@@ -48,29 +49,23 @@ acceptance("Plugin Outlet - Connector Class", function (needs) {
       },
     });
 
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hello`
     ] = hbs`<span class='hello-username'>{{model.username}}</span>
         <button class='say-hello' {{on "click" (action "sayHello")}}></button>
         <span class='hello-result'>{{hello}}</span>`;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/hi`
     ] = hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
         <span class='hi-result'>{{hi}}</span>`;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       `${PREFIX}/user-profile-primary/dont-render`
     ] = hbs`I'm not rendered!`;
   });
 
   needs.hooks.afterEach(() => {
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/hello`];
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/hi`];
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/dont-render`];
   });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
index c421c47769..c287449f09 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
@@ -7,6 +7,7 @@ import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import Ember from "ember";
 
 const PREFIX = "javascripts/single-test/connectors";
 
@@ -14,9 +15,7 @@ acceptance("Plugin Outlet - Decorator", function (needs) {
   needs.user();
 
   needs.hooks.beforeEach(() => {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[`${PREFIX}/discovery-list-container-top/foo`] = hbs`FOO`;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[`${PREFIX}/discovery-list-container-top/bar`] = hbs`BAR`;
 
     withPluginApi("0.8.38", (api) => {
@@ -39,9 +38,7 @@ acceptance("Plugin Outlet - Decorator", function (needs) {
   });
 
   needs.hooks.afterEach(() => {
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[`${PREFIX}/discovery-list-container-top/foo`];
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[`${PREFIX}/discovery-list-container-top/bar`];
   });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
index 2c1ced058a..b5e70c3a5a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
@@ -6,6 +6,7 @@ import {
 import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
+import Ember from "ember";
 
 const HELLO = "javascripts/multi-test/connectors/user-profile-primary/hello";
 const GOODBYE =
@@ -13,16 +14,12 @@ const GOODBYE =
 
 acceptance("Plugin Outlet - Multi Template", function (needs) {
   needs.hooks.beforeEach(() => {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[HELLO] = hbs`<span class='hello-span'>Hello</span>`;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[GOODBYE] = hbs`<span class='bye-span'>Goodbye</span>`;
   });
 
   needs.hooks.afterEach(() => {
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[HELLO];
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[GOODBYE];
   });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
index 6647628d6b..1f9e06d096 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
@@ -6,20 +6,19 @@ import {
 import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
+import Ember from "ember";
 
 const CONNECTOR =
   "javascripts/single-test/connectors/user-profile-primary/hello";
 
 acceptance("Plugin Outlet - Single Template", function (needs) {
   needs.hooks.beforeEach(() => {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[
       CONNECTOR
     ] = hbs`<span class='hello-username'>{{model.username}}</span>`;
   });
 
   needs.hooks.afterEach(() => {
-    // eslint-disable-next-line no-undef
     delete Ember.TEMPLATES[CONNECTOR];
   });
 
diff --git a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
index 149cc9c117..648bcaa21f 100644
--- a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
+++ b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
@@ -2,6 +2,7 @@ import { click, fillIn, triggerEvent } from "@ember/test-helpers";
 import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { isEmpty } from "@ember/utils";
 import { moduleForComponent } from "ember-qunit";
+import jQuery from "jquery";
 
 function checkSelectKitIsNotExpanded(selector) {
   if (query(selector).classList.contains("is-expanded")) {
@@ -65,7 +66,6 @@ async function keyboardHelper(value, target, selector) {
 
   if (value === "selectAll") {
     // special casing the only one not working with triggerEvent
-    // eslint-disable-next-line no-undef
     const event = jQuery.Event("keydown");
     event.key = "A";
     event.keyCode = 65;
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index 4b76abc502..e5de47408f 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -39,6 +39,7 @@ import { disableCloaking } from "discourse/widgets/post-stream";
 import { clearState as clearPresenceState } from "discourse/tests/helpers/presence-pretender";
 import { addModuleExcludeMatcher } from "ember-cli-test-loader/test-support/index";
 import SiteSettingService from "discourse/services/site-settings";
+import jQuery from "jquery";
 
 const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
@@ -389,7 +390,6 @@ export default function setupTests(config) {
   addModuleExcludeMatcher((name) => !shouldLoadModule(name));
 
   // forces 0 as duration for all jquery animations
-  // eslint-disable-next-line no-undef
   jQuery.fx.off = true;
 
   setupToolbar();
diff --git a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
index 66bf28a39e..b52cc11acb 100644
--- a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
+++ b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
@@ -4,6 +4,7 @@ import { start } from "ember-qunit";
 import loadEmberExam from "ember-exam/test-support/load";
 import * as QUnit from "qunit";
 import { setup } from "qunit-dom";
+import Ember from "ember";
 
 setEnvironment("testing");
 
@@ -27,7 +28,6 @@ document.addEventListener("discourse-booted", () => {
   const skipCore = params.get("qunit_skip_core") === "1";
   const disableAutoStart = params.get("qunit_disable_auto_start") === "1";
 
-  // eslint-disable-next-line no-undef
   Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION = false;
 
   document.body.insertAdjacentHTML(
diff --git a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
index ab63301194..14aafdb325 100644
--- a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
@@ -1,5 +1,6 @@
 import { buildResolver, setResolverOption } from "discourse-common/resolver";
 import { module, test } from "qunit";
+import Ember from "ember";
 
 let originalTemplates;
 let resolver;
@@ -12,7 +13,6 @@ function lookupTemplate(assert, name, expectedTemplate, message) {
 
 function setTemplates(lookupTemplateStrings) {
   lookupTemplateStrings.forEach(function (lookupTemplateString) {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES[lookupTemplateString] = lookupTemplateString;
   });
 }
@@ -21,9 +21,7 @@ const DiscourseResolver = buildResolver("discourse");
 
 module("Unit | Ember | resolver", function (hooks) {
   hooks.beforeEach(function () {
-    // eslint-disable-next-line no-undef
     originalTemplates = Ember.TEMPLATES;
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES = {};
 
     resolver = DiscourseResolver.create({
@@ -32,7 +30,6 @@ module("Unit | Ember | resolver", function (hooks) {
   });
 
   hooks.afterEach(function () {
-    // eslint-disable-next-line no-undef
     Ember.TEMPLATES = originalTemplates;
   });
 

From a96f22cd67ff4fe1ce8d77071c257d116296f638 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 19 Oct 2022 12:07:44 -0400
Subject: [PATCH 223/332] FIX: Calculate header offset once on load (#18669)

Multiple things in the app need the height of the header to be correct (for example, scrolling to a post), so we need the header offset calculation. However, we shouldn't be calculating it on scroll, it's too resource intensive and it causes flickering on iPads (and possible other devices too).

This commit removes header offset calculation on scroll and adds a one-time calculation as soon as the header is first rendered. This ensures that users get scrolled to the correct post even if they open it in a new tab.
---
 .../discourse/app/components/site-header.js   | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index 0b902d2563..55ba73ad52 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -177,19 +177,6 @@ const SiteHeaderComponent = MountWidget.extend(
         this.docAt = header.offsetTop;
       }
 
-      const headerRect = header.getBoundingClientRect();
-      let headerOffsetCalc = headerRect.top + headerRect.height;
-
-      if (window.scrollY < 0) {
-        headerOffsetCalc += window.scrollY;
-      }
-
-      const newValue = `${headerOffsetCalc}px`;
-      if (newValue !== this.currentHeaderOffsetValue) {
-        this.currentHeaderOffsetValue = newValue;
-        document.documentElement.style.setProperty("--header-offset", newValue);
-      }
-
       const main = document.querySelector(".ember-application");
       const offsetTop = main ? main.offsetTop : 0;
       const offset = window.pageYOffset - offsetTop;
@@ -520,9 +507,17 @@ export default SiteHeaderComponent.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    if ("ResizeObserver" in window) {
-      const header = document.querySelector(".d-header-wrap");
+    const header = document.querySelector(".d-header-wrap");
+    if (header) {
+      schedule("afterRender", () => {
+        document.documentElement.style.setProperty(
+          "--header-offset",
+          `${header.offsetHeight}px`
+        );
+      });
+    }
 
+    if ("ResizeObserver" in window) {
       this._resizeObserver = new ResizeObserver((entries) => {
         for (let entry of entries) {
           if (entry.contentRect) {

From 9a4072fe319ab89fdc14e0f205822503fa6444f1 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 19 Oct 2022 18:10:06 +0100
Subject: [PATCH 224/332] DEV: Load plugin CSS in tests (#18668)

---
 .../discourse/lib/bootstrap-json/index.js     |  2 +
 .../scripts/discourse-test-load-dynamic-js.js | 50 +++++++++++--------
 app/assets/javascripts/discourse/testem.js    |  6 +++
 .../javascripts/discourse/tests/index.html    |  1 +
 app/controllers/bootstrap_controller.rb       | 19 ++++++-
 config/routes.rb                              |  3 ++
 .../widgets/discourse-poll-test.js            | 12 ++++-
 7 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
index b2b243fdc5..1c778d80a0 100644
--- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
+++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
@@ -429,6 +429,8 @@ module.exports = {
             `<script src="${config.rootURL}assets/plugins/test/${directoryName}_tests.js" data-discourse-plugin="${pluginName}"></script>`
         )
         .join("\n");
+    } else if (shouldLoadPluginTestJs() && type === "test-plugin-css") {
+      return `<link rel="stylesheet" href="${config.rootURL}bootstrap/plugin-css-for-tests.css" data-discourse-plugin="_all" />`;
     }
   },
 
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
index fc0237c622..8041b5141b 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
@@ -3,26 +3,32 @@ const dynamicJsTemplate = document.querySelector("#dynamic-test-js");
 const params = new URLSearchParams(document.location.search);
 const skipPlugins = params.get("qunit_skip_plugins");
 
-for (const element of dynamicJsTemplate.content.childNodes) {
-  if (skipPlugins && element.dataset?.discoursePlugin) {
-    continue;
+(async function setup() {
+  for (const element of dynamicJsTemplate.content.childNodes) {
+    if (skipPlugins && element.dataset?.discoursePlugin) {
+      continue;
+    }
+
+    if (
+      element.tagName === "SCRIPT" &&
+      element.innerHTML.includes("EmberENV.TESTS_FILE_LOADED")
+    ) {
+      // Inline script introduced by ember-cli. Incompatible with CSP and our custom plugin JS loading system
+      // https://github.com/ember-cli/ember-cli/blob/04a38fda2c/lib/utilities/ember-app-utils.js#L131
+      // We re-implement in test-boot-ember-cli.js
+      continue;
+    }
+
+    const clone = element.cloneNode(true);
+
+    if (clone.tagName === "SCRIPT") {
+      clone.async = false;
+    }
+
+    document.querySelector("discourse-dynamic-test-js").appendChild(clone);
+
+    if (clone.tagName === "LINK" && clone["rel"] === "stylesheet") {
+      await new Promise((resolve) => (clone.onload = resolve));
+    }
   }
-
-  if (
-    element.tagName === "SCRIPT" &&
-    element.innerHTML.includes("EmberENV.TESTS_FILE_LOADED")
-  ) {
-    // Inline script introduced by ember-cli. Incompatible with CSP and our custom plugin JS loading system
-    // https://github.com/ember-cli/ember-cli/blob/04a38fda2c/lib/utilities/ember-app-utils.js#L131
-    // We re-implement in test-boot-ember-cli.js
-    continue;
-  }
-
-  const clone = element.cloneNode(true);
-
-  if (clone.tagName === "SCRIPT") {
-    clone.async = false;
-  }
-
-  document.querySelector("discourse-dynamic-test-js").appendChild(clone);
-}
+})();
diff --git a/app/assets/javascripts/discourse/testem.js b/app/assets/javascripts/discourse/testem.js
index fbc3951418..1bcc31d2cd 100644
--- a/app/assets/javascripts/discourse/testem.js
+++ b/app/assets/javascripts/discourse/testem.js
@@ -105,5 +105,11 @@ if (process.argv.includes("-t")) {
     "/plugins/": {
       target,
     },
+    "/bootstrap/plugin-css-for-tests.css": {
+      target,
+    },
+    "/stylesheets/": {
+      target,
+    },
   };
 }
diff --git a/app/assets/javascripts/discourse/tests/index.html b/app/assets/javascripts/discourse/tests/index.html
index 3277f0b1cc..c286633609 100644
--- a/app/assets/javascripts/discourse/tests/index.html
+++ b/app/assets/javascripts/discourse/tests/index.html
@@ -52,6 +52,7 @@
     <script src="{{rootURL}}assets/wizard.js"></script>
 
     <template id="dynamic-test-js">
+      {{content-for "test-plugin-css"}}
       {{content-for "test-plugin-js"}}
       <script defer src="{{rootURL}}assets/test-helpers.js"></script>
       <script defer src="{{rootURL}}assets/core-tests.js"></script>
diff --git a/app/controllers/bootstrap_controller.rb b/app/controllers/bootstrap_controller.rb
index 235308de3f..8f7c4b4f62 100644
--- a/app/controllers/bootstrap_controller.rb
+++ b/app/controllers/bootstrap_controller.rb
@@ -3,7 +3,7 @@
 class BootstrapController < ApplicationController
   include ApplicationHelper
 
-  skip_before_action :redirect_to_login_if_required
+  skip_before_action :redirect_to_login_if_required, :check_xhr
 
   # This endpoint allows us to produce the data required to start up Discourse via JSON API,
   # so that you don't have to scrape the HTML for `data-*` payloads
@@ -98,6 +98,23 @@ class BootstrapController < ApplicationController
     render_json_dump(bootstrap: bootstrap)
   end
 
+  def plugin_css_for_tests
+    urls = Discourse.find_plugin_css_assets(
+      include_disabled: true,
+      desktop_view: true,
+    ).map do |target|
+      details = Stylesheet::Manager.new().stylesheet_details(target, 'all')
+      details[0][:new_href]
+    end
+
+    stylesheet = <<~CSS
+      /* For use in tests only - `@import`s all plugin stylesheets */
+      #{urls.map { |url| "@import \"#{url}\";" }.join("\n") }
+    CSS
+
+    render plain: stylesheet, content_type: 'text/css'
+  end
+
 private
   def add_scheme(scheme_id, media, css_class)
     return if scheme_id.to_i == -1
diff --git a/config/routes.rb b/config/routes.rb
index cbb1ee5197..0092fec3f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,9 @@ Discourse::Application.routes.draw do
     get "/404-body" => "exceptions#not_found_body"
 
     get "/bootstrap" => "bootstrap#index"
+    if Rails.env.test? || Rails.env.development?
+      get "/bootstrap/plugin-css-for-tests.css" => "bootstrap#plugin_css_for_tests"
+    end
 
     post "webhooks/aws" => "webhooks#aws"
     post "webhooks/mailgun"  => "webhooks#mailgun"
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-test.js b/plugins/poll/test/javascripts/widgets/discourse-poll-test.js
index b75ada4960..546392129a 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-test.js
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-test.js
@@ -1,7 +1,12 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { click, render } from "@ember/test-helpers";
-import { count, exists, query } from "discourse/tests/helpers/qunit-helpers";
+import {
+  count,
+  exists,
+  query,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import EmberObject from "@ember/object";
@@ -85,7 +90,10 @@ module("Integration | Component | Widget | discourse-poll", function (hooks) {
     await click("li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']");
     assert.strictEqual(requests, 1);
     assert.strictEqual(count(".chosen"), 1);
-    assert.strictEqual(query(".chosen").innerText, "100%yes");
+    assert.deepEqual(
+      Array.from(queryAll(".chosen span")).map((span) => span.innerText),
+      ["100%", "yes"]
+    );
 
     await click(".toggle-results");
     assert.strictEqual(

From 0f7d1f2420dfdb8f54d971e4bbd7a5fea009e89e Mon Sep 17 00:00:00 2001
From: maiki <maiki@discourse.org>
Date: Wed, 19 Oct 2022 10:53:09 -0700
Subject: [PATCH 225/332] UX: correct capitalization (#18671)

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

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a5189f4363..6bc5ea925c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5793,7 +5793,7 @@ en:
       embedding:
         get_started: "If you'd like to embed Discourse on another website, begin by adding its host."
         confirm_delete: "Are you sure you want to delete that host?"
-        sample: "Paste the following HTML code into your site to create and embed discourse topics. Replace <b>REPLACE_ME</b> with the canonical URL of the page you are embedding it on."
+        sample: "Paste the following HTML code into your site to create and embed Discourse topics. Replace <b>REPLACE_ME</b> with the canonical URL of the page you are embedding it on."
         title: "Embedding"
         host: "Allowed Hosts"
         class_name: "Class Name"

From 09e4eb41374d2125b3d8f3aaff6bb9335c90c5eb Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 19 Oct 2022 20:43:58 +0200
Subject: [PATCH 226/332] DEV: Introduce a `@debounce(delay)` decorator
 (#18667)

An example from tests:

```js
class TestStub {
  counter = 0;

  @debounce(50)
  increment() {
    this.counter++;
  }
}

const stub = new TestStub();

stub.increment();
stub.increment();
stub.increment();
await settled();

assert.strictEqual(stub.counter, 1);
```
---
 .../addon/utils/decorators.js                 | 19 +++++++
 .../tests/unit/utils/decorators-test.js       | 54 ++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
index b847ad830e..f9544d9176 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
@@ -36,6 +36,7 @@ import extractValue from "discourse-common/utils/extract-value";
 import handleDescriptor from "discourse-common/utils/handle-descriptor";
 import isDescriptor from "discourse-common/utils/is-descriptor";
 import macroAlias from "discourse-common/utils/macro-alias";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 export default function discourseComputedDecorator(...params) {
   // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
@@ -87,6 +88,24 @@ export function readOnly(target, name, desc) {
   };
 }
 
+export function debounce(delay) {
+  return function (target, name, descriptor) {
+    return {
+      enumerable: descriptor.enumerable,
+      configurable: descriptor.configurable,
+      writable: descriptor.writable,
+      initializer() {
+        const originalFunction = descriptor.value;
+        const debounced = function (...args) {
+          return discourseDebounce(this, originalFunction, ...args, delay);
+        };
+
+        return debounced;
+      },
+    };
+  };
+}
+
 export const on = decoratorAlias(emberOn, "Can not `on` without event names");
 export const observes = decoratorAlias(
   observer,
diff --git a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
index 0563fc56d0..dc7598055e 100644
--- a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
@@ -1,12 +1,15 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import Component from "@ember/component";
-import { clearRender, render } from "@ember/test-helpers";
+import { clearRender, render, settled } from "@ember/test-helpers";
 import discourseComputed, {
   afterRender,
+  debounce,
+  observes,
 } from "discourse-common/utils/decorators";
 import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
+import EmberObject from "@ember/object";
 
 const fooComponent = Component.extend({
   classNames: ["foo-component"],
@@ -51,6 +54,24 @@ class NativeComponent extends Component {
   }
 }
 
+const TestStub = EmberObject.extend({
+  counter: 0,
+  otherCounter: 0,
+
+  @debounce(50)
+  increment(value) {
+    this.counter += value;
+  },
+
+  // Note: it only works in this particular order:
+  // `@observes()` first, then `@debounce()`
+  @observes("prop")
+  @debounce(50)
+  react() {
+    this.otherCounter++;
+  },
+});
+
 module("Unit | Utils | decorators", function (hooks) {
   setupRenderingTest(hooks);
 
@@ -58,7 +79,7 @@ module("Unit | Utils | decorators", function (hooks) {
     this.registry.register("component:foo-component", fooComponent);
     this.set("baz", 0);
 
-    await render(hbs`{{foo-component baz=baz}}`);
+    await render(hbs`<FooComponent @baz={{this.baz}} />`);
 
     assert.ok(exists(document.querySelector(".foo-component")));
     assert.strictEqual(this.baz, 1);
@@ -109,4 +130,33 @@ module("Unit | Utils | decorators", function (hooks) {
       "rerenders the component when arguments change"
     );
   });
+
+  test("debounce", async function (assert) {
+    const stub = TestStub.create();
+
+    stub.increment(1);
+    stub.increment(1);
+    stub.increment(1);
+    await settled();
+
+    assert.strictEqual(stub.counter, 1);
+
+    stub.increment(500);
+    stub.increment(1000);
+    stub.increment(5);
+    await settled();
+
+    assert.strictEqual(stub.counter, 6);
+  });
+
+  test("debounce works with @observe", async function (assert) {
+    const stub = TestStub.create();
+
+    stub.set("prop", 1);
+    stub.set("prop", 2);
+    stub.set("prop", 3);
+    await settled();
+
+    assert.strictEqual(stub.otherCounter, 1);
+  });
 });

From f1f2c1acd48293b481fd327b20cda066762d4ae0 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 19 Oct 2022 21:05:51 -0400
Subject: [PATCH 227/332] UX: extend horizontal user nav to all user pages
 (#18674)

---
 ...nces-nav.js => horizontal-overflow-nav.js} |  17 +-
 .../app/components/user-nav/activity-nav.hbs  |  47 +++++
 .../app/components/user-nav/messages-nav.hbs  |   4 +-
 .../components/user-nav/notifications-nav.hbs |  38 ++++
 .../components/user-nav/preferences-nav.hbs   | 180 +++++++-----------
 .../components/horizontal-overflow-nav.hbs    |  33 ++++
 .../discourse/app/templates/preferences.hbs   |  16 +-
 .../discourse/app/templates/user-invited.hbs  |   4 +-
 .../discourse/app/templates/user/activity.hbs |  59 +-----
 .../app/templates/user/notifications.hbs      |  58 ++----
 .../stylesheets/common/base/new-user.scss     |  18 +-
 11 files changed, 249 insertions(+), 225 deletions(-)
 rename app/assets/javascripts/discourse/app/components/{user-nav/preferences-nav.js => horizontal-overflow-nav.js} (85%)
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs
 create mode 100644 app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs
 create mode 100644 app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs

diff --git a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
similarity index 85%
rename from app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js
rename to app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
index 1c013766bd..79d0a06519 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.js
+++ b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
@@ -4,7 +4,7 @@ import { bind } from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
 
-export default class UserNavPreferencesNav extends Component {
+export default class HorizontalOverflowNav extends Component {
   @service site;
   @tracked hasScroll;
   @tracked hideRightScroll = false;
@@ -13,9 +13,14 @@ export default class UserNavPreferencesNav extends Component {
 
   @bind
   scrollToActive() {
-    document
-      .querySelector(".user-navigation-secondary a.active")
-      .scrollIntoView({ inline: "center" });
+    const activeElement = document.querySelector(
+      ".user-navigation-secondary a.active"
+    );
+
+    activeElement?.scrollIntoView({
+      block: "nearest",
+      inline: "center",
+    });
   }
 
   @bind
@@ -60,7 +65,7 @@ export default class UserNavPreferencesNav extends Component {
 
   @action
   horizScroll(element) {
-    let scrollSpeed = 50;
+    let scrollSpeed = 100;
     let siblingTarget = element.target.previousElementSibling;
 
     if (element.target.dataset.direction === "left") {
@@ -72,8 +77,6 @@ export default class UserNavPreferencesNav extends Component {
       siblingTarget.scrollLeft += scrollSpeed;
     }, 50);
 
-    this.scrollTimer;
-
     element.target.addEventListener("mouseup", this.stopScroll);
     element.target.addEventListener("mouseleave", this.stopScroll);
   }
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs
new file mode 100644
index 0000000000..0e641e33c4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs
@@ -0,0 +1,47 @@
+<DNavigationItem @route="userActivity.index">
+  {{d-icon "stream"}}
+  <span>{{i18n "user.filters.all"}}</span>
+</DNavigationItem>
+<DNavigationItem @route="userActivity.topics">
+  {{d-icon "list-ul"}}
+  <span>{{i18n "user_action_groups.4"}}</span>
+</DNavigationItem>
+<DNavigationItem @route="userActivity.replies">
+  {{d-icon "reply"}}
+  <span>{{i18n "user_action_groups.5"}}</span>
+</DNavigationItem>
+
+{{#if @user.showRead}}
+  <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
+    {{d-icon "history"}}
+    <span>{{i18n "user.read"}}</span>
+  </DNavigationItem>
+{{/if}}
+
+{{#if @user.showDrafts}}
+  <DNavigationItem @route="userActivity.drafts">
+    {{d-icon "pencil-alt"}}
+    <span>{{@draftLabel}}</span>
+  </DNavigationItem>
+{{/if}}
+
+{{#if (gt @model.pending_posts_count 0)}}
+  <DNavigationItem @route="userActivity.pending">
+    {{d-icon "clock"}}
+    <span>{{@pendingLabel}}</span>
+  </DNavigationItem>
+{{/if}}
+
+<DNavigationItem @route="userActivity.likesGiven">
+  {{d-icon "heart"}}
+  <span>{{i18n "user_action_groups.1"}}</span>
+</DNavigationItem>
+
+{{#if @user.showBookmarks}}
+  <DNavigationItem @route="userActivity.bookmarks">
+    {{d-icon "bookmark"}}
+    <span>{{i18n "user_action_groups.3"}}</span>
+  </DNavigationItem>
+{{/if}}
+
+<PluginOutlet @name="user-activity-bottom" @connectorTagName="li" @args={{hash model=@model}} />
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
index d88d8089b2..565e6c336c 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-nav.hbs
@@ -7,7 +7,7 @@
     </ol>
   {{/if}}
 
-  <ul class="messages-nav nav-pills action-list">
+  <HorizontalOverflowNav>
     {{#if @isPersonal}}
       <li class="messages-latest">
         <LinkTo @route="userPrivateMessages.index" @model={{@user}}>
@@ -99,7 +99,7 @@
     {{/if}}
 
     <PluginOutlet @name="user-messages-nav" @connectorTagName="li" @args={{hash model=@user}} />
-  </ul>
+  </HorizontalOverflowNav>
 
   {{#if this.site.desktopView}}
     <div class="navigation-controls">
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs
new file mode 100644
index 0000000000..167f727cf7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs
@@ -0,0 +1,38 @@
+<li>
+  <LinkTo @route="userNotifications.index">
+    {{d-icon "bell"}}
+    <span>{{i18n "user.filters.all"}}</span>
+  </LinkTo>
+</li>
+
+<li>
+  <LinkTo @route="userNotifications.responses">
+    {{d-icon "reply"}}
+    <span>{{i18n "user_action_groups.6"}}</span>
+  </LinkTo>
+</li>
+
+<li>
+  <LinkTo @route="userNotifications.likesReceived">
+    {{d-icon "heart"}}
+    <span>{{i18n "user_action_groups.2"}}</span>
+  </LinkTo>
+</li>
+
+{{#if this.siteSettings.enable_mentions}}
+  <li>
+    <LinkTo @route="userNotifications.mentions">
+      {{d-icon "at"}}
+      <span>{{i18n "user_action_groups.7"}}</span>
+    </LinkTo>
+  </li>
+{{/if}}
+
+<li>
+  <LinkTo @route="userNotifications.edits">
+    {{d-icon "pencil-alt"}}
+    <span>{{i18n "user_action_groups.11"}}</span>
+  </LinkTo>
+</li>
+
+<PluginOutlet @name="user-notifications-bottom" @connectorTagName="li" @args={{hash model=@model}} />
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
index a7fdca93e4..29e1c35c5d 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
@@ -1,106 +1,74 @@
-{{!-- template-lint-disable no-down-event-binding --}}
-
-<div class="user-navigation user-navigation-secondary {{if this.hasScroll "has-scroll"}}">
-  {{#if this.hasScroll}}
-    <a
-      role="button"
-      {{on "mousedown" this.horizScroll}}
-      data-direction="left"
-      class="nav-overflow__scroll-left btn-flat {{if this.hideLeftScroll "transparent"}}"
-    >
-      {{d-icon "chevron-left"}}
-    </a>
-  {{/if}}
-
-  <ul
-    {{did-insert this.scrollToActive}}
-    {{on-resize this.checkScroll}}
-    {{on "scroll" this.watchScroll}}
-    class="nav-pills action-list"
-  >
-    <li class="nav-account">
-      <LinkTo @route="preferences.account">
-        {{d-icon "user"}}
-        <span>{{i18n "user.preferences_nav.account"}}</span>
-      </LinkTo>
-    </li>
-    <li class="nav-security">
-      <LinkTo @route="preferences.security">
-        {{d-icon "lock"}}
-        <span>{{i18n "user.preferences_nav.security"}}</span>
-      </LinkTo>
-    </li>
-    <li class="nav-profile">
-      <LinkTo @route="preferences.profile">
-        {{d-icon "user"}}
-        <span>{{i18n "user.preferences_nav.profile"}}</span>
-      </LinkTo>
-    </li>
-    <li class="nav-emails">
-      <LinkTo @route="preferences.emails">
-        {{d-icon "envelope"}}
-        <span>{{i18n "user.preferences_nav.emails"}}</span>
-      </LinkTo>
-    </li>
-    <li class="nav-notifications">
-      <LinkTo @route="preferences.notifications">
-        {{d-icon "bell"}}
-        <span>{{i18n "user.preferences_nav.notifications"}}</span>
-      </LinkTo>
-    </li>
-    {{#if @model.can_change_tracking_preferences}}
-      <li class="indent nav-categories">
-        <LinkTo @route="preferences.categories">
-          {{d-icon "folder"}}
-          <span>{{i18n "user.preferences_nav.categories"}}</span>
-        </LinkTo>
-      </li>
-    {{/if}}
-    <li class="indent nav-users">
-      <LinkTo @route="preferences.users">
-        {{d-icon "users"}}
-        <span>{{i18n "user.preferences_nav.users"}}</span>
-      </LinkTo>
-    </li>
-    {{#if (and @model.can_change_tracking_preferences @siteSettings.tagging_enabled)}}
-      <li class="indent nav-tags">
-        <LinkTo @route="preferences.tags">
-          {{d-icon "tag"}}
-          <span>{{i18n "user.preferences_nav.tags"}}</span>
-        </LinkTo>
-      </li>
-    {{/if}}
-    <li class="nav-interface">
-      <LinkTo @route="preferences.interface">
-        {{d-icon "desktop"}}
-        <span>{{i18n "user.preferences_nav.interface"}}</span>
-      </LinkTo>
-    </li>
-    {{#if @siteSettings.enable_experimental_sidebar_hamburger}}
-      <li class="indent nav-sidebar">
-        <LinkTo @route="preferences.sidebar">
-          {{d-icon "bars"}}
-          <span>{{i18n "user.preferences_nav.sidebar"}}</span>
-        </LinkTo>
-      </li>
-    {{/if}}
-    <PluginOutlet @name="user-preferences-nav-under-interface" @connectorTagName="div" @args={{hash model=@model}} />
-    <li class="nav-apps">
-      <LinkTo @route="preferences.apps">
-        {{d-icon "mobile-alt"}}
-        <span>{{i18n "user.preferences_nav.apps"}}</span>
-      </LinkTo>
-    </li>
-    <PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=@model}} />
-  </ul>
-
-  {{#if this.hasScroll}}
-    <a
-      role="button"
-      {{on "mousedown" this.horizScroll}}
-      class="nav-overflow__scroll-right btn-flat {{if this.hideRightScroll "transparent"}}"
-    >
-      {{d-icon "chevron-right"}}
-    </a>
-  {{/if}}
-</div>
+<li class="nav-account">
+  <LinkTo @route="preferences.account">
+    {{d-icon "user"}}
+    <span>{{i18n "user.preferences_nav.account"}}</span>
+  </LinkTo>
+</li>
+<li class="nav-security">
+  <LinkTo @route="preferences.security">
+    {{d-icon "lock"}}
+    <span>{{i18n "user.preferences_nav.security"}}</span>
+  </LinkTo>
+</li>
+<li class="nav-profile">
+  <LinkTo @route="preferences.profile">
+    {{d-icon "user"}}
+    <span>{{i18n "user.preferences_nav.profile"}}</span>
+  </LinkTo>
+</li>
+<li class="nav-emails">
+  <LinkTo @route="preferences.emails">
+    {{d-icon "envelope"}}
+    <span>{{i18n "user.preferences_nav.emails"}}</span>
+  </LinkTo>
+</li>
+<li class="nav-notifications">
+  <LinkTo @route="preferences.notifications">
+    {{d-icon "bell"}}
+    <span>{{i18n "user.preferences_nav.notifications"}}</span>
+  </LinkTo>
+</li>
+{{#if @model.can_change_tracking_preferences}}
+  <li class="indent nav-categories">
+    <LinkTo @route="preferences.categories">
+      {{d-icon "folder"}}
+      <span>{{i18n "user.preferences_nav.categories"}}</span>
+    </LinkTo>
+  </li>
+{{/if}}
+<li class="indent nav-users">
+  <LinkTo @route="preferences.users">
+    {{d-icon "users"}}
+    <span>{{i18n "user.preferences_nav.users"}}</span>
+  </LinkTo>
+</li>
+{{#if (and @model.can_change_tracking_preferences @siteSettings.tagging_enabled)}}
+  <li class="indent nav-tags">
+    <LinkTo @route="preferences.tags">
+      {{d-icon "tag"}}
+      <span>{{i18n "user.preferences_nav.tags"}}</span>
+    </LinkTo>
+  </li>
+{{/if}}
+<li class="nav-interface">
+  <LinkTo @route="preferences.interface">
+    {{d-icon "desktop"}}
+    <span>{{i18n "user.preferences_nav.interface"}}</span>
+  </LinkTo>
+</li>
+{{#if @siteSettings.enable_experimental_sidebar_hamburger}}
+  <li class="indent nav-sidebar">
+    <LinkTo @route="preferences.sidebar">
+      {{d-icon "bars"}}
+      <span>{{i18n "user.preferences_nav.sidebar"}}</span>
+    </LinkTo>
+  </li>
+{{/if}}
+<PluginOutlet @name="user-preferences-nav-under-interface" @connectorTagName="div" @args={{hash model=@model}} />
+<li class="nav-apps">
+  <LinkTo @route="preferences.apps">
+    {{d-icon "mobile-alt"}}
+    <span>{{i18n "user.preferences_nav.apps"}}</span>
+  </LinkTo>
+</li>
+<PluginOutlet @name="user-preferences-nav" @connectorTagName="li" @args={{hash model=@model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs b/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
new file mode 100644
index 0000000000..d726eb8eef
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
@@ -0,0 +1,33 @@
+{{!-- template-lint-disable no-down-event-binding --}}
+
+<div class="horizontal-overflow-nav {{if this.hasScroll "has-scroll"}}">
+  {{#if this.hasScroll}}
+    <a
+      role="button"
+      {{on "mousedown" this.horizScroll}}
+      data-direction="left"
+      class="nav-overflow__scroll-left btn-flat {{if this.hideLeftScroll "transparent"}}"
+    >
+      {{d-icon "chevron-left"}}
+    </a>
+  {{/if}}
+
+  <ul
+    {{on-resize this.checkScroll}}
+    {{on "scroll" this.watchScroll}}
+    {{did-insert this.scrollToActive}}
+    class="nav-pills action-list"
+  >
+    {{yield}}
+  </ul>
+
+  {{#if this.hasScroll}}
+    <a
+      role="button"
+      {{on "mousedown" this.horizScroll}}
+      class="nav-overflow__scroll-right btn-flat {{if this.hideRightScroll "transparent"}}"
+    >
+      {{d-icon "chevron-right"}}
+    </a>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index acd0dd7e4b..b2aa84d502 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -1,12 +1,14 @@
 {{#if this.currentUser.redesigned_user_page_nav_enabled}}
   <DSection @pageClass="user-preferences" />
-
-  <UserNav::PreferencesNav
-    @user={{this.model}}
-    @viewingSelf={{this.viewingSelf}}
-    @model={{this.model}}
-    @siteSettings={{this.siteSettings}}
-  />
+  <div class="user-navigation user-navigation-secondary">
+    <HorizontalOverflowNav>
+      <UserNav::PreferencesNav
+          @user={{this.model}}
+          @viewingSelf={{this.viewingSelf}}
+          @model={{this.model}}
+          @siteSettings={{this.siteSettings}}/>
+    </HorizontalOverflowNav>
+  </div>
 {{else}}
   <DSection @pageClass="user-preferences" @class="user-secondary-navigation">
     <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited.hbs b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
index d634e12bf9..6824427a30 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
@@ -3,11 +3,11 @@
     <DSection @pageClass="user-invites" />
 
     <div class="user-navigation user-navigation-secondary">
-      <ul id="navigation-bar" class="nav-pills action-list">
+      <HorizontalOverflowNav>
         <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{this.pendingLabel}} />
         <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{this.expiredLabel}} />
         <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{this.redeemedLabel}} />
-      </ul>
+      </HorizontalOverflowNav>
     </div>
   {{else}}
     <DSection @class="user-secondary-navigation" @pageClass="user-invites">
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 51975ad67b..f75cd0c2d0 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -2,56 +2,17 @@
   <DSection @pageClass="user-activity" />
 
   <div class="user-navigation user-navigation-secondary">
-    <ul class="nav-pills action-list">
-      <DNavigationItem @route="userActivity.index">
-        {{d-icon "stream"}}
-        <span>{{i18n "user.filters.all"}}</span>
-      </DNavigationItem>
-      <DNavigationItem @route="userActivity.topics">
-        {{d-icon "list-ul"}}
-        <span>{{i18n "user_action_groups.4"}}</span>
-      </DNavigationItem>
-      <DNavigationItem @route="userActivity.replies">
-        {{d-icon "reply"}}
-        <span>{{i18n "user_action_groups.5"}}</span>
-      </DNavigationItem>
-
-      {{#if this.user.showRead}}
-        <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
-          {{d-icon "history"}}
-          <span>{{i18n "user.read"}}</span>
-        </DNavigationItem>
-      {{/if}}
-
-      {{#if this.user.showDrafts}}
-        <DNavigationItem @route="userActivity.drafts">
-          {{d-icon "pencil-alt"}}
-          <span>{{this.draftLabel}}</span>
-        </DNavigationItem>
-      {{/if}}
-
-      {{#if (gt this.model.pending_posts_count 0)}}
-        <DNavigationItem @route="userActivity.pending">
-          {{d-icon "clock"}}
-          <span>{{this.pendingLabel}}</span>
-        </DNavigationItem>
-      {{/if}}
-
-      <DNavigationItem @route="userActivity.likesGiven">
-        {{d-icon "heart"}}
-        <span>{{i18n "user_action_groups.1"}}</span>
-      </DNavigationItem>
-
-      {{#if this.user.showBookmarks}}
-        <DNavigationItem @route="userActivity.bookmarks">
-          {{d-icon "bookmark"}}
-          <span>{{i18n "user_action_groups.3"}}</span>
-        </DNavigationItem>
-      {{/if}}
-
-      <PluginOutlet @name="user-activity-bottom" @connectorTagName="li" @args={{hash model=this.model}} />
-    </ul>
+    <HorizontalOverflowNav>
+      <UserNav::ActivityNav
+        @user={{this.user}}
+        @viewingSelf={{this.viewingSelf}}
+        @model={{this.model}}
+        @siteSettings={{this.siteSettings}}
+        @draftLabel={{this.draftLabel}}
+        @pendingLabel={{this.pendingLabel}}/>
+    </HorizontalOverflowNav>
   </div>
+
 {{else}}
   <DSection @pageClass="user-activity" @class="user-secondary-navigation" @scrollTop={{false}}>
     <nav role="navigation">
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 32654afb22..afd04ce81b 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -1,54 +1,18 @@
 {{#if this.currentUser.redesigned_user_page_nav_enabled}}
   <DSection @pageClass="user-notifications" />
-
   <div class="user-navigation user-navigation-secondary">
-    <ul id="navigation-bar" class="notifications-nav nav-pills action-list">
-      <li>
-        <LinkTo @route="userNotifications.index">
-          {{d-icon "bell"}}
-          <span>{{i18n "user.filters.all"}}</span>
-        </LinkTo>
-      </li>
-
-      <li>
-        <LinkTo @route="userNotifications.responses">
-          {{d-icon "reply"}}
-          <span>{{i18n "user_action_groups.6"}}</span>
-        </LinkTo>
-      </li>
-
-      <li>
-        <LinkTo @route="userNotifications.likesReceived">
-          {{d-icon "heart"}}
-          <span>{{i18n "user_action_groups.2"}}</span>
-        </LinkTo>
-      </li>
-
-      {{#if this.siteSettings.enable_mentions}}
-        <li>
-          <LinkTo @route="userNotifications.mentions">
-            {{d-icon "at"}}
-            <span>{{i18n "user_action_groups.7"}}</span>
-          </LinkTo>
-        </li>
-      {{/if}}
-
-      <li>
-        <LinkTo @route="userNotifications.edits">
-          {{d-icon "pencil-alt"}}
-          <span>{{i18n "user_action_groups.11"}}</span>
-        </LinkTo>
-      </li>
-
-      <PluginOutlet @name="user-notifications-bottom" @connectorTagName="li" @args={{hash model=this.model}} />
-    </ul>
-
-    {{#if this.model}}
-      <div class="navigation-controls">
-        <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
-      </div>
-    {{/if}}
+    <HorizontalOverflowNav>
+      <UserNav::NotificationsNav
+          @model={{this.model}}
+          @siteSettings={{this.siteSettings}}/>
+    </HorizontalOverflowNav>
   </div>
+  {{#if this.model}}
+    <div class="navigation-controls">
+      <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
+    </div>
+  {{/if}}
+
 {{else}}
   <DSection @pageClass="user-notifications" @class="user-secondary-navigation">
     <MobileNav @class="notifications-nav" @desktopClass="notification-list action-list nav-stacked">
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index 7c4823718c..c666ce8461 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -89,16 +89,24 @@
     gap: 0 0.5em;
     border-bottom: 1px solid var(--primary-low);
 
+    .horizontal-overflow-nav {
+      position: relative;
+      min-width: 0;
+      width: 100%;
+    }
+
     .select-kit .select-kit-header {
       height: 100%;
       padding: 0.5em 1em;
+    }
+
+    .category-breadcrumb {
       @include breakpoint(large) {
         font-size: var(--font-down-1);
       }
-    }
-
-    .category-breadcrumb > li {
-      margin: 0;
+      > li {
+        margin: 0;
+      }
     }
 
     .navigation-controls {
@@ -123,7 +131,7 @@
       .d-icon {
         pointer-events: none;
         margin-bottom: 0.2em;
-        color: var(--tertiary);
+        color: var(--quaternary);
       }
       &.transparent {
         // hiding with opacity so we can transition visibility

From 66904f2cd27c47e56311d7feb2a99a05ba824ad2 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 20 Oct 2022 04:06:39 +0300
Subject: [PATCH 228/332] FEATURE: Add button to reset seen popups (#18586)

---
 .../app/controllers/preferences/interface.js  |  9 +++++++
 .../app/templates/preferences/interface.hbs   |  3 +++
 .../user-preferences-interface-test.js        | 27 +++++++++++++++++++
 app/serializers/user_option_serializer.rb     |  3 ++-
 config/locales/client.en.yml                  |  1 +
 .../api/schemas/json/user_get_response.json   |  3 +++
 6 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 808f2c263d..622689240f 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -58,6 +58,7 @@ export default Controller.extend({
       "text_size",
       "title_count_mode",
       "skip_new_user_tips",
+      "seen_popups",
       "color_scheme_id",
       "dark_scheme_id",
     ];
@@ -418,5 +419,13 @@ export default Controller.extend({
         lightStylesheet.remove();
       }
     },
+
+    resetSeenPopups() {
+      this.model.set("skip_new_user_tips", false);
+      this.model.set("seen_popups", null);
+      this.model.set("user_option.skip_new_user_tips", false);
+      this.model.set("user_option.seen_popups", null);
+      return this.model.save(["skip_new_user_tips", "seen_popups"]);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 9187cf88de..91a27edf36 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -117,6 +117,9 @@
     <ComboBox @valueProperty="value" @content={{this.titleCountModes}} @value={{this.model.user_option.title_count_mode}} @id="user-title-count-mode" @onChange={{action (mut this.model.user_option.title_count_mode)}} />
   </div>
   <PreferenceCheckbox @labelKey="user.skip_new_user_tips.description" @checked={{this.model.user_option.skip_new_user_tips}} @class="pref-new-user-tips" />
+  {{#if this.site.onboarding_popup_types}}
+    <DButton @class="pref-reset-seen-popups" @action={{action "resetSeenPopups"}}>{{i18n "user.reset_seen_popups"}}</DButton>
+  {{/if}}
 </fieldset>
 
 <PluginOutlet @name="user-preferences-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
index 7c36de796d..c20de176fd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
@@ -16,6 +16,14 @@ import userFixtures from "discourse/tests/fixtures/user-fixtures";
 acceptance("User Preferences - Interface", function (needs) {
   needs.user();
 
+  let lastUserData;
+  needs.pretender((server, helper) => {
+    server.put("/u/eviltrout.json", (request) => {
+      lastUserData = helper.parsePostData(request.requestBody);
+      return helper.response({ user: {} });
+    });
+  });
+
   test("font size change", async function (assert) {
     removeCookie("text_size");
 
@@ -135,6 +143,25 @@ acceptance("User Preferences - Interface", function (needs) {
 
     document.querySelector("meta[name='discourse_theme_id']").remove();
   });
+
+  test("shows reset seen onboarding popups button", async function (assert) {
+    let site = Site.current();
+    site.set("onboarding_popup_types", { first_notification: 1 });
+
+    await visit("/u/eviltrout/preferences/interface");
+
+    assert.ok(
+      exists(".pref-reset-seen-popups"),
+      "has reset seen popups button"
+    );
+
+    await click(".pref-reset-seen-popups");
+
+    assert.deepEqual(lastUserData, {
+      seen_popups: "",
+      skip_new_user_tips: "false",
+    });
+  });
 });
 
 acceptance(
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 19e7c794b0..f36bb54686 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -34,7 +34,8 @@ class UserOptionSerializer < ApplicationSerializer
              :timezone,
              :skip_new_user_tips,
              :default_calendar,
-             :oldest_search_log_date
+             :oldest_search_log_date,
+             :seen_popups,
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 6bc5ea925c..e7c08d7372 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1160,6 +1160,7 @@ en:
         not_first_time: "Not your first time?"
         skip_link: "Skip these tips"
         read_later: "I'll read it later."
+      reset_seen_popups: "Show onboarding tips again"
       theme_default_on_all_devices: "Make this the default theme on all my devices"
       color_scheme_default_on_all_devices: "Set default color scheme(s) on all my devices"
       color_scheme: "Color Scheme"
diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json
index d669aa5cb4..e5dd2b23b5 100644
--- a/spec/requests/api/schemas/json/user_get_response.json
+++ b/spec/requests/api/schemas/json/user_get_response.json
@@ -770,6 +770,9 @@
             },
             "sidebar_list_destination": {
               "type": "string"
+            },
+            "seen_popups": {
+              "type": ["array", "null"]
             }
           },
           "required": [

From 505aec123fc04bf9a6e743e94820edd2b7c1722e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 19 Oct 2022 20:01:36 -0600
Subject: [PATCH 229/332] FEATURE: Hide welcome topic if it hasn't been edited
 (#18632)

---
 app/models/site.rb                    | 16 +++++----
 lib/topic_query_params.rb             | 13 +++++++
 spec/requests/list_controller_spec.rb | 52 +++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 426299414f..e9594d6e25 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -207,6 +207,15 @@ class Site
     "show_welcome_topic_banner:#{user_id}"
   end
 
+  def self.welcome_topic_exists_and_is_not_edited?
+    Post.joins(:topic)
+      .where(
+        "topics.id = :topic_id AND topics.deleted_at IS NULL AND posts.post_number = 1 AND posts.version = 1 AND posts.created_at > :created_at",
+        topic_id: SiteSetting.welcome_topic_id,
+        created_at: 1.month.ago
+      ).exists?
+  end
+
   def self.show_welcome_topic_banner?(guardian)
     return false if !guardian.is_admin?
     user_id = guardian.user.id
@@ -215,12 +224,7 @@ class Site
     return show_welcome_topic_banner unless show_welcome_topic_banner.nil?
 
     show_welcome_topic_banner = if (user_id == User.first_login_admin_id)
-      Post.joins(:topic)
-        .find_by(
-          "topics.id = :topic_id AND topics.deleted_at IS NULL AND posts.post_number = 1 AND posts.version = 1 AND posts.created_at > :created_at",
-          topic_id: SiteSetting.welcome_topic_id,
-          created_at: 1.month.ago
-        ).present?
+      welcome_topic_exists_and_is_not_edited?
     else
       false
     end
diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index 0676334bf6..7081513c3f 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -18,6 +18,19 @@ module TopicQueryParams
     options[:topic_ids] = param_to_integer_list(:topic_ids)
     options[:no_subcategories] = options[:no_subcategories] == 'true' if options[:no_subcategories].present?
 
+    if hide_welcome_topic?
+      options[:except_topic_ids] ||= []
+      options[:except_topic_ids] << SiteSetting.welcome_topic_id
+    end
+
     options
   end
+
+  private
+
+  def hide_welcome_topic?
+    return false if !SiteSetting.bootstrap_mode_enabled
+    return false if @guardian.is_admin?
+    Site.welcome_topic_exists_and_is_not_edited?
+  end
 end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index f105b1e8b0..46a80983c1 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -961,4 +961,56 @@ RSpec.describe ListController do
       expect(response.body).to have_tag "body", with: { class: "category-myparentslug-mychildslug" }
     end
   end
+
+  describe "welcome topic" do
+    fab!(:welcome_topic) { Fabricate(:topic) }
+    fab!(:post) { Fabricate(:post, topic: welcome_topic) }
+
+    before do
+      SiteSetting.welcome_topic_id = welcome_topic.id
+      SiteSetting.editing_grace_period = 1.minute.to_i
+      SiteSetting.bootstrap_mode_enabled = true
+    end
+
+    it "is hidden for non-admins" do
+
+      get "/latest.json"
+      expect(response.status).to eq(200)
+      parsed = response.parsed_body
+      expect(parsed["topic_list"]["topics"].length).to eq(1)
+      expect(parsed["topic_list"]["topics"].first["id"]).not_to eq(welcome_topic.id)
+    end
+
+    it "is shown to non-admins when there is an edit" do
+      post.revise(post.user, { raw: "#{post.raw}2" }, revised_at: post.updated_at + 2.minutes)
+      post.reload
+      expect(post.version).to eq(2)
+
+      get "/latest.json"
+      expect(response.status).to eq(200)
+      parsed = response.parsed_body
+      expect(parsed["topic_list"]["topics"].length).to eq(2)
+      expect(parsed["topic_list"]["topics"].first["id"]).to eq(welcome_topic.id)
+    end
+
+    it "is shown to admins" do
+      sign_in(admin)
+
+      get "/latest.json"
+      expect(response.status).to eq(200)
+      parsed = response.parsed_body
+      expect(parsed["topic_list"]["topics"].length).to eq(2)
+      expect(parsed["topic_list"]["topics"].first["id"]).to eq(welcome_topic.id)
+    end
+
+    it "is shown to users when bootstrap mode is disabled" do
+      SiteSetting.bootstrap_mode_enabled = false
+
+      get "/latest.json"
+      expect(response.status).to eq(200)
+      parsed = response.parsed_body
+      expect(parsed["topic_list"]["topics"].length).to eq(2)
+      expect(parsed["topic_list"]["topics"].first["id"]).to eq(welcome_topic.id)
+    end
+  end
 end

From ce53152e5371176539a3cbff4739235dbd90b220 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Thu, 20 Oct 2022 08:00:29 +0300
Subject: [PATCH 230/332] DEV: Include theme_uploads and theme_uploads_local
 objects in theme tests (#18645)

Our theme system injects a magical `settings` object at the top of themes JS modules to allow theme authors to access the settings as configured by admins in the UI. Within this `settings` object, there are a couple of special objects `theme_uploads` and `theme_uploads_local` that contain URLs for all the assets/uploads that the theme has.

For test modules/files, the theme system also injects a `settings` object at the top of tests modules, but it's not the same object as the object that's injected in non-test files. The difference is that in tests we want the settings to have their default values as opposed to any custom values that may exist in the site's database. This ensures that test results are consistent no matter the site that runs them.

However, the `settings` object in tests files currently doesn't have the special objects `theme_uploads` and `theme_uploads_local` which means that if a theme includes an asset that's lazy-loaded, it's not possible to write tests for anything that depends on the lazy-loaded asset because the theme will not be able to load the asset during the tests since `theme_uploads_local` and `theme_uploads` don't exist. This PR adds these special objects inside the `settings` object for test files.

Internal topic: t/71825/52.
---
 .../discourse/app/lib/theme-settings-store.js | 12 +++++-
 app/models/theme.rb                           | 42 +++++++++++++------
 .../theme_javascripts_controller_spec.rb      | 28 +++++++++++++
 3 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/theme-settings-store.js b/app/assets/javascripts/discourse/app/lib/theme-settings-store.js
index 6503d6b932..940a88cf4c 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-settings-store.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-settings-store.js
@@ -1,4 +1,5 @@
 import { get } from "@ember/object";
+import { cloneJSON } from "discourse-common/lib/object";
 
 const originalSettings = {};
 const settings = {};
@@ -11,7 +12,7 @@ export function registerSettings(
   if (settings[themeId] && !force) {
     return;
   }
-  originalSettings[themeId] = Object.assign({}, settingsObject);
+  originalSettings[themeId] = cloneJSON(settingsObject);
   const s = {};
   Object.keys(settingsObject).forEach((key) => {
     Object.defineProperty(s, key, {
@@ -41,7 +42,14 @@ export function getObjectForTheme(themeId) {
 export function resetSettings() {
   Object.keys(originalSettings).forEach((themeId) => {
     Object.keys(originalSettings[themeId]).forEach((key) => {
-      settings[themeId][key] = originalSettings[themeId][key];
+      const original = originalSettings[themeId][key];
+      if (original && typeof original === "object") {
+        // special handling for the theme_uploads and theme_uploads_local magic
+        // objects in settings
+        settings[themeId][key] = cloneJSON(original);
+      } else {
+        settings[themeId][key] = original;
+      }
     });
   });
 }
diff --git a/app/models/theme.rb b/app/models/theme.rb
index adce6dbabd..6dbe460a22 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -530,6 +530,13 @@ class Theme < ActiveRecord::Base
       self.settings.each do |setting|
         settings_hash[setting.name] = setting.default
       end
+
+      theme_uploads = build_theme_uploads_hash
+      settings_hash['theme_uploads'] = theme_uploads if theme_uploads.present?
+
+      theme_uploads_local = build_local_theme_uploads_hash
+      settings_hash['theme_uploads_local'] = theme_uploads_local if theme_uploads_local.present?
+
       settings_hash
     end
   end
@@ -540,24 +547,35 @@ class Theme < ActiveRecord::Base
       hash[setting.name] = setting.value
     end
 
-    theme_uploads = {}
-    theme_uploads_local = {}
-
-    upload_fields.each do |field|
-      if field.upload&.url
-        theme_uploads[field.name] = Discourse.store.cdn_url(field.upload.url)
-      end
-      if field.javascript_cache
-        theme_uploads_local[field.name] = field.javascript_cache.local_url
-      end
-    end
-
+    theme_uploads = build_theme_uploads_hash
     hash['theme_uploads'] = theme_uploads if theme_uploads.present?
+
+    theme_uploads_local = build_local_theme_uploads_hash
     hash['theme_uploads_local'] = theme_uploads_local if theme_uploads_local.present?
 
     hash
   end
 
+  def build_theme_uploads_hash
+    hash = {}
+    upload_fields.each do |field|
+      if field.upload&.url
+        hash[field.name] = Discourse.store.cdn_url(field.upload.url)
+      end
+    end
+    hash
+  end
+
+  def build_local_theme_uploads_hash
+    hash = {}
+    upload_fields.each do |field|
+      if field.javascript_cache
+        hash[field.name] = field.javascript_cache.local_url
+      end
+    end
+    hash
+  end
+
   def update_setting(setting_name, new_value)
     target_setting = settings.find { |setting| setting.name == setting_name }
     raise Discourse::NotFound unless target_setting
diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rb
index 0f2c58ce58..84ec854ae1 100644
--- a/spec/requests/theme_javascripts_controller_spec.rb
+++ b/spec/requests/theme_javascripts_controller_spec.rb
@@ -126,6 +126,34 @@ RSpec.describe ThemeJavascriptsController do
       expect(response.body).to include("assert.ok(true);")
     end
 
+    it "includes theme uploads URLs in the settings object" do
+      SiteSetting.authorized_extensions = "*"
+      js_file = Tempfile.new(["vendorlib", ".js"])
+      js_file.write("console.log(123);\n")
+      js_file.rewind
+      js_upload = UploadCreator.new(js_file, "vendorlib.js").create_for(Discourse::SYSTEM_USER_ID)
+      component.set_field(
+        type: :theme_upload_var,
+        target: :common,
+        name: "vendorlib",
+        upload_id: js_upload.id
+      )
+      component.save!
+      _, digest = component.baked_js_tests_with_digest
+
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      expect(response.body).to include(
+        "require(\"discourse/lib/theme-settings-store\").registerSettings(" +
+        "#{component.id}, {\"num_setting\":5,\"theme_uploads\":{\"vendorlib\":" +
+        "\"/uploads/default/test_#{ENV['TEST_ENV_NUMBER']}/original/1X/#{js_upload.sha1}.js\"},\"theme_uploads_local\":{\"vendorlib\":" +
+        "\"/theme-javascripts/#{js_upload.sha1}.js?__ws=test.localhost\"}}, { force: true });"
+      )
+      expect(response.body).to include("assert.ok(true);")
+    ensure
+      js_file&.close
+      js_file&.unlink
+    end
+
     it "responds with 404 if digest is not a 40 chars hex" do
       digest = Rack::Utils.escape('../../../../../../../../../../etc/passwd').gsub('.', '%2E')
       get "/theme-javascripts/tests/#{component.id}-#{digest}.js"

From 8304f40f84dec7f7c31e75403c5527f077cb1020 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 20 Oct 2022 13:28:09 +0200
Subject: [PATCH 231/332] FIX: Correctly debounce various functions (#18673)

Debouncing inline anonymous functions does not work.

This fixes all instances of that error by extracting the function or using the new `@debounce(delay)` decorator
---
 .../addon/controllers/admin-site-settings.js  | 20 ++---
 .../app/components/choose-message.js          | 53 ++++++-------
 .../discourse/app/components/copy-button.js   | 21 +++--
 .../discourse/app/controllers/group-index.js  | 15 ++--
 .../app/controllers/group-requests.js         | 15 ++--
 .../app/controllers/user-invited-show.js      | 17 ++--
 .../discourse/app/lib/category-tag-search.js  | 77 +++++++++----------
 .../discourse/app/lib/safari-hacks.js         | 28 ++++---
 .../discourse/app/mixins/docking.js           | 42 +++++-----
 .../app/mixins/mobile-scroll-direction.js     | 12 ++-
 .../discourse-local-dates-create-form.js      | 38 ++++-----
 .../initializers/new-user-narrative.js        | 36 ++++-----
 12 files changed, 170 insertions(+), 204 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
index 3dbcc3742c..4ee3b0fab9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
@@ -2,9 +2,8 @@ import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { alias } from "@ember/object/computed";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { isEmpty } from "@ember/utils";
-import { observes } from "discourse-common/utils/decorators";
+import { debounce, observes } from "discourse-common/utils/decorators";
 import { action } from "@ember/object";
 
 export default Controller.extend({
@@ -113,18 +112,13 @@ export default Controller.extend({
   },
 
   @observes("filter", "onlyOverridden", "model")
+  @debounce(INPUT_DELAY)
   filterContent() {
-    discourseDebounce(
-      this,
-      () => {
-        if (this._skipBounce) {
-          this.set("_skipBounce", false);
-        } else {
-          this.filterContentNow(this.categoryNameKey);
-        }
-      },
-      INPUT_DELAY
-    );
+    if (this._skipBounce) {
+      this.set("_skipBounce", false);
+    } else {
+      this.filterContentNow(this.categoryNameKey);
+    }
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
index 15f0424f60..af9a19598b 100644
--- a/app/assets/javascripts/discourse/app/components/choose-message.js
+++ b/app/assets/javascripts/discourse/app/components/choose-message.js
@@ -1,9 +1,8 @@
 import Component from "@ember/component";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { action, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
-import { observes } from "discourse-common/utils/decorators";
+import { debounce, observes } from "discourse-common/utils/decorators";
 import { searchForTerm } from "discourse/lib/search";
 
 export default Component.extend({
@@ -30,37 +29,29 @@ export default Component.extend({
     this.set("loading", false);
   },
 
+  @debounce(300)
   search(title) {
-    discourseDebounce(
-      this,
-      function () {
-        const currentTopicId = this.currentTopicId;
+    if (isEmpty(title)) {
+      this.setProperties({ messages: null, loading: false });
+      return;
+    }
 
-        if (isEmpty(title)) {
-          this.setProperties({ messages: null, loading: false });
-          return;
-        }
-
-        searchForTerm(title, {
-          typeFilter: "private_messages",
-          searchForId: true,
-          restrictToArchetype: "private_message",
-        }).then((results) => {
-          if (results && results.posts && results.posts.length > 0) {
-            this.set(
-              "messages",
-              results.posts
-                .mapBy("topic")
-                .filter((t) => t.get("id") !== currentTopicId)
-            );
-          } else {
-            this.setProperties({ messages: null, loading: false });
-          }
-        });
-      },
-      title,
-      300
-    );
+    searchForTerm(title, {
+      typeFilter: "private_messages",
+      searchForId: true,
+      restrictToArchetype: "private_message",
+    }).then((results) => {
+      if (results?.posts?.length) {
+        this.set(
+          "messages",
+          results.posts
+            .mapBy("topic")
+            .filter((t) => t.get("id") !== this.currentTopicId)
+        );
+      } else {
+        this.setProperties({ messages: null, loading: false });
+      }
+    });
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/components/copy-button.js b/app/assets/javascripts/discourse/app/components/copy-button.js
index c1b7eb24c8..f447629f49 100644
--- a/app/assets/javascripts/discourse/app/components/copy-button.js
+++ b/app/assets/javascripts/discourse/app/components/copy-button.js
@@ -1,19 +1,32 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import discourseDebounce from "discourse-common/lib/debounce";
+import { bind } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "",
   copyIcon: "copy",
   copyClass: "btn-primary",
 
+  @bind
+  _restoreButton() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this.set("copyIcon", "copy");
+    this.set("copyClass", "btn-primary");
+  },
+
   @action
   copy() {
     const target = document.querySelector(this.selector);
     target.select();
     target.setSelectionRange(0, target.value.length);
+
     try {
       document.execCommand("copy");
+
       if (this.copied) {
         this.copied();
       }
@@ -21,13 +34,7 @@ export default Component.extend({
       this.set("copyIcon", "check");
       this.set("copyClass", "btn-primary ok");
 
-      discourseDebounce(() => {
-        if (this.isDestroying || this.isDestroyed) {
-          return;
-        }
-        this.set("copyIcon", "copy");
-        this.set("copyClass", "btn-primary");
-      }, 3000);
+      discourseDebounce(this._restoreButton, 3000);
     } catch (err) {}
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
index 6bcbf5dd1b..fd6826cd95 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-index.js
@@ -1,8 +1,10 @@
 import Controller, { inject as controller } from "@ember/controller";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed, {
+  debounce,
+  observes,
+} from "discourse-common/utils/decorators";
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { gt } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
@@ -23,14 +25,9 @@ export default Controller.extend({
   bulkSelection: null,
 
   @observes("filterInput")
+  @debounce(500)
   _setFilter() {
-    discourseDebounce(
-      this,
-      function () {
-        this.set("filter", this.filterInput);
-      },
-      500
-    );
+    this.set("filter", this.filterInput);
   },
 
   @observes("order", "asc", "filter")
diff --git a/app/assets/javascripts/discourse/app/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js
index 9cb4dcf3a6..71f0d0c327 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-requests.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-requests.js
@@ -1,7 +1,9 @@
 import Controller, { inject as controller } from "@ember/controller";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed, {
+  debounce,
+  observes,
+} from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
@@ -17,14 +19,9 @@ export default Controller.extend({
   loading: false,
 
   @observes("filterInput")
+  @debounce(500)
   _setFilter() {
-    discourseDebounce(
-      this,
-      function () {
-        this.set("filter", this.filterInput);
-      },
-      500
-    );
+    this.set("filter", this.filterInput);
   },
 
   @observes("order", "asc", "filter")
diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
index 7ec24665f5..14e8bc968f 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -2,8 +2,10 @@ import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { equal, reads } from "@ember/object/computed";
 import { INPUT_DELAY } from "discourse-common/config/environment";
-import discourseDebounce from "discourse-common/lib/debounce";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed, {
+  debounce,
+  observes,
+} from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
 import Invite from "discourse/models/invite";
@@ -28,15 +30,10 @@ export default Controller.extend({
   },
 
   @observes("searchTerm")
+  @debounce(INPUT_DELAY)
   _searchTermChanged() {
-    discourseDebounce(
-      this,
-      function () {
-        Invite.findInvitedBy(this.user, this.filter, this.searchTerm).then(
-          (invites) => this.set("model", invites)
-        );
-      },
-      INPUT_DELAY
+    Invite.findInvitedBy(this.user, this.filter, this.searchTerm).then(
+      (invites) => this.set("model", invites)
     );
   },
 
diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index c73b2f3cf4..890c00084f 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -19,6 +19,32 @@ function updateCache(term, results) {
   return results;
 }
 
+function searchFunc(q, limit, cats, resultFunc) {
+  oldSearch = ajax("/tags/filter/search", {
+    data: { limit, q },
+  });
+
+  let returnVal = CANCELLED_STATUS;
+
+  oldSearch
+    .then((r) => {
+      const categoryNames = cats.map((c) => c.model.get("name"));
+
+      const tags = r.results.map((tag) => {
+        tag.text = categoryNames.includes(tag.text)
+          ? `${tag.text}${TAG_HASHTAG_POSTFIX}`
+          : tag.text;
+        return tag;
+      });
+
+      returnVal = cats.concat(tags);
+    })
+    .finally(() => {
+      oldSearch = null;
+      resultFunc(returnVal);
+    });
+}
+
 function searchTags(term, categories, limit) {
   return new Promise((resolve) => {
     let clearPromise = isTesting()
@@ -27,45 +53,18 @@ function searchTags(term, categories, limit) {
           resolve(CANCELLED_STATUS);
         }, 5000);
 
-    const debouncedSearch = (q, cats, resultFunc) => {
-      discourseDebounce(
-        this,
-        function () {
-          oldSearch = ajax("/tags/filter/search", {
-            data: { limit, q },
-          });
-
-          let returnVal = CANCELLED_STATUS;
-
-          oldSearch
-            .then((r) => {
-              const categoryNames = cats.map((c) => c.model.get("name"));
-
-              const tags = r.results.map((tag) => {
-                tag.text = categoryNames.includes(tag.text)
-                  ? `${tag.text}${TAG_HASHTAG_POSTFIX}`
-                  : tag.text;
-                return tag;
-              });
-
-              returnVal = cats.concat(tags);
-            })
-            .finally(() => {
-              oldSearch = null;
-              resultFunc(returnVal);
-            });
-        },
-        q,
-        cats,
-        resultFunc,
-        300
-      );
-    };
-
-    debouncedSearch(term, categories, (result) => {
-      cancel(clearPromise);
-      resolve(updateCache(term, result));
-    });
+    discourseDebounce(
+      this,
+      searchFunc,
+      term,
+      limit,
+      categories,
+      (result) => {
+        cancel(clearPromise);
+        resolve(updateCache(term, result));
+      },
+      300
+    );
   });
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
index 58eea11236..d77b8b10b8 100644
--- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
@@ -131,28 +131,26 @@ function positioningWorkaround(fixedElement) {
     }
   }
 
-  const checkForInputs = function () {
-    discourseDebounce(
-      this,
-      function () {
-        attachTouchStart(fixedElement, lastTouched);
+  function checkForInputs() {
+    attachTouchStart(fixedElement, lastTouched);
 
-        fixedElement
-          .querySelectorAll("input[type=text], textarea")
-          .forEach((el) => {
-            attachTouchStart(el, positioningHack);
-          });
-      },
-      100
-    );
-  };
+    fixedElement
+      .querySelectorAll("input[type=text], textarea")
+      .forEach((el) => {
+        attachTouchStart(el, positioningHack);
+      });
+  }
+
+  function debouncedCheckForInputs() {
+    discourseDebounce(checkForInputs, 100);
+  }
 
   positioningWorkaround.touchstartEvent = function (element) {
     let triggerHack = positioningHack.bind(element);
     triggerHack();
   };
 
-  const observer = new MutationObserver(checkForInputs);
+  const observer = new MutationObserver(debouncedCheckForInputs);
   observer.observe(fixedElement, {
     childList: true,
     subtree: true,
diff --git a/app/assets/javascripts/discourse/app/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js
index 7503cee52a..33aa731a49 100644
--- a/app/assets/javascripts/discourse/app/mixins/docking.js
+++ b/app/assets/javascripts/discourse/app/mixins/docking.js
@@ -2,34 +2,15 @@ import Mixin from "@ember/object/mixin";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
-import { isTesting } from "discourse-common/config/environment";
+import { bind } from "discourse-common/utils/decorators";
 
-const INITIAL_DELAY_MS = isTesting() ? 0 : 50;
-const DEBOUNCE_MS = isTesting() ? 0 : 5;
+const INITIAL_DELAY_MS = 50;
+const DEBOUNCE_MS = 5;
 
 export default Mixin.create({
-  queueDockCheck: null,
   _initialTimer: null,
   _queuedTimer: null,
 
-  init() {
-    this._super(...arguments);
-    this.queueDockCheck = () => {
-      this._queuedTimer = discourseDebounce(
-        this,
-        this.safeDockCheck,
-        DEBOUNCE_MS
-      );
-    };
-  },
-
-  safeDockCheck() {
-    if (this.isDestroyed || this.isDestroying) {
-      return;
-    }
-    this.dockCheck();
-  },
-
   didInsertElement() {
     this._super(...arguments);
 
@@ -57,4 +38,21 @@ export default Mixin.create({
     window.removeEventListener("scroll", this.queueDockCheck);
     document.removeEventListener("touchmove", this.queueDockCheck);
   },
+
+  @bind
+  queueDockCheck() {
+    this._queuedTimer = discourseDebounce(
+      this,
+      this.safeDockCheck,
+      DEBOUNCE_MS
+    );
+  },
+
+  @bind
+  safeDockCheck() {
+    if (this.isDestroyed || this.isDestroying) {
+      return;
+    }
+    this.dockCheck();
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
index 27a31a8c45..66d8d36aa3 100644
--- a/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
+++ b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
@@ -48,16 +48,14 @@ export default Mixin.create({
     // If the user reaches the very bottom of the topic, we only want to reset
     // this scroll direction after a second scroll down. This is a nicer event
     // similar to what Safari and Chrome do.
-    discourseDebounce(
-      this,
-      function () {
-        this._bottomHit = 1;
-      },
-      1000
-    );
+    discourseDebounce(this, this._setBottomHit, 1000);
 
     if (this._bottomHit === 1) {
       this.set("mobileScrollDirection", null);
     }
   },
+
+  _setBottomHit() {
+    this._bottomHit = 1;
+  },
 });
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 3a880d715d..dfc52ccc7b 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -1,12 +1,14 @@
 /* global Pikaday:true */
-import computed, { observes } from "discourse-common/utils/decorators";
+import computed, {
+  debounce,
+  observes,
+} from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { Promise } from "rsvp";
 import { cookAsync } from "discourse/lib/text";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { isEmpty } from "@ember/utils";
 import loadScript from "discourse/lib/load-script";
 import { notEmpty } from "@ember/object/computed";
@@ -59,25 +61,19 @@ export default Component.extend({
   },
 
   @observes("computedConfig.{from,to,options}", "options", "isValid", "isRange")
-  _renderPreview() {
-    discourseDebounce(
-      this,
-      function () {
-        const markup = this.markup;
-        if (markup) {
-          cookAsync(markup).then((result) => {
-            this.set("currentPreview", result);
-            schedule("afterRender", () => {
-              applyLocalDates(
-                document.querySelectorAll(".preview .discourse-local-date"),
-                this.siteSettings
-              );
-            });
-          });
-        }
-      },
-      INPUT_DELAY
-    );
+  @debounce(INPUT_DELAY)
+  async _renderPreview() {
+    if (this.markup) {
+      const result = await cookAsync(this.markup);
+      this.set("currentPreview", result);
+
+      schedule("afterRender", () => {
+        applyLocalDates(
+          document.querySelectorAll(".preview .discourse-local-date"),
+          this.siteSettings
+        );
+      });
+    }
   },
 
   @computed("date", "toDate", "toTime")
diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
index 267ed5e44a..4b12e22bad 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
@@ -1,5 +1,5 @@
+import { debounce } from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { headerOffset } from "discourse/lib/offset-calculator";
 import isElementInViewport from "discourse/lib/is-element-in-viewport";
 import { withPluginApi } from "discourse/lib/plugin-api";
@@ -74,28 +74,22 @@ function initialize(api) {
       // No need to unsubscribe, core unsubscribes /topic/* routes
     },
 
+    @debounce(500)
     _scrollToDiscobotPost(postNumber) {
-      discourseDebounce(
-        this,
-        function () {
-          const post = document.querySelector(
-            `.topic-post article#post_${postNumber}`
-          );
-
-          if (!post || isElementInViewport(post)) {
-            return;
-          }
-
-          const viewportOffset = post.getBoundingClientRect();
-
-          window.scrollTo({
-            top: window.scrollY + viewportOffset.top - headerOffset(),
-            behavior: "smooth",
-          });
-        },
-        postNumber,
-        500
+      const post = document.querySelector(
+        `.topic-post article#post_${postNumber}`
       );
+
+      if (!post || isElementInViewport(post)) {
+        return;
+      }
+
+      const viewportOffset = post.getBoundingClientRect();
+
+      window.scrollTo({
+        top: window.scrollY + viewportOffset.top - headerOffset(),
+        behavior: "smooth",
+      });
     },
   });
 

From 0be0bcfc7dcc8fcdc4a2675244696c7cb1639794 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:24:56 +0300
Subject: [PATCH 232/332] FIX: Do not show a 404 page when visiting messages
 (#18652)

* DEV: Use list controller and action

It used an empty action handler which just returned the app and it
required another request to get the topic list. By using the correct
controller and action we can preload the topic list.
---
 config/routes.rb                      |  2 +-
 spec/requests/list_controller_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 0092fec3f0..27d7f27b6e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -478,7 +478,7 @@ Discourse::Application.routes.draw do
       get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
       get "#{root_path}/:username/messages/group/:group_name/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
-      get "#{root_path}/:username/messages/tags/:tag_id" => "user_actions#private_messages", constraints: StaffConstraint.new
+      get "#{root_path}/:username/messages/tags/:tag_id" => "list#private_messages_tag", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username.json" => "users#show", constraints: { username: RouteFormat.username }, defaults: { format: :json }
       get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: 'user' } : {}))
       put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 46a80983c1..7b08772566 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -186,6 +186,16 @@ RSpec.describe ListController do
       expect(response.parsed_body["topic_list"]["topics"].first["id"])
         .to eq(private_message.id)
     end
+
+    it 'should work for users who are allowed and direct links' do
+      SiteSetting.pm_tags_allowed_for_groups = group.name
+      group.add(user)
+      sign_in(user)
+
+      get "/u/#{user.username}/messages/tags/#{tag.name}"
+
+      expect(response.status).to eq(200)
+    end
   end
 
   describe '#private_messages_group' do

From 3e6b22db695d31aa883ee62c89f5c1ddd9115f6e Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Thu, 20 Oct 2022 09:28:03 -0700
Subject: [PATCH 233/332] A11Y: Sortable header elements should have pointer
 (#18672)

---
 app/assets/stylesheets/common/base/discourse.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index fe579fe9f0..696e29f10d 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -287,7 +287,6 @@ table {
 
 .sortable {
   white-space: nowrap;
-  cursor: pointer;
   .discourse-no-touch & {
     &:hover,
     &:focus {
@@ -298,6 +297,7 @@ table {
     margin-left: 0.25em;
   }
   @include unselectable;
+  cursor: pointer;
 }
 
 .radio,

From ab217d8ae0b06ae4a9ce94aa2ff200aa84789189 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 20 Oct 2022 13:20:17 -0400
Subject: [PATCH 234/332] FIX: set width on category logo img, not container
 (#18676)

---
 app/assets/stylesheets/common/base/_topic-list.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 06a0e78bdc..86d45d9ee7 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -108,14 +108,12 @@
   .category-logo.aspect-image {
     --max-height: 150px;
     max-height: var(--max-height);
-    width: calc(var(--max-height) * var(--aspect-ratio));
     max-width: 100%;
     height: auto;
 
     img {
-      width: 100%;
+      width: calc(var(--max-height) * var(--aspect-ratio));
       height: inherit;
-      max-width: initial;
       max-height: var(--max-height);
     }
   }

From a14825836fa355d51ca0bd85fd75f95eb97ef741 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 20 Oct 2022 15:04:21 -0400
Subject: [PATCH 235/332] UX: Show category edit button when in tag
 intersection (#18679)

Given that the category structure is generally speaking the backbone of most Discourse instances, it makes sense to show the edit button for the category even when the user is in a category/tag intersection route.
---
 .../discourse/app/templates/components/d-navigation.hbs  | 9 ++-------
 .../javascripts/discourse/app/templates/tag/show.hbs     | 2 +-
 config/locales/client.en.yml                             | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 2e793cfaa8..a3b7227201 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -16,13 +16,8 @@
       }} />
   {{/if}}
 
-  {{#if this.category}}
-    {{#unless this.tag}}
-      {{!-- don't show category edit button on tag pages --}}
-      {{#if this.showCategoryEdit}}
-        <DButton @class="btn-default edit-category" @action={{this.editCategory}} @icon="wrench" @ariaLabel="category.edit" />
-      {{/if}}
-    {{/unless}}
+  {{#if (and this.category this.showCategoryEdit)}}
+    <DButton @class="btn-default edit-category" @action={{this.editCategory}} @icon="wrench" @title="category.edit_title" />
   {{/if}}
 
   {{#if this.tag}}
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index de725a87a4..5d39fd087a 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -9,7 +9,7 @@
     <PluginOutlet @name="discovery-navigation-bar-above" @connectorTagName="div" />
     <div class="container">
       <section class="navigation-container tag-navigation">
-        <DNavigation @filterMode={{this.filterMode}} @canCreateTopic={{this.canCreateTopic}} @hasDraft={{this.currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @category={{this.category}} @tag={{this.tag}} @noSubcategories={{this.noSubcategories}} @tagNotification={{this.tagNotification}} @additionalTags={{this.additionalTags}} @showInfo={{this.showInfo}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} @changeTagNotificationLevel={{action "changeTagNotificationLevel"}} @toggleInfo={{action "toggleInfo"}} />
+        <DNavigation @filterMode={{this.filterMode}} @canCreateTopic={{this.canCreateTopic}} @hasDraft={{this.currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @category={{this.category}} @editCategory={{route-action "editCategory" this.category}} @tag={{this.tag}} @noSubcategories={{this.noSubcategories}} @tagNotification={{this.tagNotification}} @additionalTags={{this.additionalTags}} @showInfo={{this.showInfo}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} @changeTagNotificationLevel={{action "changeTagNotificationLevel"}} @toggleInfo={{action "toggleInfo"}} />
 
         <PluginOutlet @name="tag-navigation" @connectorTagName="div" @args={{hash category=this.category tag=this.tag}} />
       </section>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e7c08d7372..7ac6707db4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3455,6 +3455,7 @@ en:
       all: "All categories"
       choose: "category&hellip;"
       edit: "Edit"
+      edit_title: "Edit this category"
       edit_dialog_title: "Edit: %{categoryName}"
       view: "View Topics in Category"
       back: "Back to category"

From d379edec8d58cf011a2393b6569a639ae09c0e8a Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 21 Oct 2022 14:38:33 +1000
Subject: [PATCH 236/332] FIX: Clientside checks for
 personal_message_enabled_groups (#18691)

The clientside allowPersonalMessages function introduced
in e62e93f83a77adfa80b38fbfecf82bbee14e12fe sometimes did not
work correctly, because the currentUser.groups property
only contained **visible** groups for the current user, which
could exclude auto groups that had their permissions set to
be owner-only visible.

It was unnecessary to add this anyway since we already have
can_send_private_messages on the CurrentUserSerializer. It's
better the backend does this calculation anyway. Use that
in the clientside code instead and get rid of allowPersonalMessages
---
 .../app/components/sidebar/user/sections.js        |  2 +-
 .../app/components/topic-footer-buttons.js         |  5 +----
 .../discourse/app/components/user-menu/menu.js     |  2 +-
 .../javascripts/discourse/app/controllers/group.js |  4 ++--
 .../app/controllers/keyboard-shortcuts-help.js     |  2 +-
 .../app/controllers/preferences/notifications.js   |  4 ++--
 .../discourse/app/controllers/preferences/users.js |  4 ++--
 .../javascripts/discourse/app/controllers/topic.js |  4 ++--
 .../javascripts/discourse/app/controllers/user.js  |  6 ++++--
 .../discourse/app/lib/keyboard-shortcuts.js        |  2 +-
 .../javascripts/discourse/app/models/user.js       | 14 ++------------
 .../javascripts/discourse/app/widgets/user-menu.js |  2 +-
 .../sidebar-user-messages-section-test.js          | 13 ++++++++-----
 .../discourse/tests/fixtures/session-fixtures.js   |  1 +
 .../integration/components/site-header-test.js     |  1 +
 .../integration/components/user-menu/menu-test.js  | 12 ++++++++----
 .../components/widgets/user-menu-test.js           | 13 ++++++++++---
 17 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
index 41ed90a1b2..f835ad71ab 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
@@ -24,6 +24,6 @@ export default class SidebarUserSections extends Component {
   }
 
   get enableMessagesSection() {
-    return this.currentUser?.allowPersonalMessages;
+    return this.currentUser?.can_send_private_messages;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
index e352343170..1d5ff71b60 100644
--- a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
@@ -46,10 +46,7 @@ export default Component.extend({
     return !isPM || this.canSendPms;
   },
 
-  @discourseComputed("currentUser.allowPersonalMessages")
-  canSendPms() {
-    return this.currentUser?.allowPersonalMessages;
-  },
+  canSendPms: alias("currentUser.can_send_private_messages"),
 
   canInviteTo: alias("topic.details.can_invite_to"),
 
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
index b29188b291..89ff33435e 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
@@ -120,7 +120,7 @@ const CORE_TOP_TABS = [
     }
 
     get shouldDisplay() {
-      return this.currentUser?.allowPersonalMessages;
+      return this.currentUser?.can_send_private_messages;
     }
 
     get notificationTypes() {
diff --git a/app/assets/javascripts/discourse/app/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
index a847b619c2..2c2967981d 100644
--- a/app/assets/javascripts/discourse/app/controllers/group.js
+++ b/app/assets/javascripts/discourse/app/controllers/group.js
@@ -91,10 +91,10 @@ export default Controller.extend({
   @discourseComputed(
     "model.has_messages",
     "model.is_group_user",
-    "currentUser.allowPersonalMessages"
+    "currentUser.can_send_private_messages"
   )
   showMessages(hasMessages, isGroupUser) {
-    if (!this.currentUser?.allowPersonalMessages) {
+    if (!this.currentUser?.can_send_private_messages) {
       return false;
     }
 
diff --git a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
index efc7ed5e9f..359ab09d01 100644
--- a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
@@ -326,7 +326,7 @@ export default Controller.extend(ModalFunctionality, {
       bookmarks: buildShortcut("jump_to.bookmarks", { keys1: ["g", "b"] }),
       profile: buildShortcut("jump_to.profile", { keys1: ["g", "p"] }),
     };
-    if (this.currentUser?.allowPersonalMessages) {
+    if (this.currentUser?.can_send_private_messages) {
       shortcuts.messages = buildShortcut("jump_to.messages", {
         keys1: ["g", "m"],
       });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
index 897c9fb30a..6db87bbe84 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
@@ -90,9 +90,9 @@ export default Controller.extend({
     ];
   },
 
-  @discourseComputed("currentUser.allowPersonalMessages")
+  @discourseComputed("currentUser.can_send_private_messages")
   showMessageSettings() {
-    return this.currentUser?.allowPersonalMessages;
+    return this.currentUser?.can_send_private_messages;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/users.js b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
index f20db86e7b..f47f7efec3 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/users.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
@@ -72,9 +72,9 @@ export default Controller.extend({
     return !allowPrivateMessages;
   },
 
-  @discourseComputed("currentUser.allowPersonalMessages")
+  @discourseComputed("currentUser.can_send_private_messages")
   showMessageSettings() {
-    return this.currentUser?.allowPersonalMessages;
+    return this.currentUser?.can_send_private_messages;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 7b1da2f654..f682f8e68b 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -212,9 +212,9 @@ export default Controller.extend(bufferedProperty("model"), {
     );
   },
 
-  @discourseComputed("currentUser.allowPersonalMessages")
+  @discourseComputed("currentUser.can_send_private_messages")
   canSendPms() {
-    return this.currentUser?.allowPersonalMessages;
+    return this.currentUser?.can_send_private_messages;
   },
 
   @discourseComputed("buffered.category_id")
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 35d086ecb7..c46e2c3486 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -112,10 +112,12 @@ export default Controller.extend(CanCheckEmails, {
   @discourseComputed(
     "viewingSelf",
     "currentUser.admin",
-    "currentUser.allowPersonalMessages"
+    "currentUser.can_send_private_messages"
   )
   showPrivateMessages(viewingSelf, isAdmin) {
-    return this.currentUser?.allowPersonalMessages && (viewingSelf || isAdmin);
+    return (
+      this.currentUser?.can_send_private_messages && (viewingSelf || isAdmin)
+    );
   },
 
   @discourseComputed("viewingSelf", "currentUser.admin")
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index f6b8d156ef..e5b7585466 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -140,7 +140,7 @@ export default {
     this.site = this.container.lookup("service:site");
 
     // Disable the shortcut if private messages are disabled
-    if (!this.currentUser?.allowPersonalMessages) {
+    if (!this.currentUser?.can_send_private_messages) {
       delete DEFAULT_BINDINGS["g m"];
     }
   },
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 352aa1e09f..80b093c568 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -640,6 +640,8 @@ const User = RestModel.extend({
     return filteredGroups.length > numGroupsToDisplay;
   },
 
+  // NOTE: This only includes groups *visible* to the user via the serializer,
+  // so be wary when using this.
   isInAnyGroups(groupIds) {
     if (!this.groups) {
       return;
@@ -1094,18 +1096,6 @@ const User = RestModel.extend({
     return [...trackedTags, ...watchedTags, ...watchingFirstPostTags];
   },
 
-  @discourseComputed("staff", "groups.[]")
-  allowPersonalMessages() {
-    return (
-      this.staff ||
-      this.isInAnyGroups(
-        this.siteSettings.personal_message_enabled_groups
-          .split("|")
-          .map((groupId) => parseInt(groupId, 10))
-      )
-    );
-  },
-
   showPopup(options) {
     const popupTypes = Site.currentProp("onboarding_popup_types");
     if (!popupTypes[options.id]) {
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
index 89aaa688aa..374b32d7a1 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js
@@ -156,7 +156,7 @@ createWidget("user-menu-links", {
 
     glyphs.push(this.bookmarksGlyph());
 
-    if (this.currentUser?.allowPersonalMessages) {
+    if (this.currentUser?.can_send_private_messages) {
       glyphs.push(this.messagesGlyph());
     }
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
index 464d5422e8..fb7c120e10 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
@@ -13,14 +13,17 @@ import {
 import { NotificationLevels } from "discourse/lib/notification-levels";
 
 acceptance(
-  "Sidebar - Logged on user - Messages Section - user not in personal_message_enabled_groups",
+  "Sidebar - Logged on user - Messages Section - user does not have can_send_private_messages permission",
   function (needs) {
-    needs.user({ moderator: false, admin: false });
+    needs.user({
+      moderator: false,
+      admin: false,
+      can_send_private_messages: false,
+    });
 
     needs.settings({
       enable_experimental_sidebar_hamburger: true,
       enable_sidebar: true,
-      personal_message_enabled_groups: "13", // trust_level_3 auto group ID;
     });
 
     test("clicking on section header button", async function (assert) {
@@ -35,9 +38,9 @@ acceptance(
 );
 
 acceptance(
-  "Sidebar - Logged on user - Messages Section - user in personal_message_enabled_groups",
+  "Sidebar - Logged on user - Messages Section - user does have can_send_private_messages permission",
   function (needs) {
-    needs.user();
+    needs.user({ can_send_private_messages: true });
 
     needs.settings({
       enable_experimental_sidebar_hamburger: true,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
index d99b6ab825..b5430580e8 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
@@ -24,6 +24,7 @@ export default {
       trust_level: 4,
       can_edit: true,
       can_invite_to_forum: true,
+      can_send_private_messages: true,
       should_be_redirected_to_top: false,
       custom_fields: {},
       muted_category_ids: [],
diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
index 620227d061..3a8cac10f0 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
@@ -144,6 +144,7 @@ module("Integration | Component | site-header", function (hooks) {
 
   test("arrow up/down keys move focus between the tabs", async function (assert) {
     this.currentUser.set("redesigned_user_menu_enabled", true);
+    this.currentUser.set("can_send_private_messages", true);
     await render(hbs`<SiteHeader />`);
     await click(".header-dropdown-toggle.current-user");
     let activeTab = query(".menu-tabs-container .btn.active");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
index 6b32f8099a..14dbaaba8d 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
@@ -36,6 +36,7 @@ module("Integration | Component | user-menu", function (hooks) {
   });
 
   test("the menu has a group of tabs at the top", async function (assert) {
+    this.currentUser.set("can_send_private_messages", true);
     await render(template);
     const tabs = queryAll(".top-tabs.tabs-list .btn");
     assert.strictEqual(tabs.length, 6);
@@ -52,6 +53,7 @@ module("Integration | Component | user-menu", function (hooks) {
   });
 
   test("the menu has a group of tabs at the bottom", async function (assert) {
+    this.currentUser.set("can_send_private_messages", true);
     await render(template);
     const tabs = queryAll(".bottom-tabs.tabs-list .btn");
     assert.strictEqual(tabs.length, 1);
@@ -63,6 +65,7 @@ module("Integration | Component | user-menu", function (hooks) {
 
   test("likes tab is hidden if current user's like notifications frequency is 'never'", async function (assert) {
     this.currentUser.set("likes_notifications_disabled", true);
+    this.currentUser.set("can_send_private_messages", true);
     await render(template);
     assert.ok(!exists("#user-menu-button-likes"));
 
@@ -79,6 +82,7 @@ module("Integration | Component | user-menu", function (hooks) {
   test("reviewables tab is shown if current user can review and there are pending reviewables", async function (assert) {
     this.currentUser.set("can_review", true);
     this.currentUser.set("reviewable_count", 1);
+    this.currentUser.set("can_send_private_messages", true);
     await render(template);
     const tab = query("#user-menu-button-review-queue");
     assert.strictEqual(tab.dataset.tabNumber, "5");
@@ -100,11 +104,11 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.notOk(exists("#user-menu-button-review-queue"));
   });
 
-  test("messages tab isn't shown if current user isn't staff and user does not belong to personal_message_enabled_groups", async function (assert) {
+  test("messages tab isn't shown if current user does not have can_send_private_messages permission", async function (assert) {
     this.currentUser.set("moderator", false);
     this.currentUser.set("admin", false);
     this.currentUser.set("groups", []);
-    this.siteSettings.personal_message_enabled_groups = "13"; // trust_level_3 auto group ID;
+    this.currentUser.set("can_send_private_messages", false);
 
     await render(template);
 
@@ -120,11 +124,11 @@ module("Integration | Component | user-menu", function (hooks) {
     );
   });
 
-  test("messages tab is shown if current user is staff even if they do not belong to personal_message_enabled_groups", async function (assert) {
+  test("messages tab is shown if user has can_send_private_messages permission", async function (assert) {
     this.currentUser.set("moderator", true);
     this.currentUser.set("admin", false);
     this.currentUser.set("groups", []);
-    this.siteSettings.personal_message_enabled_groups = "999";
+    this.currentUser.set("can_send_private_messages", true);
 
     await render(template);
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js
index a3e717edc9..5290dd6628 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js
@@ -92,8 +92,11 @@ module("Integration | Component | Widget | user-menu", function (hooks) {
   });
 
   test("private messages - disabled", async function (assert) {
-    this.currentUser.setProperties({ admin: false, moderator: false });
-    this.siteSettings.personal_message_enabled_groups = "13"; // trust_level_3 auto group ID;
+    this.currentUser.setProperties({
+      admin: false,
+      moderator: false,
+      can_send_private_messages: false,
+    });
 
     await render(hbs`<MountWidget @widget="user-menu" />`);
 
@@ -101,7 +104,11 @@ module("Integration | Component | Widget | user-menu", function (hooks) {
   });
 
   test("private messages - enabled", async function (assert) {
-    this.siteSettings.personal_message_enabled_groups = "11"; // trust_level_1 auto group ID;
+    this.currentUser.setProperties({
+      admin: false,
+      moderator: false,
+      can_send_private_messages: true,
+    });
 
     await render(hbs`<MountWidget @widget="user-menu" />`);
 

From 5fbd16926bb0a1685a5f49ea661d2c0ac6ab21d4 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 21 Oct 2022 16:40:46 +0800
Subject: [PATCH 237/332] DEV: Add missing test case for
 `TopicGuardian#can_see_topic?` (#18694)

Staged users are allowed to view topics they created in a read restricted category
when category has `Category#email_in` and
`Category#email_in_allow_strangers` configured.
---
 spec/lib/guardian_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index 193bd342e3..b9d44f15c6 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -856,6 +856,17 @@ RSpec.describe Guardian do
         topic.category.update!(reviewable_by_group_id: group.id, topic_id: post.topic.id)
         expect(Guardian.new(user_gm).can_see?(topic)).to be_truthy
       end
+
+      it 'allows staged user to view own topic in restricted category when Category#email_in and Category#email_in_allow_strangers is set' do
+        secure_category = Fabricate(:category, read_restricted: true, email_in: "foo2@bar.com", email_in_allow_strangers: true)
+        topic_in_secure_category = Fabricate(:topic, category: secure_category, user: user)
+
+        expect(Guardian.new(user).can_see?(topic_in_secure_category)).to eq(false)
+
+        user.update!(staged: true)
+
+        expect(Guardian.new(user).can_see?(topic_in_secure_category)).to eq(true)
+      end
     end
 
     describe 'a Post' do

From 49cd30cb6ed2f34d9d0e97e3a89bc42eafbe0ecf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 11:01:20 +0200
Subject: [PATCH 238/332] Build(deps): Bump excon from 0.93.0 to 0.93.1
 (#18682)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cf43e5c864..31d09e2dac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
       sprockets (>= 3.3, < 4.1)
     ember-source (2.18.2)
     erubi (1.11.0)
-    excon (0.93.0)
+    excon (0.93.1)
     execjs (2.8.1)
     exifr (1.3.10)
     fabrication (2.30.0)

From 290da76981bc2717b3d5f0cdae80e3529cf06777 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:47:04 +0100
Subject: [PATCH 239/332] Build(deps): Bump @babel/core in
 /app/assets/javascripts (#18687)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.19.3 to 7.19.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json |   2 +-
 app/assets/javascripts/yarn.lock              | 107 ++++++++++--------
 2 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 8a79bc3d94..22855080ce 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -16,7 +16,7 @@
     "test": "ember test"
   },
   "dependencies": {
-    "@babel/core": "^7.19.3",
+    "@babel/core": "^7.19.6",
     "@babel/standalone": "^7.19.3",
     "@discourse/itsatrap": "^2.0.10",
     "@discourse/backburner.js": "^2.7.1-0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 107958369f..33e6bade59 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -34,33 +34,33 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151"
   integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw==
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.13.8", "@babel/core@^7.16.7", "@babel/core@^7.19.3", "@babel/core@^7.3.4":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c"
-  integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==
+"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.13.8", "@babel/core@^7.16.7", "@babel/core@^7.19.6", "@babel/core@^7.3.4":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
+  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.3"
+    "@babel/generator" "^7.19.6"
     "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-module-transforms" "^7.19.0"
-    "@babel/helpers" "^7.19.0"
-    "@babel/parser" "^7.19.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helpers" "^7.19.4"
+    "@babel/parser" "^7.19.6"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.3"
-    "@babel/types" "^7.19.3"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59"
-  integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==
+"@babel/generator@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d"
+  integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==
   dependencies:
-    "@babel/types" "^7.19.3"
+    "@babel/types" "^7.19.4"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -192,19 +192,19 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
-  integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
+  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-simple-access" "^7.19.4"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
 
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
@@ -238,13 +238,20 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.18.6":
+"@babel/helper-simple-access@^7.16.7":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
   integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-simple-access@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
+  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
+  dependencies:
+    "@babel/types" "^7.19.4"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
@@ -259,10 +266,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
 "@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
@@ -289,14 +296,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
-  integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
+"@babel/helpers@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5"
+  integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==
   dependencies:
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
+    "@babel/traverse" "^7.19.4"
+    "@babel/types" "^7.19.4"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -307,10 +314,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.19.3", "@babel/parser@^7.4.5":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
-  integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
+"@babel/parser@^7.18.10", "@babel/parser@^7.19.6", "@babel/parser@^7.4.5":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8"
+  integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
@@ -999,28 +1006,28 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.3", "@babel/traverse@^7.4.5":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
-  integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6", "@babel/traverse@^7.4.5":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc"
+  integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.3"
+    "@babel/generator" "^7.19.6"
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.3"
-    "@babel/types" "^7.19.3"
+    "@babel/parser" "^7.19.6"
+    "@babel/types" "^7.19.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.1.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
-  integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
+"@babel/types@^7.1.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7"
+  integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==
   dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 

From 5827d1eecc10ceaaa773d32544c1b86702c2236b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:48:27 +0100
Subject: [PATCH 240/332] Build(deps): Bump @babel/standalone from 7.19.3 to
 7.19.6 in /app/assets/javascripts (#18689)

Bumps [@babel/standalone](https://github.com/babel/babel/tree/HEAD/packages/babel-standalone) from 7.19.3 to 7.19.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.6/packages/babel-standalone)

---
updated-dependencies:
- dependency-name: "@babel/standalone"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Tweak whitespace expectations in tests

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: David Taylor <david@taylorhq.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 spec/lib/discourse_js_processor_spec.rb       | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 22855080ce..793a857529 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.19.6",
-    "@babel/standalone": "^7.19.3",
+    "@babel/standalone": "^7.19.6",
     "@discourse/itsatrap": "^2.0.10",
     "@discourse/backburner.js": "^2.7.1-0",
     "@ember/jquery": "^2.0.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 33e6bade59..c64cf4ad13 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -992,10 +992,10 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/standalone@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.19.3.tgz#c14f669c931e5579021b432c612bb4d027603ee8"
-  integrity sha512-zSdDx28L6f27Y59OMrl8mBbtyB/cpIGlHm7wVOHlcmUTpD10AiUILkekZATkkpsuTagTWezdJmUaeY8P2SONUA==
+"@babel/standalone@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.19.6.tgz#88674a287d3875a635b62afb066ebf162cedf13c"
+  integrity sha512-SUOBMtHlxGpXf14X85c1vtHyxYgIODBUdclntETSEGkgI274MNPBUkOVWpvFmRhMuLokK3CL07qJoK2e5CIToA==
 
 "@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
   version "7.18.10"
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
index 1d87b5a85b..b1f5dc031a 100644
--- a/spec/lib/discourse_js_processor_spec.rb
+++ b/spec/lib/discourse_js_processor_spec.rb
@@ -47,9 +47,7 @@ RSpec.describe DiscourseJsProcessor do
 
         const template = function (attrs, state) {
           var _r = [];
-
           _r.push(somevalue);
-
           return _r;
         };
       });

From 7e23662a44bd48aeaeffb66ebc3579116e322a2c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 21 Oct 2022 15:12:53 +0100
Subject: [PATCH 241/332] DEV: Remove unneeded `templateOnly()` stubs (#18701)

Lone hbs files in the `/components` are automatically assumed to be template-only Glimmer components. The `templateOnly()` stub is only required when templates are in the `/templates/components` directory.
---
 .../app}/components/composer-fullscreen-prompt.hbs             | 0
 .../discourse/app/components/composer-fullscreen-prompt.js     | 3 ---
 .../components/sidebar/common/all-categories-section-link.js   | 3 ---
 .../app/components/sidebar/common/all-tags-section-link.js     | 3 ---
 .../discourse/app/components/sidebar/section-header.js         | 3 ---
 .../discourse/app/components/sidebar/section-link-prefix.js    | 3 ---
 .../discourse/app/components/sidebar/section-message.js        | 3 ---
 .../javascripts/discourse/app/components/sidebar/sections.js   | 3 ---
 .../app/components/user-menu/bookmarks-list-empty-state.js     | 3 ---
 .../app/components/user-menu/items-list-empty-state.js         | 3 ---
 .../app/components/user-menu/messages-list-empty-state.js      | 3 ---
 .../app/components/user-menu/notifications-list-empty-state.js | 3 ---
 12 files changed, 33 deletions(-)
 rename app/assets/javascripts/{admin/addon/templates => discourse/app}/components/composer-fullscreen-prompt.hbs (100%)
 delete mode 100644 app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/common/all-categories-section-link.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/common/all-tags-section-link.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/section-header.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/section-message.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/sections.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list-empty-state.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/items-list-empty-state.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/messages-list-empty-state.js
 delete mode 100644 app/assets/javascripts/discourse/app/components/user-menu/notifications-list-empty-state.js

diff --git a/app/assets/javascripts/admin/addon/templates/components/composer-fullscreen-prompt.hbs b/app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/composer-fullscreen-prompt.hbs
rename to app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.hbs
diff --git a/app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.js b/app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/composer-fullscreen-prompt.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/all-categories-section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/common/all-categories-section-link.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/all-categories-section-link.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/all-tags-section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/common/all-tags-section-link.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/all-tags-section-link.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-header.js b/app/assets/javascripts/discourse/app/components/sidebar/section-header.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-header.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-message.js b/app/assets/javascripts/discourse/app/components/sidebar/section-message.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-message.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/sections.js b/app/assets/javascripts/discourse/app/components/sidebar/sections.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/sections.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list-empty-state.js b/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list-empty-state.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list-empty-state.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/items-list-empty-state.js b/app/assets/javascripts/discourse/app/components/user-menu/items-list-empty-state.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/items-list-empty-state.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/messages-list-empty-state.js b/app/assets/javascripts/discourse/app/components/user-menu/messages-list-empty-state.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/messages-list-empty-state.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list-empty-state.js b/app/assets/javascripts/discourse/app/components/user-menu/notifications-list-empty-state.js
deleted file mode 100644
index 742bb3c18e..0000000000
--- a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list-empty-state.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import templateOnly from "@ember/component/template-only";
-
-export default templateOnly();

From c937b6dd36ace3c1fb005eba2c6fee83d5b1e073 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 21 Oct 2022 12:01:26 -0400
Subject: [PATCH 242/332] FIX: set max-width on category logo img (#18703)

---
 app/assets/stylesheets/common/base/_topic-list.scss | 1 +
 app/assets/stylesheets/mobile/topic-list.scss       | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 86d45d9ee7..cfde43de91 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -113,6 +113,7 @@
 
     img {
       width: calc(var(--max-height) * var(--aspect-ratio));
+      max-width: 100%;
       height: inherit;
       max-height: var(--max-height);
     }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index bab5fe8150..7eeb12aa2c 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -417,9 +417,6 @@ tr.category-topic-link {
 .category-logo.aspect-image {
   display: block;
   margin: 1.5em 0 1em;
-  img {
-    max-width: 100%;
-  }
 }
 
 button.dismiss-read {

From cc439cf4120f3bfe594b673f03ed00d2b045c210 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 21 Oct 2022 19:05:34 +0100
Subject: [PATCH 243/332] DEV: Apply theme template transforms to colocated
 components (#18704)

---
 lib/theme_javascript_compiler.rb           | 2 +-
 spec/lib/theme_javascript_compiler_spec.rb | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 1668168145..25975dbb60 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -232,7 +232,7 @@ class ThemeJavascriptCompiler
     transpiler = DiscourseJsProcessor::Transpiler.new
     @output_tree << ["#{original_filename}.js", <<~JS]
       if ('define' in window) {
-      #{transpiler.perform(script, "", name).strip}
+      #{transpiler.perform(script, "", name, theme_id: @theme_id).strip}
       }
     JS
   rescue MiniRacer::RuntimeError, DiscourseJsProcessor::TranspileError => ex
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 116e4ee3e7..8d94ed72d5 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -110,6 +110,15 @@ RSpec.describe ThemeJavascriptCompiler do
       expect(compiler.raw_content).to include("setComponentTemplate")
     end
 
+    it "applies theme AST transforms to colocated components" do
+      compiler = ThemeJavascriptCompiler.new(12345678910, 'my theme name')
+      compiler.append_tree(
+        { "discourse/components/mycomponent.hbs" => '{{theme-i18n "my_translation_key"}}' }
+      )
+      template_compiled_line = compiler.raw_content.lines.find { |l| l.include?('"block":') }
+      expect(template_compiled_line).to include("12345678910")
+    end
+
     it "prints error when default export missing" do
       compiler.append_tree(
         {

From 28bb81b50a32eb0d351af1f41dcf91a56336baed Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 21 Oct 2022 14:32:45 -0400
Subject: [PATCH 244/332] A11Y: Add `for` attributes for location, website in
 profile (#18705)

---
 .../discourse/app/templates/preferences/profile.hbs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index 99645afde9..095b8bdcd9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -15,7 +15,7 @@
 
 {{#if this.model.can_change_location}}
   <div class="control-group pref-location">
-    <label class="control-label">{{i18n "user.location"}}</label>
+    <label class="control-label" for="edit-location">{{i18n "user.location"}}</label>
     <div class="controls">
       <Input @type="text" @value={{this.model.location}} class="input-xxlarge" id="edit-location" />
     </div>
@@ -24,9 +24,9 @@
 
 {{#if this.model.can_change_website}}
   <div class="control-group pref-website">
-    <label class="control-label">{{i18n "user.website"}}</label>
+    <label class="control-label" for="edit-website">{{i18n "user.website"}}</label>
     <div class="controls">
-      <Input @type="text" @value={{this.model.website}} class="input-xxlarge" />
+      <Input @type="text" @value={{this.model.website}} class="input-xxlarge" id="edit-website"/>
     </div>
   </div>
 {{/if}}

From 414d3b81859d8407c6ce1440810edcbf2d05ee8b Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 21 Oct 2022 14:32:58 -0400
Subject: [PATCH 245/332] A11Y: Add title to drafts remove icon button (#18706)

---
 .../discourse/app/templates/components/user-stream-item.hbs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
index 02a8359650..a060b6c2a3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
@@ -69,6 +69,6 @@
 {{#if @item.editableDraft}}
   <div class="user-stream-item-draft-actions">
     <DButton @action={{@resumeDraft}} @actionParam={{@item}} @icon="pencil-alt" @label="drafts.resume" @class="btn-default resume-draft" />
-    <DButton @action={{@removeDraft}} @actionParam={{@item}} @icon="far-trash-alt" @class="btn-danger remove-draft" />
+    <DButton @action={{@removeDraft}} @actionParam={{@item}} @icon="far-trash-alt" @class="btn-danger remove-draft" @title="drafts.remove" />
   </div>
 {{/if}}

From db0dbdf89aa5c2ef0b685f811a9c73172313336e Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 21 Oct 2022 15:07:12 -0400
Subject: [PATCH 246/332] DEV: add plugin outlet to sidebar footer (#18707)

---
 .../javascripts/discourse/app/components/sidebar/footer.hbs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
index 59c181b360..6026e64315 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
@@ -1,6 +1,8 @@
 <div class="sidebar-footer-wrapper">
   <div class="sidebar-footer-container">
     <div class="sidebar-footer-actions">
+      <PluginOutlet @name="sidebar-footer-actions" />
+
       {{#if (or this.site.mobileView (and this.siteSettings.enable_mobile_theme this.capabilities.touch))}}
         <DButton
           @action={{route-action "toggleMobileView"}}

From 0a33c507d950ec33a40922f8130a57fcd31996f1 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 21 Oct 2022 20:20:46 +0100
Subject: [PATCH 247/332] DEV: Improve colocated component rootName logic
 (#18708)

The complex regex-based detection was based on Ember CLI's implementation, which is necessarily generic and needs to auto-detect the name. In our case, we know the name of the plugin so we can just pass it in - no need for dynamic detection. This resolves issues when there are other files in the `discourse/plugins/{name}` directory which are sorted before `discourse/`
---
 .../colocated-template-compiler.js              | 17 ++++++-----------
 .../javascripts/discourse-plugins/index.js      |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js b/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
index 2cc0759cf3..9cc4d462b2 100644
--- a/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
+++ b/app/assets/javascripts/discourse-plugins/colocated-template-compiler.js
@@ -3,17 +3,12 @@ const ColocatedTemplateProcessor = require("ember-cli-htmlbars/lib/colocated-bro
 module.exports = class DiscoursePluginColocatedTemplateProcessor extends (
   ColocatedTemplateProcessor
 ) {
+  constructor(tree, discoursePluginName) {
+    super(tree);
+    this.discoursePluginName = discoursePluginName;
+  }
+
   detectRootName() {
-    const entries = this.currentEntries().filter((e) => !e.isDirectory());
-
-    const path = entries[0]?.relativePath;
-
-    const match = path?.match(
-      /^discourse\/plugins\/(?<name>[^/]+)\/discourse\//
-    );
-
-    if (match) {
-      return `discourse/plugins/${match.groups.name}/discourse`;
-    }
+    return `discourse/plugins/${this.discoursePluginName}/discourse`;
   }
 };
diff --git a/app/assets/javascripts/discourse-plugins/index.js b/app/assets/javascripts/discourse-plugins/index.js
index 996f6f08d9..df33693b31 100644
--- a/app/assets/javascripts/discourse-plugins/index.js
+++ b/app/assets/javascripts/discourse-plugins/index.js
@@ -171,7 +171,7 @@ module.exports = {
 
     tree = RawHandlebarsCompiler(tree);
 
-    tree = new DiscoursePluginColocatedTemplateProcessor(tree);
+    tree = new DiscoursePluginColocatedTemplateProcessor(tree, pluginName);
     tree = this.compileTemplates(tree);
 
     tree = this.processedAddonJsFiles(tree);

From 595fc3ef224df86d06601972bd5a74dead8da925 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 21 Oct 2022 16:32:53 -0400
Subject: [PATCH 248/332] A11Y: add keyboard support to youtube embeds (#18710)

---
 plugins/lazy-yt/assets/javascripts/lib/lazyYT.js | 8 ++++++--
 plugins/lazy-yt/assets/stylesheets/lazyYT.css    | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js
index 643bfc7ade..467515e4ee 100644
--- a/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js
@@ -51,7 +51,7 @@ export default function initLazyYt($) {
     //
     // This HTML will be placed inside 'lazyYT' container
 
-    innerHtml.push('<div class="ytp-thumbnail">');
+    innerHtml.push('<div class="ytp-thumbnail" tabIndex="0">');
 
     // Play button from YouTube (exactly as it is in YouTube)
     innerHtml.push('<div class="ytp-large-play-button"');
@@ -135,7 +135,11 @@ export default function initLazyYt($) {
     $thumb = $el
       .find(".ytp-thumbnail")
       .addClass("lazyYT-image-loaded")
-      .on("click", function (e) {
+      .on("keypress click", function (e) {
+        // Only support Enter for keypress
+        if (e.type === "keypress" && e.keyCode !== 13) {
+          return;
+        }
         e.preventDefault();
 
         if (
diff --git a/plugins/lazy-yt/assets/stylesheets/lazyYT.css b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
index 9a8e14e029..848b57a11b 100644
--- a/plugins/lazy-yt/assets/stylesheets/lazyYT.css
+++ b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
@@ -113,6 +113,7 @@
 }
 
 .lazyYT-image-loaded:hover .ytp-large-play-button-svg,
+.lazyYT-image-loaded:focus .ytp-large-play-button-svg,
 .ytp-large-play-button:focus .ytp-large-play-button-svg {
   opacity: 1;
   fill: #cc181e;

From c85e3e80838d75d8eec132267e2903d729f12aa4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 21 Oct 2022 21:44:14 +0100
Subject: [PATCH 249/332] DEV: Enable `no-args-paths` and
 `no-attrs-in-components` lint rules (#18709)

---
 .template-lintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b5095385b2..b50cdcb5fd 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -4,6 +4,8 @@ module.exports = {
 
   rules: {
     "no-action-modifiers": true,
+    "no-args-paths": true,
+    "no-attrs-in-components": true,
     "no-capital-arguments": false, // TODO: we extensively use `args` argument name
     "no-curly-component-invocation": {
       allow: [

From c752d687377740b3fba07f3f0a1a03101582c816 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 24 Oct 2022 05:51:41 +0800
Subject: [PATCH 250/332] DEV: Fabricate instead of just building topic, post
 and user in tests (#18698)

Building does not persist the object in the database which is
unrealistic since we're mostly dealing with persisted objects in
production.

In theory, this will result our test suite taking longer to run since we
now have to write to the database. However, I don't expect the increase
to be significant and it is actually no different than us adding new
tests which fabricates more objects.
---
 spec/lib/guardian_spec.rb                | 116 +++++++++++------------
 spec/lib/topic_view_spec.rb              |   4 +-
 spec/serializers/post_serializer_spec.rb |  10 +-
 3 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index b9d44f15c6..59a219f73d 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -22,8 +22,8 @@ RSpec.describe Guardian do
   fab!(:another_admin) { Fabricate(:admin) }
   fab!(:coding_horror) { Fabricate(:coding_horror) }
 
-  let(:topic) { build(:topic, user: user) }
-  let(:post) { build(:post, topic: topic, user: topic.user) }
+  fab!(:topic) { Fabricate(:topic, user: user) }
+  fab!(:post) { Fabricate(:post, topic: topic, user: topic.user) }
 
   before do
     Group.refresh_automatic_groups!
@@ -94,8 +94,8 @@ RSpec.describe Guardian do
   end
 
   describe '#post_can_act?' do
-    let(:post) { build(:post) }
-    let(:user) { build(:user) }
+    fab!(:user) { Fabricate(:user) }
+    fab!(:post) { Fabricate(:post) }
 
     it "returns false when the user is nil" do
       expect(Guardian.new(nil).post_can_act?(post, :like)).to be_falsey
@@ -119,6 +119,7 @@ RSpec.describe Guardian do
 
     it "works as expected for silenced users" do
       UserSilencer.silence(user, admin)
+
       expect(Guardian.new(user).post_can_act?(post, :spam)).to be_falsey
       expect(Guardian.new(user).post_can_act?(post, :like)).to be_truthy
       expect(Guardian.new(user).post_can_act?(post, :bookmark)).to be_truthy
@@ -221,8 +222,8 @@ RSpec.describe Guardian do
   end
 
   describe "can_enable_safe_mode" do
-    let(:user) { Fabricate.build(:user) }
-    let(:moderator) { Fabricate.build(:moderator) }
+    fab!(:user) { Fabricate(:user) }
+    fab!(:moderator) { Fabricate(:moderator) }
 
     context "when enabled" do
       before do
@@ -487,8 +488,8 @@ RSpec.describe Guardian do
   end
 
   describe 'can_invite_to_forum?' do
-    let(:user) { Fabricate.build(:user) }
-    let(:moderator) { Fabricate.build(:moderator) }
+    fab!(:user) { Fabricate(:user) }
+    fab!(:moderator) { Fabricate(:moderator) }
 
     it 'returns true if user has sufficient trust level' do
       SiteSetting.min_trust_level_to_allow_invite = 2
@@ -716,31 +717,31 @@ RSpec.describe Guardian do
     describe 'a Category' do
 
       it 'allows public categories' do
-        public_category = build(:category, read_restricted: false)
+        public_category = Fabricate(:category, read_restricted: false)
         expect(Guardian.new.can_see?(public_category)).to be_truthy
       end
 
       it 'correctly handles secure categories' do
-        normal_user = build(:user)
-        staged_user = build(:user, staged: true)
-        admin_user  = build(:user, admin: true)
+        normal_user = Fabricate(:user)
+        staged_user = Fabricate(:user, staged: true)
+        admin_user  = Fabricate(:user, admin: true)
 
-        secure_category = build(:category, read_restricted: true)
+        secure_category = Fabricate(:category, read_restricted: true)
         expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy
 
-        secure_category = build(:category, read_restricted: true, email_in: "foo@bar.com")
+        secure_category = Fabricate(:category, read_restricted: true, email_in: "foo@bar.com")
         expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy
 
-        secure_category = build(:category, read_restricted: true, email_in_allow_strangers: true)
+        secure_category = Fabricate(:category, read_restricted: true, email_in_allow_strangers: true)
         expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy
 
-        secure_category = build(:category, read_restricted: true, email_in: "foo@bar.com", email_in_allow_strangers: true)
+        secure_category = Fabricate(:category, read_restricted: true, email_in: "foo2@bar.com", email_in_allow_strangers: true)
         expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey
         expect(Guardian.new(staged_user).can_see?(secure_category)).to be_truthy
         expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy
@@ -784,27 +785,27 @@ RSpec.describe Guardian do
         topic = Fabricate(:topic)
         topic.trash!(moderator)
 
-        expect(Guardian.new(build(:user)).can_see?(topic)).to be_falsey
+        expect(Guardian.new.can_see?(topic)).to be_falsey
+        expect(Guardian.new(user).can_see?(topic)).to be_falsey
         expect(Guardian.new(moderator).can_see?(topic)).to be_truthy
         expect(Guardian.new(admin).can_see?(topic)).to be_truthy
       end
 
       it "restricts private topics" do
-        user.save!
         private_topic = Fabricate(:private_message_topic, user: user)
+
         expect(Guardian.new(private_topic.user).can_see?(private_topic)).to be_truthy
-        expect(Guardian.new(build(:user)).can_see?(private_topic)).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_see?(private_topic)).to be_falsey
         expect(Guardian.new(moderator).can_see?(private_topic)).to be_falsey
         expect(Guardian.new(admin).can_see?(private_topic)).to be_truthy
       end
 
       it "restricts private deleted topics" do
-        user.save!
         private_topic = Fabricate(:private_message_topic, user: user)
         private_topic.trash!(admin)
 
         expect(Guardian.new(private_topic.user).can_see?(private_topic)).to be_falsey
-        expect(Guardian.new(build(:user)).can_see?(private_topic)).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_see?(private_topic)).to be_falsey
         expect(Guardian.new(moderator).can_see?(private_topic)).to be_falsey
         expect(Guardian.new(admin).can_see?(private_topic)).to be_truthy
       end
@@ -813,21 +814,19 @@ RSpec.describe Guardian do
         tos_topic = Fabricate(:topic, user: Discourse.system_user)
         SiteSetting.tos_topic_id = tos_topic.id
 
-        expect(Guardian.new(build(:user)).can_edit?(tos_topic)).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_edit?(tos_topic)).to be_falsey
         expect(Guardian.new(moderator).can_edit?(tos_topic)).to be_falsey
         expect(Guardian.new(admin).can_edit?(tos_topic)).to be_truthy
       end
 
       it "allows moderators to see a flagged private message" do
-        moderator.save!
-        user.save!
-
         private_topic = Fabricate(:private_message_topic, user: user)
         first_post = Fabricate(:post, topic: private_topic, user: user)
 
         expect(Guardian.new(moderator).can_see?(private_topic)).to be_falsey
 
         PostActionCreator.create(user, first_post, :off_topic)
+
         expect(Guardian.new(moderator).can_see?(private_topic)).to be_truthy
       end
 
@@ -923,26 +922,26 @@ RSpec.describe Guardian do
         SiteSetting.enable_whispers = true
         SiteSetting.whispers_allowed_groups = "#{group.id}"
         regular_post = post
-        whisper_post = Fabricate.build(:post, post_type: Post.types[:whisper])
+        whisper_post = Fabricate(:post, post_type: Post.types[:whisper])
 
         anon_guardian = Guardian.new
         expect(anon_guardian.can_see?(regular_post)).to eq(true)
         expect(anon_guardian.can_see?(whisper_post)).to eq(false)
 
-        regular_user = Fabricate.build(:user)
+        regular_user = Fabricate(:user)
         regular_guardian = Guardian.new(regular_user)
         expect(regular_guardian.can_see?(regular_post)).to eq(true)
         expect(regular_guardian.can_see?(whisper_post)).to eq(false)
 
         # can see your own whispers
-        regular_whisper = Fabricate.build(:post, post_type: Post.types[:whisper], user: regular_user)
+        regular_whisper = Fabricate(:post, post_type: Post.types[:whisper], user: regular_user)
         expect(regular_guardian.can_see?(regular_whisper)).to eq(true)
 
-        mod_guardian = Guardian.new(Fabricate.build(:moderator))
+        mod_guardian = Guardian.new(Fabricate(:moderator))
         expect(mod_guardian.can_see?(regular_post)).to eq(true)
         expect(mod_guardian.can_see?(whisper_post)).to eq(true)
 
-        admin_guardian = Guardian.new(Fabricate.build(:admin))
+        admin_guardian = Guardian.new(Fabricate(:admin))
         expect(admin_guardian.can_see?(regular_post)).to eq(true)
         expect(admin_guardian.can_see?(whisper_post)).to eq(true)
 
@@ -1030,15 +1029,15 @@ RSpec.describe Guardian do
 
       it "is false if user has not met minimum trust level" do
         SiteSetting.min_trust_to_create_topic = 1
-        expect(Guardian.new(build(:user, trust_level: 0)).can_create?(Topic, plain_category)).to be_falsey
+        expect(Guardian.new(Fabricate(:user, trust_level: 0)).can_create?(Topic, plain_category)).to be_falsey
       end
 
       it "is true if user has met or exceeded the minimum trust level" do
         SiteSetting.min_trust_to_create_topic = 1
-        expect(Guardian.new(build(:user, trust_level: 1)).can_create?(Topic, plain_category)).to be_truthy
-        expect(Guardian.new(build(:user, trust_level: 2)).can_create?(Topic, plain_category)).to be_truthy
-        expect(Guardian.new(build(:admin, trust_level: 0)).can_create?(Topic, plain_category)).to be_truthy
-        expect(Guardian.new(build(:moderator, trust_level: 0)).can_create?(Topic, plain_category)).to be_truthy
+        expect(Guardian.new(Fabricate(:user, trust_level: 1)).can_create?(Topic, plain_category)).to be_truthy
+        expect(Guardian.new(Fabricate(:user, trust_level: 2)).can_create?(Topic, plain_category)).to be_truthy
+        expect(Guardian.new(Fabricate(:admin, trust_level: 0)).can_create?(Topic, plain_category)).to be_truthy
+        expect(Guardian.new(Fabricate(:moderator, trust_level: 0)).can_create?(Topic, plain_category)).to be_truthy
       end
     end
 
@@ -1611,7 +1610,7 @@ RSpec.describe Guardian do
         end
 
         context 'when post is older than tl2_post_edit_time_limit' do
-          let(:old_post) { build(:post, topic: topic, user: topic.user, created_at: 12.minutes.ago) }
+          let(:old_post) { Fabricate(:post, topic: topic, user: topic.user, created_at: 12.minutes.ago) }
 
           before do
             topic.user.update_columns(trust_level: 2)
@@ -1643,11 +1642,11 @@ RSpec.describe Guardian do
 
       context "with first post of a static page doc" do
         let!(:tos_topic) { Fabricate(:topic, user: Discourse.system_user) }
-        let!(:tos_first_post) { build(:post, topic: tos_topic, user: tos_topic.user) }
+        let!(:tos_first_post) { Fabricate(:post, topic: tos_topic, user: tos_topic.user) }
         before { SiteSetting.tos_topic_id = tos_topic.id }
 
         it "restricts static doc posts" do
-          expect(Guardian.new(build(:user)).can_edit?(tos_first_post)).to be_falsey
+          expect(Guardian.new(Fabricate(:user)).can_edit?(tos_first_post)).to be_falsey
           expect(Guardian.new(moderator).can_edit?(tos_first_post)).to be_falsey
           expect(Guardian.new(admin).can_edit?(tos_first_post)).to be_truthy
         end
@@ -1742,7 +1741,7 @@ RSpec.describe Guardian do
       end
 
       context 'when archived' do
-        let(:archived_topic) { build(:topic, user: user, archived: true) }
+        let(:archived_topic) { Fabricate(:topic, user: user, archived: true) }
 
         it 'returns true as a moderator' do
           expect(Guardian.new(moderator).can_edit?(archived_topic)).to be_truthy
@@ -1771,7 +1770,7 @@ RSpec.describe Guardian do
       end
 
       context 'when very old' do
-        let(:old_topic) { build(:topic, user: user, created_at: 6.minutes.ago) }
+        let(:old_topic) { Fabricate(:topic, user: user, created_at: 6.minutes.ago) }
 
         before { SiteSetting.post_edit_time_limit = 5 }
 
@@ -2042,17 +2041,12 @@ RSpec.describe Guardian do
     end
 
     context 'with a Topic' do
-      before do
-        # pretend we have a real topic
-        topic.id = 9999999
-      end
-
       it 'returns false when not logged in' do
         expect(Guardian.new.can_delete?(topic)).to be_falsey
       end
 
       it 'returns false when not a moderator' do
-        expect(Guardian.new(user).can_delete?(topic)).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_delete?(topic)).to be_falsey
       end
 
       it 'returns true when a moderator' do
@@ -2186,7 +2180,7 @@ RSpec.describe Guardian do
     end
 
     context 'with a Category' do
-      let(:category) { build(:category, user: moderator) }
+      let(:category) { Fabricate(:category, user: moderator) }
 
       it 'returns false when not logged in' do
         expect(Guardian.new.can_delete?(category)).to be_falsey
@@ -2434,7 +2428,7 @@ RSpec.describe Guardian do
   end
 
   describe "#can_access_forum?" do
-    let(:unapproved_user) { Fabricate.build(:user) }
+    let(:unapproved_user) { Fabricate(:user) }
 
     context "when must_approve_users is false" do
       before do
@@ -2749,11 +2743,11 @@ RSpec.describe Guardian do
 
   describe "can_edit_username?" do
     it "is false without a logged in user" do
-      expect(Guardian.new(nil).can_edit_username?(build(:user, created_at: 1.minute.ago))).to be_falsey
+      expect(Guardian.new(nil).can_edit_username?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
     end
 
     it "is false for regular users to edit another user's username" do
-      expect(Guardian.new(build(:user)).can_edit_username?(build(:user, created_at: 1.minute.ago))).to be_falsey
+      expect(Guardian.new(Fabricate(:user)).can_edit_username?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
     end
 
     shared_examples "staff can always change usernames" do
@@ -2862,11 +2856,11 @@ RSpec.describe Guardian do
       end
 
       it "is false when not logged in" do
-        expect(Guardian.new(nil).can_edit_email?(build(:user, created_at: 1.minute.ago))).to be_falsey
+        expect(Guardian.new(nil).can_edit_email?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
       end
 
       it "is false for regular users to edit another user's email" do
-        expect(Guardian.new(build(:user)).can_edit_email?(build(:user, created_at: 1.minute.ago))).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_edit_email?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
       end
 
       it "is true for a regular user to edit their own email" do
@@ -2888,11 +2882,11 @@ RSpec.describe Guardian do
       end
 
       it "is false when not logged in" do
-        expect(Guardian.new(nil).can_edit_email?(build(:user, created_at: 1.minute.ago))).to be_falsey
+        expect(Guardian.new(nil).can_edit_email?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
       end
 
       it "is false for regular users to edit another user's email" do
-        expect(Guardian.new(build(:user)).can_edit_email?(build(:user, created_at: 1.minute.ago))).to be_falsey
+        expect(Guardian.new(Fabricate(:user)).can_edit_email?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
       end
 
       it "is false for a regular user to edit their own email" do
@@ -2932,11 +2926,11 @@ RSpec.describe Guardian do
 
   describe 'can_edit_name?' do
     it 'is false without a logged in user' do
-      expect(Guardian.new(nil).can_edit_name?(build(:user, created_at: 1.minute.ago))).to be_falsey
+      expect(Guardian.new(nil).can_edit_name?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
     end
 
     it "is false for regular users to edit another user's name" do
-      expect(Guardian.new(build(:user)).can_edit_name?(build(:user, created_at: 1.minute.ago))).to be_falsey
+      expect(Guardian.new(Fabricate(:user)).can_edit_name?(Fabricate(:user, created_at: 1.minute.ago))).to be_falsey
     end
 
     context "for anonymous user" do
@@ -2950,7 +2944,7 @@ RSpec.describe Guardian do
     end
 
     context 'for a new user' do
-      let(:target_user) { build(:user, created_at: 1.minute.ago) }
+      let(:target_user) { Fabricate(:user, created_at: 1.minute.ago) }
 
       it 'is true for the user to change their own name' do
         expect(Guardian.new(target_user).can_edit_name?(target_user)).to be_truthy
@@ -3157,7 +3151,7 @@ RSpec.describe Guardian do
 
     context "when muter's trust level is below tl1" do
       let(:guardian) { Guardian.new(trust_level_0) }
-      let!(:trust_level_0) { build(:user, trust_level: 0) }
+      let!(:trust_level_0) { Fabricate(:user, trust_level: 0) }
 
       it 'does not allow muting user' do
         expect(guardian.can_mute_user?(another_user)).to eq(false)
@@ -3246,7 +3240,7 @@ RSpec.describe Guardian do
   end
 
   describe 'can_wiki?' do
-    let(:post) { build(:post, created_at: 1.minute.ago) }
+    let(:post) { Fabricate(:post, created_at: 1.minute.ago) }
 
     it 'returns false for regular user' do
       expect(Guardian.new(coding_horror).can_wiki?(post)).to be_falsey
@@ -3277,7 +3271,7 @@ RSpec.describe Guardian do
     end
 
     context 'when post is older than post_edit_time_limit' do
-      let(:old_post) { build(:post, user: trust_level_2, created_at: 6.minutes.ago) }
+      let(:old_post) { Fabricate(:post, user: trust_level_2, created_at: 6.minutes.ago) }
       before do
         SiteSetting.min_trust_to_allow_self_wiki = 2
         SiteSetting.tl2_post_edit_time_limit = 5
@@ -3745,7 +3739,7 @@ RSpec.describe Guardian do
     end
 
     context 'with trust_level >= 2 user' do
-      fab!(:topic_creator) { build(:user, trust_level: 2) }
+      fab!(:topic_creator) { Fabricate(:user, trust_level: 2) }
       fab!(:topic) { Fabricate(:topic, user: topic_creator) }
 
       before do
diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index 252d40ecc7..927518bd00 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -1000,8 +1000,8 @@ RSpec.describe TopicView do
   describe "#queued_posts_enabled?" do
     subject(:topic_view) { described_class.new(topic, user) }
 
-    let(:topic) { Fabricate.build(:topic) }
-    let(:user) { Fabricate.build(:user, id: 1) }
+    let(:topic) { Fabricate(:topic) }
+    let(:user) { Fabricate(:user, id: 1) }
     let(:category) { topic.category }
 
     before do
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 266507082b..0ae41c669b 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -129,11 +129,11 @@ RSpec.describe PostSerializer do
   end
 
   context "with a hidden post with add_raw enabled" do
-    let(:user) { Fabricate.build(:user, id: -99999) }
+    let(:user) { Fabricate(:user, id: -99999) }
     let(:raw)  { "Raw contents of the post." }
 
     context "with a public post" do
-      let(:post) { Fabricate.build(:post, raw: raw, user: user) }
+      let(:post) { Fabricate(:post, raw: raw, user: user) }
 
       it "includes the raw post for everyone" do
         [nil, user, Fabricate(:user), Fabricate(:moderator), Fabricate(:admin)].each do |user|
@@ -143,7 +143,7 @@ RSpec.describe PostSerializer do
     end
 
     context "with a hidden post" do
-      let(:post) { Fabricate.build(:post, raw: raw, user: user, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) }
+      let(:post) { Fabricate(:post, raw: raw, user: user, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) }
 
       it "shows the raw post only if authorized to see it" do
         expect(serialized_post_for_user(nil)[:raw]).to eq(nil)
@@ -186,7 +186,7 @@ RSpec.describe PostSerializer do
     end
 
     context "with a public wiki post" do
-      let(:post) { Fabricate.build(:post, raw: raw, user: user, wiki: true) }
+      let(:post) { Fabricate(:post, raw: raw, user: user, wiki: true) }
 
       it "can view edit history" do
         [nil, user, Fabricate(:user), Fabricate(:moderator), Fabricate(:admin)].each do |user|
@@ -197,7 +197,7 @@ RSpec.describe PostSerializer do
 
     context "with a hidden wiki post" do
       let(:post) {
-        Fabricate.build(
+        Fabricate(
           :post,
           raw: raw,
           user: user,

From 6c224929d761ea4b27438d37f6d35efa35fc66a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 10:48:03 +0200
Subject: [PATCH 251/332] Build(deps): Bump qunit from 2.19.2 to 2.19.3 in
 /app/assets/javascripts (#18714)

Bumps [qunit](https://github.com/qunitjs/qunit) from 2.19.2 to 2.19.3.
- [Release notes](https://github.com/qunitjs/qunit/releases)
- [Changelog](https://github.com/qunitjs/qunit/blob/main/History.md)
- [Commits](https://github.com/qunitjs/qunit/compare/2.19.2...2.19.3)

---
updated-dependencies:
- dependency-name: qunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 793a857529..ca5c57bd11 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -80,7 +80,7 @@
     "node-fetch": "^2.6.6",
     "pretender": "^3.4.7",
     "pretty-text": "^1.0.0",
-    "qunit": "^2.19.2",
+    "qunit": "^2.19.3",
     "qunit-dom": "^2.0.0",
     "sass": "^1.55.0",
     "select-kit": "^1.0.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index c64cf4ad13..39e157a5df 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -9002,10 +9002,10 @@ qunit-dom@^2.0.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
-qunit@^2.19.2:
-  version "2.19.2"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.2.tgz#0b2388fd14ea8b592792b538bf31cbd20b72bfd3"
-  integrity sha512-D575YwUeTFvYu9OrCitmnZ24QkcuwwLj3vtMRLHGUvme4oVljna4Qttm19BBDC4w/7wAZr2/QvbvWN6I4inJYg==
+qunit@^2.19.3:
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.3.tgz#bcf81a2e8d176dc19fe8dd358c4cbd08619af03a"
+  integrity sha512-vEnspSZ37u2oR01OA/IZ1Td5V7BvQYFECdKPv86JaBplDNa5IHg0v7jFSPoP5L5o78Dbi8sl7/ATtpRDAKlSdw==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"

From a5a37493252c324224bb9a28dcf23969d58977b0 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 24 Oct 2022 10:48:48 -0400
Subject: [PATCH 252/332] DEV: remove old CustomHTML outlet (#18711)

---
 .../discourse/app/templates/components/navigation-bar.hbs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
index f11865b78b..3467f40d2c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
@@ -1,5 +1,4 @@
 {{#each this.navItems as |navItem|}}
   <NavigationItem @content={{navItem}} @filterMode={{this.filterMode}} @category={{this.category}} @class={{concat "nav-item_" navItem.name}} />
 {{/each}}
-<CustomHtml @name="extraNavItem" @tagName="li" />
 <PluginOutlet @name="extra-nav-item" @connectorTagName="li" @args={{hash category=this.category filterMode=this.filterMode}} />

From 28be5d303716134a76ffef1c846bcda465101208 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Mon, 24 Oct 2022 11:06:11 -0400
Subject: [PATCH 253/332] DEV: Normalize event handling to improve Glimmer +
 Classic component compat (#18490)

Classic Ember components (i.e. "@ember/component") rely upon "event
delegation" to listen for events at the application root and then dispatch
those events to any event handlers defined on individual Classic components.
This coordination is handled by Ember's EventDispatcher.

In contrast, Glimmer components (i.e. "@glimmer/component") expect event
listeners to be added to elements using modifiers (such as `{{on "click"}}`).
These event listeners are added directly to DOM elements using
`addEventListener`. There is no need for an event dispatcher.

Issues may arise when using Classic and Glimmer components together, since it
requires reconciling the two event handling approaches. For instance, event
propagation may not work as expected when a Classic component is nested
inside a Glimmer component.

`normalizeEmberEventHandling` helps an application standardize upon the
Glimmer event handling approach by eliminating usage of event delegation and
instead rewiring Classic components to directly use `addEventListener`.

Specifically, it performs the following:

- Invokes `eliminateClassicEventDelegation()` to remove all events associated
  with Ember's EventDispatcher to reduce its runtime overhead and ensure that
  it is effectively not in use.

- Invokes `rewireClassicComponentEvents(app)` to rewire each Classic
  component to add its own event listeners for standard event handlers (e.g.
  `click`, `mouseDown`, `submit`, etc.).

- Configures an instance initializer that invokes
  `rewireActionModifier(appInstance)` to redefine the `action` modifier with
    a substitute that uses `addEventListener`.

Additional changes include:
* d-button: only preventDefault / stopPropagation for handled actions
   This allows unhandled events to propagate as expected.
* d-editor: avoid adding duplicate event listener for tests
   This extra event listener causes duplicate paste events in tests.
* group-manage-email-settings: Monitor `input` instead of `change` event for checkboxes
---
 app/assets/javascripts/discourse/app/app.js   |   5 +
 .../discourse/app/components/d-button.js      |  59 ++--
 .../discourse/app/components/d-editor.js      |   4 -
 .../app/initializers/ember-events.js          |  46 ----
 .../app/lib/ember-action-modifier.js          |  92 +++++++
 .../discourse/app/lib/ember-events.js         | 241 +++++++++++++++++
 .../group-manage-email-settings.hbs           |   4 +-
 .../unit/lib/ember-action-modifer-test.js     |  76 ++++++
 .../tests/unit/lib/ember-events-test.js       | 254 ++++++++++++++++++
 9 files changed, 701 insertions(+), 80 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/initializers/ember-events.js
 create mode 100644 app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
 create mode 100644 app/assets/javascripts/discourse/app/lib/ember-events.js
 create mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
 create mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 8d5d9d8ea3..6b2bd6af25 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,6 +1,7 @@
 import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 import { isTesting } from "discourse-common/config/environment";
+import { normalizeEmberEventHandling } from "./lib/ember-events";
 
 const _pluginCallbacks = [];
 let _unhandledThemeErrors = [];
@@ -54,6 +55,10 @@ const Discourse = Application.extend({
   start() {
     document.querySelector("noscript")?.remove();
 
+    // Rewire event handling to eliminate event delegation for better compat
+    // between Glimmer and Classic components.
+    normalizeEmberEventHandling(this);
+
     if (Error.stackTraceLimit) {
       // We need Errors to have full stack traces for `lib/source-identifier`
       Error.stackTraceLimit = Infinity;
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index 1726bb76d8..b2f8d2ccb1 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -118,8 +118,7 @@ export default Component.extend({
   },
 
   click(event) {
-    this._triggerAction(event);
-    return false;
+    return this._triggerAction(event);
   },
 
   mouseDown(event) {
@@ -129,37 +128,41 @@ export default Component.extend({
   },
 
   _triggerAction(event) {
-    let { action } = this;
+    let { action, route, href } = this;
 
-    if (action) {
-      if (typeof action === "string") {
-        // Note: This is deprecated in new Embers and needs to be removed in the future.
-        // There is already a warning in the console.
-        this.sendAction("action", this.actionParam);
-      } else if (typeof action === "object" && action.value) {
-        if (this.forwardEvent) {
-          action.value(this.actionParam, event);
-        } else {
-          action.value(this.actionParam);
-        }
-      } else if (typeof this.action === "function") {
-        if (this.forwardEvent) {
-          action(this.actionParam, event);
-        } else {
-          action(this.actionParam);
+    if (action || route || href?.length) {
+      if (action) {
+        if (typeof action === "string") {
+          // Note: This is deprecated in new Embers and needs to be removed in the future.
+          // There is already a warning in the console.
+          this.sendAction("action", this.actionParam);
+        } else if (typeof action === "object" && action.value) {
+          if (this.forwardEvent) {
+            action.value(this.actionParam, event);
+          } else {
+            action.value(this.actionParam);
+          }
+        } else if (typeof this.action === "function") {
+          if (this.forwardEvent) {
+            action(this.actionParam, event);
+          } else {
+            action(this.actionParam);
+          }
         }
       }
-    }
 
-    if (this.route) {
-      this.router.transitionTo(this.route);
-    }
+      if (route) {
+        this.router.transitionTo(route);
+      }
 
-    if (this.href && this.href.length) {
-      DiscourseURL.routeTo(this.href);
-    }
+      if (href?.length) {
+        DiscourseURL.routeTo(href);
+      }
 
-    event.preventDefault();
-    event.stopPropagation();
+      event.preventDefault();
+      event.stopPropagation();
+
+      return false;
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 3dcdfd0f7e..298dc542ec 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -289,10 +289,6 @@ export default Component.extend(TextareaTextManipulation, {
         "indentSelection"
       );
     }
-
-    if (isTesting()) {
-      this.element.addEventListener("paste", this.paste);
-    }
   },
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
deleted file mode 100644
index 231b01712c..0000000000
--- a/app/assets/javascripts/discourse/app/initializers/ember-events.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Ember from "ember";
-
-let initializedOnce = false;
-
-export default {
-  name: "ember-events",
-
-  initialize() {
-    // By default Ember listens to too many events. This tells it the only events
-    // we're interested in. (it removes mousemove, touchstart and touchmove)
-    if (initializedOnce) {
-      return;
-    }
-
-    Ember.EventDispatcher.reopen({
-      events: {
-        touchend: "touchEnd",
-        touchcancel: "touchCancel",
-        keydown: "keyDown",
-        keyup: "keyUp",
-        keypress: "keyPress",
-        mousedown: "mouseDown",
-        mouseup: "mouseUp",
-        contextmenu: "contextMenu",
-        click: "click",
-        dblclick: "doubleClick",
-        focusin: "focusIn",
-        focusout: "focusOut",
-        mouseenter: "mouseEnter",
-        mouseleave: "mouseLeave",
-        submit: "submit",
-        input: "input",
-        change: "change",
-        dragstart: "dragStart",
-        drag: "drag",
-        dragenter: "dragEnter",
-        dragleave: "dragLeave",
-        dragover: "dragOver",
-        drop: "drop",
-        dragend: "dragEnd",
-      },
-    });
-
-    initializedOnce = true;
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
new file mode 100644
index 0000000000..61177cce93
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
@@ -0,0 +1,92 @@
+import { modifier } from "ember-modifier";
+
+/**
+ * Creates a replacement for Ember's built-in `action` modifier that uses
+ * `addEventListener` directly instead of relying upon classic event delegation.
+ *
+ * This relies upon a deep override of Ember's rendering internals. If possible,
+ * consider eliminating usage of `action` as a modifier instead.
+ *
+ * Reference: https://github.com/emberjs/ember.js/blob/master/packages/%40ember/-internals/glimmer/lib/helpers/action.ts
+ */
+export const actionModifier = modifier(
+  (
+    element,
+    [context, callback, ...args],
+    { on, bubbles, preventDefault, allowedKeys }
+  ) => {
+    const handler = (event) => {
+      const fn = typeof callback === "string" ? context[callback] : callback;
+      if (fn === undefined) {
+        throw new Error(
+          "Unexpected callback for `action` modifier. Please provide either a function or the name of a method on the current context."
+        );
+      }
+
+      if (!isAllowedEvent(event, allowedKeys)) {
+        return true;
+      }
+
+      if (preventDefault !== false) {
+        event.preventDefault();
+      }
+
+      let shouldBubble = bubbles !== false;
+      if (!shouldBubble) {
+        event.stopPropagation();
+      }
+
+      if (args.length > 0) {
+        return fn.call(context, ...args);
+      } else {
+        return fn.call(context, event);
+      }
+    };
+
+    const eventName = on ?? "click";
+    element.addEventListener(eventName, handler);
+
+    return () => {
+      element.removeEventListener(eventName, handler);
+    };
+  },
+  { eager: false }
+);
+
+export function isSimpleClick(event) {
+  if (!(event instanceof MouseEvent)) {
+    return false;
+  }
+  let modKey = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
+  let secondaryClick = event.which > 1; // IE9 may return undefined
+
+  return !modKey && !secondaryClick;
+}
+
+const MODIFIERS = ["alt", "shift", "meta", "ctrl"];
+const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
+
+function isAllowedEvent(event, allowedKeys) {
+  if (allowedKeys === null || allowedKeys === undefined) {
+    if (POINTER_EVENT_TYPE_REGEX.test(event.type)) {
+      return isSimpleClick(event);
+    } else {
+      allowedKeys = "";
+    }
+  }
+
+  if (allowedKeys.indexOf("any") >= 0) {
+    return true;
+  }
+
+  for (let i = 0; i < MODIFIERS.length; i++) {
+    if (
+      event[MODIFIERS[i] + "Key"] &&
+      allowedKeys.indexOf(MODIFIERS[i]) === -1
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/ember-events.js b/app/assets/javascripts/discourse/app/lib/ember-events.js
new file mode 100644
index 0000000000..1c4e601218
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/ember-events.js
@@ -0,0 +1,241 @@
+// eslint-disable-next-line ember/no-classic-components
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import { actionModifier } from "./ember-action-modifier";
+
+/**
+ * Classic Ember components (i.e. "@ember/component") rely upon "event
+ * delegation" to listen for events at the application root and then dispatch
+ * those events to any event handlers defined on individual Classic components.
+ * This coordination is handled by Ember's EventDispatcher.
+ *
+ * In contrast, Glimmer components (i.e. "@glimmer/component") expect event
+ * listeners to be added to elements using modifiers (such as `{{on "click"}}`).
+ * These event listeners are added directly to DOM elements using
+ * `addEventListener`. There is no need for an event dispatcher.
+ *
+ * Issues may arise when using Classic and Glimmer components together, since it
+ * requires reconciling the two event handling approaches. For instance, event
+ * propagation may not work as expected when a Classic component is nested
+ * inside a Glimmer component.
+ *
+ * `normalizeEmberEventHandling` helps an application standardize upon the
+ * Glimmer event handling approach by eliminating usage of event delegation and
+ * instead rewiring Classic components to directly use `addEventListener`.
+ *
+ * Specifically, it performs the following:
+ *
+ * - Invokes `eliminateClassicEventDelegation()` to remove all events associated
+ *   with Ember's EventDispatcher to reduce its runtime overhead and ensure that
+ *   it is effectively not in use.
+ *
+ * - Invokes `rewireClassicComponentEvents(app)` to rewire each Classic
+ *   component to add its own event listeners for standard event handlers (e.g.
+ *   `click`, `mouseDown`, `submit`, etc.).
+ *
+ * - Configures an instance initializer that invokes
+ *   `rewireActionModifier(appInstance)` to redefine the `action` modifier with
+ *   a substitute that uses `addEventListener`.
+ *
+ * @param {Application} app
+ */
+export function normalizeEmberEventHandling(app) {
+  eliminateClassicEventDelegation();
+  rewireClassicComponentEvents(app);
+  app.instanceInitializer({
+    name: "rewire-action-modifier",
+    initialize: (appInstance) => rewireActionModifier(appInstance),
+  });
+}
+
+/**
+ * Remove all events registered with Ember's EventDispatcher to reduce its
+ * runtime overhead.
+ */
+function eliminateClassicEventDelegation() {
+  // eslint-disable-next-line no-undef
+  Ember.EventDispatcher.reopen({
+    events: {},
+  });
+}
+
+/**
+ * Standard Ember event handlers, keyed by matching DOM events.
+ *
+ * Source: https://github.com/emberjs/ember.js/blob/master/packages/@ember/-internals/views/lib/system/event_dispatcher.ts#L64-L89
+ *
+ * @type {Record<string, string>}
+ */
+const EVENTS = {
+  touchstart: "touchStart",
+  touchmove: "touchMove",
+  touchend: "touchEnd",
+  touchcancel: "touchCancel",
+  keydown: "keyDown",
+  keyup: "keyUp",
+  keypress: "keyPress",
+  mousedown: "mouseDown",
+  mouseup: "mouseUp",
+  contextmenu: "contextMenu",
+  click: "click",
+  dblclick: "doubleClick",
+  focusin: "focusIn",
+  focusout: "focusOut",
+  submit: "submit",
+  input: "input",
+  change: "change",
+  dragstart: "dragStart",
+  drag: "drag",
+  dragenter: "dragEnter",
+  dragleave: "dragLeave",
+  dragover: "dragOver",
+  drop: "drop",
+  dragend: "dragEnd",
+};
+
+/**
+ * @type {WeakMap<object, { event: string; method: string }[]>}
+ */
+const COMPONENT_SETUP = new WeakMap();
+
+const INTERNAL = Symbol("INTERNAL");
+
+/**
+ * Rewires classic component event handling to use `addEventListener` directly
+ * on inserted elements, instead of relying upon classic event delegation.
+ *
+ * This maximizes compatibility with glimmer components and event listeners
+ * added via the `on` modifier. In particular, using `addEventListener`
+ * consistently everywhere ensures that event propagation works as expected
+ * between parent and child elements.
+ *
+ * @param {Application} app
+ */
+function rewireClassicComponentEvents(app) {
+  const allEvents = { ...EVENTS };
+
+  if (app.customEvents) {
+    for (const [event, methodName] of Object.entries(app.customEvents)) {
+      allEvents[event] = methodName;
+    }
+  }
+
+  const allEventMethods = {};
+  for (const [event, methodName] of Object.entries(allEvents)) {
+    allEventMethods[methodName] = event;
+  }
+
+  // Avoid Component.reopen to stop `ember.component.reopen` deprecation warning
+  EmberObject.reopen.call(Component, {
+    /**
+     * @param {string | typeof INTERNAL} name
+     * @param {unknown[]} args
+     */
+    trigger(name, ...args) {
+      if (name === INTERNAL) {
+        if (this.element) {
+          return this._super.call(this, ...args);
+        }
+      } else if (name.toLowerCase() in allEvents) {
+        return;
+      } else {
+        return this._super.call(this, name, ...args);
+      }
+    },
+
+    initEventListeners() {
+      const proto = Object.getPrototypeOf(this);
+      let protoEvents = COMPONENT_SETUP.get(proto);
+      const ownProps = Reflect.ownKeys(this);
+
+      // Memoize prototype event handlers at the prototype and add listeners
+      // to every instance.
+      if (!protoEvents) {
+        protoEvents = [];
+        COMPONENT_SETUP.set(proto, protoEvents);
+
+        for (const method of Object.keys(allEventMethods)) {
+          if (this.has(method) && !ownProps.includes(method)) {
+            const event = allEventMethods[method];
+            protoEvents.push({ event, method });
+          }
+        }
+      }
+      addComponentEventListeners(this, protoEvents);
+
+      // Check every component instance for event handlers added via arguments
+      // specific to the instance.
+      //
+      // TODO: optimize perf since this will be run for every component instance
+      let ownEvents;
+      for (const method of Object.keys(allEventMethods)) {
+        if (ownProps.includes(method)) {
+          const event = allEventMethods[method];
+          ownEvents ??= [];
+          ownEvents.push({ event, method });
+        }
+      }
+      if (ownEvents) {
+        addComponentEventListeners(this, ownEvents);
+      }
+    },
+
+    // eslint-disable-next-line ember/no-component-lifecycle-hooks
+    didInsertElement() {
+      this._super(...arguments);
+      this.initEventListeners();
+    },
+  });
+}
+
+/**
+ * Rewires the `action` modifier to use `addEventListener` directly instead of
+ * relying upon classic event delegation.
+ *
+ * This relies upon a deep override of Ember's rendering internals. If possible,
+ * consider eliminating usage of `action` as a modifier instead.
+ *
+ * @param {ApplicationInstance} appInstance
+ */
+function rewireActionModifier(appInstance) {
+  // This is a deep runtime override, since neither the runtime resolver nor the
+  // built-in `action` modifier seem to be available otherwise.
+  //
+  // TODO: Investigate if a cleaner override is possible.
+  const renderer = appInstance.lookup("renderer:-dom");
+  const lookupModifier = renderer._runtimeResolver.lookupModifier;
+  renderer._runtimeResolver.lookupModifier = (name, owner) => {
+    if (name === "action") {
+      return actionModifier;
+    } else {
+      return lookupModifier(name, owner);
+    }
+  };
+}
+
+function addComponentEventListeners(component, events) {
+  if (events?.length > 0) {
+    const { element } = component;
+    if (element) {
+      for (const { event, method } of events) {
+        element.addEventListener(event, (e) => {
+          const ret = component.trigger.call(component, INTERNAL, method, e);
+          // If an event handler returns `false`, assume the intent is to stop
+          // propagation and default event handling, as per the behavior
+          // encoded in Ember's `EventDispatcher`.
+          //
+          // See: https://github.com/emberjs/ember.js/blob/7d9095f38911d30aebb0e67ceec13e4a9818088b/packages/%40ember/-internals/views/lib/system/event_dispatcher.ts#L331-L337
+          if (ret === false) {
+            e.preventDefault();
+            e.stopPropagation();
+          }
+          return ret;
+        });
+      }
+    } else {
+      throw new Error(
+        `Could not configure classic component event listeners on '${component.toString()}' without 'element'`
+      );
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index 7c59effdfd..bccf3ff4ac 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "input" this.smtpEnabledChange}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "input" this.imapEnabledChange}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
new file mode 100644
index 0000000000..8ede3ff97b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
@@ -0,0 +1,76 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "ember-qunit";
+import { click, doubleClick, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Unit | Lib | ember-action-modifer", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("`{{action}}` can target a function", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action this.onChildClick}} />
+    `);
+
+    await click("#childButton");
+
+    assert.strictEqual(this.childClicked, 0);
+  });
+
+  test("`{{action}}` can target a method on the current context by name", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action 'onChildClick'}} />
+    `);
+
+    await click("#childButton");
+
+    assert.strictEqual(this.childClicked, 0);
+  });
+
+  test("`{{action}}` will ignore clicks combined with modifier keys", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action 'onChildClick'}} />
+    `);
+
+    await click("#childButton", { ctrlKey: true });
+
+    assert.strictEqual(this.childClicked, undefined);
+  });
+
+  test("`{{action}}` can specify an event other than `click` via `on`", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onDblClick: () => this.set("dblClicked", i++),
+      dblClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action this.onDblClick on='dblclick'}} />
+    `);
+
+    await doubleClick("#childButton");
+
+    assert.strictEqual(this.dblClicked, 0);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
new file mode 100644
index 0000000000..1d5221261b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
@@ -0,0 +1,254 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "ember-qunit";
+import { click, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+/* eslint-disable ember/require-tagless-components */
+/* eslint-disable ember/no-classic-classes */
+/* eslint-disable ember/no-classic-components */
+import { default as ClassicComponent } from "@ember/component";
+import { default as GlimmerComponent } from "@glimmer/component";
+import { action } from "@ember/object";
+
+// Configure test-local Classic and Glimmer components that
+// will be immune from upgrades to actual Discourse components.
+const ExampleClassicButton = ClassicComponent.extend({
+  tagName: "button",
+  type: "button",
+  preventEventPropagation: false,
+  onClick: null,
+  onMouseDown: null,
+
+  click(event) {
+    event.preventDefault();
+    if (this.preventEventPropagation) {
+      event.stopPropagation();
+    }
+    this.onClick?.(event);
+  },
+});
+const exampleClassicButtonTemplate = hbs`{{yield}}`;
+
+class ExampleGlimmerButton extends GlimmerComponent {
+  @action
+  click(event) {
+    event.preventDefault();
+    if (this.args.preventEventPropagation) {
+      event.stopPropagation();
+    }
+    this.args.onClick?.(event);
+  }
+}
+const exampleGlimmerButtonTemplate = hbs`
+<button {{on 'click' this.click}} type='button' ...attributes>
+  {{yield}}
+</button>
+`;
+
+module("Unit | Lib | ember-events", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.owner.register(
+      "component:example-classic-button",
+      ExampleClassicButton
+    );
+    this.owner.register(
+      "template:components/example-classic-button",
+      exampleClassicButtonTemplate
+    );
+
+    this.owner.register(
+      "component:example-glimmer-button",
+      ExampleGlimmerButton
+    );
+    this.owner.register(
+      "template:components/example-glimmer-button",
+      exampleGlimmerButtonTemplate
+    );
+  });
+
+  module("nested glimmer inside classic", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleGlimmerButton id="childButton" @onClick={{this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleGlimmerButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested classic inside glimmer", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleClassicButton id="childButton" @onClick={{this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleClassicButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested `{{action}}` usage inside classic", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick bubbles=false}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested `{{action}}` usage inside glimmer", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick bubbles=false}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+});

From fcb467541575fb66b8f972460dd04a057a95c11c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 24 Oct 2022 17:13:54 +0100
Subject: [PATCH 254/332] DEV: Ensure event-handling reopens are only performed
 once (#18722)

In test mode we reinitialize the Application for every test. We only want to apply the class reopens once to avoid performance regressions and memory leaks in the test suite.
---
 .../javascripts/discourse/app/lib/ember-events.js  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/ember-events.js b/app/assets/javascripts/discourse/app/lib/ember-events.js
index 1c4e601218..f0b8d2ba1c 100644
--- a/app/assets/javascripts/discourse/app/lib/ember-events.js
+++ b/app/assets/javascripts/discourse/app/lib/ember-events.js
@@ -2,6 +2,7 @@
 import Component from "@ember/component";
 import EmberObject from "@ember/object";
 import { actionModifier } from "./ember-action-modifier";
+import Ember from "ember";
 
 /**
  * Classic Ember components (i.e. "@ember/component") rely upon "event
@@ -48,12 +49,17 @@ export function normalizeEmberEventHandling(app) {
   });
 }
 
+let eliminatedClassicEventDelegation = false;
 /**
  * Remove all events registered with Ember's EventDispatcher to reduce its
  * runtime overhead.
  */
 function eliminateClassicEventDelegation() {
-  // eslint-disable-next-line no-undef
+  if (eliminatedClassicEventDelegation) {
+    return;
+  }
+  eliminatedClassicEventDelegation = true;
+
   Ember.EventDispatcher.reopen({
     events: {},
   });
@@ -100,6 +106,7 @@ const COMPONENT_SETUP = new WeakMap();
 
 const INTERNAL = Symbol("INTERNAL");
 
+let rewireDone = false;
 /**
  * Rewires classic component event handling to use `addEventListener` directly
  * on inserted elements, instead of relying upon classic event delegation.
@@ -112,6 +119,11 @@ const INTERNAL = Symbol("INTERNAL");
  * @param {Application} app
  */
 function rewireClassicComponentEvents(app) {
+  if (rewireDone) {
+    return;
+  }
+  rewireDone = true;
+
   const allEvents = { ...EVENTS };
 
   if (app.customEvents) {

From 4c4ac9cc47d0a4cc569511844302ffe6944065fe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 24 Oct 2022 18:30:08 +0100
Subject: [PATCH 255/332] Revert "DEV: Normalize event handling to improve
 Glimmer + Classic component compat (#18490)" (#18725)

This reverts commit 28be5d303716134a76ffef1c846bcda465101208 and fcb467541575fb66b8f972460dd04a057a95c11c

This caused qunit timeouts in our internal CI environments. Not sure of the exact cause yet, but we're reverting for now while we investigate.
---
 app/assets/javascripts/discourse/app/app.js   |   5 -
 .../discourse/app/components/d-button.js      |  63 +++--
 .../discourse/app/components/d-editor.js      |   4 +
 .../app/initializers/ember-events.js          |  46 ++++
 .../app/lib/ember-action-modifier.js          |  92 -------
 .../discourse/app/lib/ember-events.js         | 253 -----------------
 .../group-manage-email-settings.hbs           |   4 +-
 .../unit/lib/ember-action-modifer-test.js     |  76 ------
 .../tests/unit/lib/ember-events-test.js       | 254 ------------------
 9 files changed, 82 insertions(+), 715 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/initializers/ember-events.js
 delete mode 100644 app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
 delete mode 100644 app/assets/javascripts/discourse/app/lib/ember-events.js
 delete mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
 delete mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 6b2bd6af25..8d5d9d8ea3 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,7 +1,6 @@
 import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 import { isTesting } from "discourse-common/config/environment";
-import { normalizeEmberEventHandling } from "./lib/ember-events";
 
 const _pluginCallbacks = [];
 let _unhandledThemeErrors = [];
@@ -55,10 +54,6 @@ const Discourse = Application.extend({
   start() {
     document.querySelector("noscript")?.remove();
 
-    // Rewire event handling to eliminate event delegation for better compat
-    // between Glimmer and Classic components.
-    normalizeEmberEventHandling(this);
-
     if (Error.stackTraceLimit) {
       // We need Errors to have full stack traces for `lib/source-identifier`
       Error.stackTraceLimit = Infinity;
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index b2f8d2ccb1..1726bb76d8 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -118,7 +118,8 @@ export default Component.extend({
   },
 
   click(event) {
-    return this._triggerAction(event);
+    this._triggerAction(event);
+    return false;
   },
 
   mouseDown(event) {
@@ -128,41 +129,37 @@ export default Component.extend({
   },
 
   _triggerAction(event) {
-    let { action, route, href } = this;
+    let { action } = this;
 
-    if (action || route || href?.length) {
-      if (action) {
-        if (typeof action === "string") {
-          // Note: This is deprecated in new Embers and needs to be removed in the future.
-          // There is already a warning in the console.
-          this.sendAction("action", this.actionParam);
-        } else if (typeof action === "object" && action.value) {
-          if (this.forwardEvent) {
-            action.value(this.actionParam, event);
-          } else {
-            action.value(this.actionParam);
-          }
-        } else if (typeof this.action === "function") {
-          if (this.forwardEvent) {
-            action(this.actionParam, event);
-          } else {
-            action(this.actionParam);
-          }
+    if (action) {
+      if (typeof action === "string") {
+        // Note: This is deprecated in new Embers and needs to be removed in the future.
+        // There is already a warning in the console.
+        this.sendAction("action", this.actionParam);
+      } else if (typeof action === "object" && action.value) {
+        if (this.forwardEvent) {
+          action.value(this.actionParam, event);
+        } else {
+          action.value(this.actionParam);
+        }
+      } else if (typeof this.action === "function") {
+        if (this.forwardEvent) {
+          action(this.actionParam, event);
+        } else {
+          action(this.actionParam);
         }
       }
-
-      if (route) {
-        this.router.transitionTo(route);
-      }
-
-      if (href?.length) {
-        DiscourseURL.routeTo(href);
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-
-      return false;
     }
+
+    if (this.route) {
+      this.router.transitionTo(this.route);
+    }
+
+    if (this.href && this.href.length) {
+      DiscourseURL.routeTo(this.href);
+    }
+
+    event.preventDefault();
+    event.stopPropagation();
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 298dc542ec..3dcdfd0f7e 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -289,6 +289,10 @@ export default Component.extend(TextareaTextManipulation, {
         "indentSelection"
       );
     }
+
+    if (isTesting()) {
+      this.element.addEventListener("paste", this.paste);
+    }
   },
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
new file mode 100644
index 0000000000..231b01712c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/ember-events.js
@@ -0,0 +1,46 @@
+import Ember from "ember";
+
+let initializedOnce = false;
+
+export default {
+  name: "ember-events",
+
+  initialize() {
+    // By default Ember listens to too many events. This tells it the only events
+    // we're interested in. (it removes mousemove, touchstart and touchmove)
+    if (initializedOnce) {
+      return;
+    }
+
+    Ember.EventDispatcher.reopen({
+      events: {
+        touchend: "touchEnd",
+        touchcancel: "touchCancel",
+        keydown: "keyDown",
+        keyup: "keyUp",
+        keypress: "keyPress",
+        mousedown: "mouseDown",
+        mouseup: "mouseUp",
+        contextmenu: "contextMenu",
+        click: "click",
+        dblclick: "doubleClick",
+        focusin: "focusIn",
+        focusout: "focusOut",
+        mouseenter: "mouseEnter",
+        mouseleave: "mouseLeave",
+        submit: "submit",
+        input: "input",
+        change: "change",
+        dragstart: "dragStart",
+        drag: "drag",
+        dragenter: "dragEnter",
+        dragleave: "dragLeave",
+        dragover: "dragOver",
+        drop: "drop",
+        dragend: "dragEnd",
+      },
+    });
+
+    initializedOnce = true;
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
deleted file mode 100644
index 61177cce93..0000000000
--- a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { modifier } from "ember-modifier";
-
-/**
- * Creates a replacement for Ember's built-in `action` modifier that uses
- * `addEventListener` directly instead of relying upon classic event delegation.
- *
- * This relies upon a deep override of Ember's rendering internals. If possible,
- * consider eliminating usage of `action` as a modifier instead.
- *
- * Reference: https://github.com/emberjs/ember.js/blob/master/packages/%40ember/-internals/glimmer/lib/helpers/action.ts
- */
-export const actionModifier = modifier(
-  (
-    element,
-    [context, callback, ...args],
-    { on, bubbles, preventDefault, allowedKeys }
-  ) => {
-    const handler = (event) => {
-      const fn = typeof callback === "string" ? context[callback] : callback;
-      if (fn === undefined) {
-        throw new Error(
-          "Unexpected callback for `action` modifier. Please provide either a function or the name of a method on the current context."
-        );
-      }
-
-      if (!isAllowedEvent(event, allowedKeys)) {
-        return true;
-      }
-
-      if (preventDefault !== false) {
-        event.preventDefault();
-      }
-
-      let shouldBubble = bubbles !== false;
-      if (!shouldBubble) {
-        event.stopPropagation();
-      }
-
-      if (args.length > 0) {
-        return fn.call(context, ...args);
-      } else {
-        return fn.call(context, event);
-      }
-    };
-
-    const eventName = on ?? "click";
-    element.addEventListener(eventName, handler);
-
-    return () => {
-      element.removeEventListener(eventName, handler);
-    };
-  },
-  { eager: false }
-);
-
-export function isSimpleClick(event) {
-  if (!(event instanceof MouseEvent)) {
-    return false;
-  }
-  let modKey = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
-  let secondaryClick = event.which > 1; // IE9 may return undefined
-
-  return !modKey && !secondaryClick;
-}
-
-const MODIFIERS = ["alt", "shift", "meta", "ctrl"];
-const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
-
-function isAllowedEvent(event, allowedKeys) {
-  if (allowedKeys === null || allowedKeys === undefined) {
-    if (POINTER_EVENT_TYPE_REGEX.test(event.type)) {
-      return isSimpleClick(event);
-    } else {
-      allowedKeys = "";
-    }
-  }
-
-  if (allowedKeys.indexOf("any") >= 0) {
-    return true;
-  }
-
-  for (let i = 0; i < MODIFIERS.length; i++) {
-    if (
-      event[MODIFIERS[i] + "Key"] &&
-      allowedKeys.indexOf(MODIFIERS[i]) === -1
-    ) {
-      return false;
-    }
-  }
-
-  return true;
-}
diff --git a/app/assets/javascripts/discourse/app/lib/ember-events.js b/app/assets/javascripts/discourse/app/lib/ember-events.js
deleted file mode 100644
index f0b8d2ba1c..0000000000
--- a/app/assets/javascripts/discourse/app/lib/ember-events.js
+++ /dev/null
@@ -1,253 +0,0 @@
-// eslint-disable-next-line ember/no-classic-components
-import Component from "@ember/component";
-import EmberObject from "@ember/object";
-import { actionModifier } from "./ember-action-modifier";
-import Ember from "ember";
-
-/**
- * Classic Ember components (i.e. "@ember/component") rely upon "event
- * delegation" to listen for events at the application root and then dispatch
- * those events to any event handlers defined on individual Classic components.
- * This coordination is handled by Ember's EventDispatcher.
- *
- * In contrast, Glimmer components (i.e. "@glimmer/component") expect event
- * listeners to be added to elements using modifiers (such as `{{on "click"}}`).
- * These event listeners are added directly to DOM elements using
- * `addEventListener`. There is no need for an event dispatcher.
- *
- * Issues may arise when using Classic and Glimmer components together, since it
- * requires reconciling the two event handling approaches. For instance, event
- * propagation may not work as expected when a Classic component is nested
- * inside a Glimmer component.
- *
- * `normalizeEmberEventHandling` helps an application standardize upon the
- * Glimmer event handling approach by eliminating usage of event delegation and
- * instead rewiring Classic components to directly use `addEventListener`.
- *
- * Specifically, it performs the following:
- *
- * - Invokes `eliminateClassicEventDelegation()` to remove all events associated
- *   with Ember's EventDispatcher to reduce its runtime overhead and ensure that
- *   it is effectively not in use.
- *
- * - Invokes `rewireClassicComponentEvents(app)` to rewire each Classic
- *   component to add its own event listeners for standard event handlers (e.g.
- *   `click`, `mouseDown`, `submit`, etc.).
- *
- * - Configures an instance initializer that invokes
- *   `rewireActionModifier(appInstance)` to redefine the `action` modifier with
- *   a substitute that uses `addEventListener`.
- *
- * @param {Application} app
- */
-export function normalizeEmberEventHandling(app) {
-  eliminateClassicEventDelegation();
-  rewireClassicComponentEvents(app);
-  app.instanceInitializer({
-    name: "rewire-action-modifier",
-    initialize: (appInstance) => rewireActionModifier(appInstance),
-  });
-}
-
-let eliminatedClassicEventDelegation = false;
-/**
- * Remove all events registered with Ember's EventDispatcher to reduce its
- * runtime overhead.
- */
-function eliminateClassicEventDelegation() {
-  if (eliminatedClassicEventDelegation) {
-    return;
-  }
-  eliminatedClassicEventDelegation = true;
-
-  Ember.EventDispatcher.reopen({
-    events: {},
-  });
-}
-
-/**
- * Standard Ember event handlers, keyed by matching DOM events.
- *
- * Source: https://github.com/emberjs/ember.js/blob/master/packages/@ember/-internals/views/lib/system/event_dispatcher.ts#L64-L89
- *
- * @type {Record<string, string>}
- */
-const EVENTS = {
-  touchstart: "touchStart",
-  touchmove: "touchMove",
-  touchend: "touchEnd",
-  touchcancel: "touchCancel",
-  keydown: "keyDown",
-  keyup: "keyUp",
-  keypress: "keyPress",
-  mousedown: "mouseDown",
-  mouseup: "mouseUp",
-  contextmenu: "contextMenu",
-  click: "click",
-  dblclick: "doubleClick",
-  focusin: "focusIn",
-  focusout: "focusOut",
-  submit: "submit",
-  input: "input",
-  change: "change",
-  dragstart: "dragStart",
-  drag: "drag",
-  dragenter: "dragEnter",
-  dragleave: "dragLeave",
-  dragover: "dragOver",
-  drop: "drop",
-  dragend: "dragEnd",
-};
-
-/**
- * @type {WeakMap<object, { event: string; method: string }[]>}
- */
-const COMPONENT_SETUP = new WeakMap();
-
-const INTERNAL = Symbol("INTERNAL");
-
-let rewireDone = false;
-/**
- * Rewires classic component event handling to use `addEventListener` directly
- * on inserted elements, instead of relying upon classic event delegation.
- *
- * This maximizes compatibility with glimmer components and event listeners
- * added via the `on` modifier. In particular, using `addEventListener`
- * consistently everywhere ensures that event propagation works as expected
- * between parent and child elements.
- *
- * @param {Application} app
- */
-function rewireClassicComponentEvents(app) {
-  if (rewireDone) {
-    return;
-  }
-  rewireDone = true;
-
-  const allEvents = { ...EVENTS };
-
-  if (app.customEvents) {
-    for (const [event, methodName] of Object.entries(app.customEvents)) {
-      allEvents[event] = methodName;
-    }
-  }
-
-  const allEventMethods = {};
-  for (const [event, methodName] of Object.entries(allEvents)) {
-    allEventMethods[methodName] = event;
-  }
-
-  // Avoid Component.reopen to stop `ember.component.reopen` deprecation warning
-  EmberObject.reopen.call(Component, {
-    /**
-     * @param {string | typeof INTERNAL} name
-     * @param {unknown[]} args
-     */
-    trigger(name, ...args) {
-      if (name === INTERNAL) {
-        if (this.element) {
-          return this._super.call(this, ...args);
-        }
-      } else if (name.toLowerCase() in allEvents) {
-        return;
-      } else {
-        return this._super.call(this, name, ...args);
-      }
-    },
-
-    initEventListeners() {
-      const proto = Object.getPrototypeOf(this);
-      let protoEvents = COMPONENT_SETUP.get(proto);
-      const ownProps = Reflect.ownKeys(this);
-
-      // Memoize prototype event handlers at the prototype and add listeners
-      // to every instance.
-      if (!protoEvents) {
-        protoEvents = [];
-        COMPONENT_SETUP.set(proto, protoEvents);
-
-        for (const method of Object.keys(allEventMethods)) {
-          if (this.has(method) && !ownProps.includes(method)) {
-            const event = allEventMethods[method];
-            protoEvents.push({ event, method });
-          }
-        }
-      }
-      addComponentEventListeners(this, protoEvents);
-
-      // Check every component instance for event handlers added via arguments
-      // specific to the instance.
-      //
-      // TODO: optimize perf since this will be run for every component instance
-      let ownEvents;
-      for (const method of Object.keys(allEventMethods)) {
-        if (ownProps.includes(method)) {
-          const event = allEventMethods[method];
-          ownEvents ??= [];
-          ownEvents.push({ event, method });
-        }
-      }
-      if (ownEvents) {
-        addComponentEventListeners(this, ownEvents);
-      }
-    },
-
-    // eslint-disable-next-line ember/no-component-lifecycle-hooks
-    didInsertElement() {
-      this._super(...arguments);
-      this.initEventListeners();
-    },
-  });
-}
-
-/**
- * Rewires the `action` modifier to use `addEventListener` directly instead of
- * relying upon classic event delegation.
- *
- * This relies upon a deep override of Ember's rendering internals. If possible,
- * consider eliminating usage of `action` as a modifier instead.
- *
- * @param {ApplicationInstance} appInstance
- */
-function rewireActionModifier(appInstance) {
-  // This is a deep runtime override, since neither the runtime resolver nor the
-  // built-in `action` modifier seem to be available otherwise.
-  //
-  // TODO: Investigate if a cleaner override is possible.
-  const renderer = appInstance.lookup("renderer:-dom");
-  const lookupModifier = renderer._runtimeResolver.lookupModifier;
-  renderer._runtimeResolver.lookupModifier = (name, owner) => {
-    if (name === "action") {
-      return actionModifier;
-    } else {
-      return lookupModifier(name, owner);
-    }
-  };
-}
-
-function addComponentEventListeners(component, events) {
-  if (events?.length > 0) {
-    const { element } = component;
-    if (element) {
-      for (const { event, method } of events) {
-        element.addEventListener(event, (e) => {
-          const ret = component.trigger.call(component, INTERNAL, method, e);
-          // If an event handler returns `false`, assume the intent is to stop
-          // propagation and default event handling, as per the behavior
-          // encoded in Ember's `EventDispatcher`.
-          //
-          // See: https://github.com/emberjs/ember.js/blob/7d9095f38911d30aebb0e67ceec13e4a9818088b/packages/%40ember/-internals/views/lib/system/event_dispatcher.ts#L331-L337
-          if (ret === false) {
-            e.preventDefault();
-            e.stopPropagation();
-          }
-          return ret;
-        });
-      }
-    } else {
-      throw new Error(
-        `Could not configure classic component event listeners on '${component.toString()}' without 'element'`
-      );
-    }
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index bccf3ff4ac..7c59effdfd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "input" this.smtpEnabledChange}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "input" this.imapEnabledChange}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
deleted file mode 100644
index 8ede3ff97b..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "ember-qunit";
-import { click, doubleClick, render } from "@ember/test-helpers";
-import { hbs } from "ember-cli-htmlbars";
-
-module("Unit | Lib | ember-action-modifer", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("`{{action}}` can target a function", async function (assert) {
-    let i = 0;
-
-    this.setProperties({
-      onChildClick: () => this.set("childClicked", i++),
-      childClicked: undefined,
-    });
-
-    await render(hbs`
-      <button id="childButton" {{action this.onChildClick}} />
-    `);
-
-    await click("#childButton");
-
-    assert.strictEqual(this.childClicked, 0);
-  });
-
-  test("`{{action}}` can target a method on the current context by name", async function (assert) {
-    let i = 0;
-
-    this.setProperties({
-      onChildClick: () => this.set("childClicked", i++),
-      childClicked: undefined,
-    });
-
-    await render(hbs`
-      <button id="childButton" {{action 'onChildClick'}} />
-    `);
-
-    await click("#childButton");
-
-    assert.strictEqual(this.childClicked, 0);
-  });
-
-  test("`{{action}}` will ignore clicks combined with modifier keys", async function (assert) {
-    let i = 0;
-
-    this.setProperties({
-      onChildClick: () => this.set("childClicked", i++),
-      childClicked: undefined,
-    });
-
-    await render(hbs`
-      <button id="childButton" {{action 'onChildClick'}} />
-    `);
-
-    await click("#childButton", { ctrlKey: true });
-
-    assert.strictEqual(this.childClicked, undefined);
-  });
-
-  test("`{{action}}` can specify an event other than `click` via `on`", async function (assert) {
-    let i = 0;
-
-    this.setProperties({
-      onDblClick: () => this.set("dblClicked", i++),
-      dblClicked: undefined,
-    });
-
-    await render(hbs`
-      <button id="childButton" {{action this.onDblClick on='dblclick'}} />
-    `);
-
-    await doubleClick("#childButton");
-
-    assert.strictEqual(this.dblClicked, 0);
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
deleted file mode 100644
index 1d5221261b..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
+++ /dev/null
@@ -1,254 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "ember-qunit";
-import { click, render } from "@ember/test-helpers";
-import { hbs } from "ember-cli-htmlbars";
-
-/* eslint-disable ember/require-tagless-components */
-/* eslint-disable ember/no-classic-classes */
-/* eslint-disable ember/no-classic-components */
-import { default as ClassicComponent } from "@ember/component";
-import { default as GlimmerComponent } from "@glimmer/component";
-import { action } from "@ember/object";
-
-// Configure test-local Classic and Glimmer components that
-// will be immune from upgrades to actual Discourse components.
-const ExampleClassicButton = ClassicComponent.extend({
-  tagName: "button",
-  type: "button",
-  preventEventPropagation: false,
-  onClick: null,
-  onMouseDown: null,
-
-  click(event) {
-    event.preventDefault();
-    if (this.preventEventPropagation) {
-      event.stopPropagation();
-    }
-    this.onClick?.(event);
-  },
-});
-const exampleClassicButtonTemplate = hbs`{{yield}}`;
-
-class ExampleGlimmerButton extends GlimmerComponent {
-  @action
-  click(event) {
-    event.preventDefault();
-    if (this.args.preventEventPropagation) {
-      event.stopPropagation();
-    }
-    this.args.onClick?.(event);
-  }
-}
-const exampleGlimmerButtonTemplate = hbs`
-<button {{on 'click' this.click}} type='button' ...attributes>
-  {{yield}}
-</button>
-`;
-
-module("Unit | Lib | ember-events", function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.owner.register(
-      "component:example-classic-button",
-      ExampleClassicButton
-    );
-    this.owner.register(
-      "template:components/example-classic-button",
-      exampleClassicButtonTemplate
-    );
-
-    this.owner.register(
-      "component:example-glimmer-button",
-      ExampleGlimmerButton
-    );
-    this.owner.register(
-      "template:components/example-glimmer-button",
-      exampleGlimmerButtonTemplate
-    );
-  });
-
-  module("nested glimmer inside classic", function () {
-    test("it handles click events and allows propagation by default", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
-          <ExampleGlimmerButton id="childButton" @onClick={{this.onChildClick}} />
-        </ExampleClassicButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, 1);
-    });
-
-    test("it handles click events and can prevent event propagation", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
-          <ExampleGlimmerButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
-        </ExampleClassicButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, undefined);
-    });
-  });
-
-  module("nested classic inside glimmer", function () {
-    test("it handles click events and allows propagation by default", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
-          <ExampleClassicButton id="childButton" @onClick={{this.onChildClick}} />
-        </ExampleGlimmerButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, 1);
-    });
-
-    test("it handles click events and can prevent event propagation", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
-          <ExampleClassicButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
-        </ExampleGlimmerButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, undefined);
-    });
-  });
-
-  module("nested `{{action}}` usage inside classic", function () {
-    test("it handles click events and allows propagation by default", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
-          <button id="childButton" {{action this.onChildClick}} />
-        </ExampleClassicButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, 1);
-    });
-
-    test("it handles click events and can prevent event propagation", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
-          <button id="childButton" {{action this.onChildClick bubbles=false}} />
-        </ExampleClassicButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, undefined);
-    });
-  });
-
-  module("nested `{{action}}` usage inside glimmer", function () {
-    test("it handles click events and allows propagation by default", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
-          <button id="childButton" {{action this.onChildClick}} />
-        </ExampleGlimmerButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, 1);
-    });
-
-    test("it handles click events and can prevent event propagation", async function (assert) {
-      let i = 0;
-
-      this.setProperties({
-        onParentClick: () => this.set("parentClicked", i++),
-        onChildClick: () => this.set("childClicked", i++),
-        parentClicked: undefined,
-        childClicked: undefined,
-      });
-
-      await render(hbs`
-        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
-          <button id="childButton" {{action this.onChildClick bubbles=false}} />
-        </ExampleGlimmerButton>
-      `);
-
-      await click("#childButton");
-
-      assert.strictEqual(this.childClicked, 0);
-      assert.strictEqual(this.parentClicked, undefined);
-    });
-  });
-});

From c421dc0b2894ed2cae407b1727fff92603a7e90b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 24 Oct 2022 19:37:01 +0200
Subject: [PATCH 256/332] UX: Improve autocomplete styling (#18723)

1. Restore the original text color (`--primary-high`)
2. Fix the double bottom border
3. Make the padding around icons even
---
 .../stylesheets/common/base/compose.scss      | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index ab8adc21af..584fc1a374 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -393,44 +393,55 @@ html.composer-open {
   width: 240px;
   background-color: var(--secondary);
   border: 1px solid var(--primary-low);
+
   ul {
     list-style: none;
     padding: 0;
     margin: 0;
 
     li {
-      .d-icon-users {
-        color: var(--primary-medium);
-        padding: 0 2px;
+      &:not(:last-child) {
+        border-bottom: 1px solid var(--primary-low);
       }
 
-      border-bottom: 1px solid var(--primary-low);
-
       a {
-        padding: 5px;
-        display: block;
         @include ellipsis;
+        color: var(--primary-high);
+        display: flex;
+        padding: 5px;
 
-        span.username {
-          color: var(--primary);
-        }
-        span.name {
-          font-size: var(--font-down-1);
-          vertical-align: middle;
-        }
-        &.selected {
-          background-color: var(--tertiary-low);
-        }
         @include hover {
           background-color: var(--highlight-low);
           text-decoration: none;
         }
 
+        &.selected {
+          background-color: var(--tertiary-low);
+        }
+
+        span {
+          margin-left: 5px;
+
+          &.username {
+            color: var(--primary);
+          }
+
+          &.name {
+            font-size: var(--font-down-1);
+            vertical-align: middle;
+          }
+        }
+
         .relative-date {
           font-size: var(--font-down-3);
           padding-top: 10em;
         }
       }
+
+      .d-icon-users {
+        color: var(--primary-medium);
+        padding: 0 2px;
+      }
     }
   }
 }

From 25fbbf4020c8c87c549e42dc81363d40a37db29f Mon Sep 17 00:00:00 2001
From: Jan Cernik <66427541+jancernik@users.noreply.github.com>
Date: Mon, 24 Oct 2022 14:54:02 -0300
Subject: [PATCH 257/332] UX: Stop falling back to topic image on embeds
 (#18720)

If linked post (not OP) has no image, it won't fall back to the topic
image anymore.
---
 lib/topic_view.rb           | 4 ++--
 spec/lib/topic_view_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 1c2ed0e7b0..b242d03503 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -301,8 +301,8 @@ class TopicView
   end
 
   def image_url
-    url = desired_post&.image_url if @post_number > 1
-    url || @topic.image_url
+    return @topic.image_url if @post_number == 1
+    desired_post&.image_url
   end
 
   def filter_posts(opts = {})
diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index 927518bd00..7282eca535 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -895,9 +895,9 @@ RSpec.describe TopicView do
         post1.update_column(:image_upload_id, op_upload.id)
       end
 
-      it "uses the topic image as a fallback when posts have no image" do
+      it "uses the topic image for op and posts image when they have one" do
         expect(topic_view_for_post(1).image_url).to end_with(op_upload.url)
-        expect(topic_view_for_post(2).image_url).to end_with(op_upload.url)
+        expect(topic_view_for_post(2).image_url).to eq(nil)
         expect(topic_view_for_post(3).image_url).to end_with(post3_upload.url)
       end
     end

From f4c70283f76da906efc918ff9542fe34d87eedc5 Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Mon, 24 Oct 2022 20:58:44 +0200
Subject: [PATCH 258/332] Fix: minor typo (#18695)

Fix: minor typo
---
 docs/ADMIN-QUICK-START-GUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index a6442931bf..4a157b9428 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -73,7 +73,7 @@ To make (or remove) a pin or a banner, use the admin wrench at the top right or
 
 ### New User Sandbox and the Trust System
 
-If your discussion area is be open to the public, new visitors will arrive that are initially strangers to the community. Discourse has a [trust system](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) where users can, over time, earn the trust of the community and gain abilities to assist in governing their community.
+If your discussion area is open to the public, new visitors will arrive that are initially strangers to the community. Discourse has a [trust system](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) where users can, over time, earn the trust of the community and gain abilities to assist in governing their community.
 
 Discourse is designed to offer safe defaults for public communities, even with no active moderation.
 

From 266e165885523cd0834d33abd7b38495515e6e1b Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 24 Oct 2022 22:26:48 +0300
Subject: [PATCH 259/332] FIX: Use only first line from commit message (#18724)

Linking a commit from a GitHub pull request included the complete commit
message, instead of just the first line. The rest of the commit message
will be added to the body of the Onebox.
---
 lib/onebox/engine/github_pull_request_onebox.rb           | 2 +-
 lib/onebox/templates/githubpullrequest.mustache           | 2 +-
 spec/lib/onebox/engine/github_pull_request_onebox_spec.rb | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/onebox/engine/github_pull_request_onebox.rb b/lib/onebox/engine/github_pull_request_onebox.rb
index 403c62f4b2..1ef23815cc 100644
--- a/lib/onebox/engine/github_pull_request_onebox.rb
+++ b/lib/onebox/engine/github_pull_request_onebox.rb
@@ -40,7 +40,7 @@ module Onebox
         result['body'], result['excerpt'] = compute_body(result['body'])
 
         if result['commit'] = load_commit(link)
-          result['body'], result['excerpt'] = compute_body(result['commit']['body'])
+          result['body'], result['excerpt'] = compute_body(result['commit']['commit']['message'].lines[1..].join)
         elsif result['comment'] = load_comment(link)
           result['body'], result['excerpt'] = compute_body(result['comment']['body'])
         elsif result['discussion'] = load_review(link)
diff --git a/lib/onebox/templates/githubpullrequest.mustache b/lib/onebox/templates/githubpullrequest.mustache
index 8b0ee6378a..5868ba2e82 100644
--- a/lib/onebox/templates/githubpullrequest.mustache
+++ b/lib/onebox/templates/githubpullrequest.mustache
@@ -26,7 +26,7 @@
   <div class="github-info-container">
     {{#commit}}
       <h4>
-        <a href="{{link}}" target="_blank" rel="noopener">{{commit.message}}</a>
+        <a href="{{link}}" target="_blank" rel="noopener">{{commit.message.lines.first}}</a>
       </h4>
 
       <span>
diff --git a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
index c6ab147da4..24f62fe08b 100644
--- a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
@@ -59,7 +59,9 @@ RSpec.describe Onebox::Engine::GithubPullRequestOnebox do
     end
 
     it "includes commit name" do
-      expect(html).to include("Add audio onebox")
+      doc = Nokogiri::HTML5(html)
+      expect(doc.css('h4').text.strip).to eq("Add audio onebox")
+      expect(doc.css('.github-body-container').text).to include("http://meta.discourse.org/t/audio-html5-tag/8168")
     end
   end
 

From ab330a98ad2f73685df6ae4ea42a442b3e8d5a11 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 24 Oct 2022 21:34:41 +0200
Subject: [PATCH 260/332] UX: Fix user status display in autocomplete (#18726)

A follow-up to c421dc0b2894ed2cae407b1727fff92603a7e90b
---
 app/assets/stylesheets/common/base/compose.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 584fc1a374..ca76f74be6 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -406,6 +406,7 @@ html.composer-open {
 
       a {
         @include ellipsis;
+        align-items: center;
         color: var(--primary-high);
         display: flex;
         padding: 5px;
@@ -424,17 +425,16 @@ html.composer-open {
 
           &.username {
             color: var(--primary);
+            margin-right: 5px;
           }
 
           &.name {
             font-size: var(--font-down-1);
-            vertical-align: middle;
           }
         }
 
         .relative-date {
           font-size: var(--font-down-3);
-          padding-top: 10em;
         }
       }
 

From 589a249a6539f74c31c2a4f50c7249628c8b72b0 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 24 Oct 2022 23:00:37 +0200
Subject: [PATCH 261/332] FIX: Correctly reset `controllerReady` prop (#18727)

---
 .../javascripts/discourse/app/controllers/topic.js |  1 +
 .../javascripts/discourse/app/routes/topic.js      | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index f682f8e68b..2b58257d8e 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -71,6 +71,7 @@ export default Controller.extend(bufferedProperty("model"), {
   currentPostId: null,
   userLastReadPostNumber: null,
   highestPostNumber: null,
+  controllerReady: false,
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
index 615b353e4e..b299ae5996 100644
--- a/app/assets/javascripts/discourse/app/routes/topic.js
+++ b/app/assets/javascripts/discourse/app/routes/topic.js
@@ -16,16 +16,9 @@ const SCROLL_DELAY = 500;
 const TopicRoute = DiscourseRoute.extend({
   screenTrack: service(),
 
-  init() {
-    this._super(...arguments);
-
-    this.setProperties({
-      isTransitioning: false,
-      scheduledReplace: null,
-      lastScrollPos: null,
-      controllerReady: true,
-    });
-  },
+  scheduledReplace: null,
+  lastScrollPos: null,
+  isTransitioning: false,
 
   redirect() {
     return this.redirectIfLoginRequired();
@@ -359,6 +352,7 @@ const TopicRoute = DiscourseRoute.extend({
       model,
       editingTopic: false,
       firstPostExpanded: false,
+      controllerReady: false,
     });
 
     this.searchService.set("searchContext", model.get("searchContext"));

From 0ffd40867466b0f6b6fbcbc08e01d1a62633d915 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 25 Oct 2022 06:18:40 +0800
Subject: [PATCH 262/332] DEV: Remove harded id when fabricating in tests
 (#18729)

Hardcoding ids always lead to sadness for our test suite
---
 spec/lib/topic_view_spec.rb              | 2 +-
 spec/serializers/post_serializer_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index 7282eca535..469c19a6b4 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -1001,7 +1001,7 @@ RSpec.describe TopicView do
     subject(:topic_view) { described_class.new(topic, user) }
 
     let(:topic) { Fabricate(:topic) }
-    let(:user) { Fabricate(:user, id: 1) }
+    let(:user) { Fabricate(:user) }
     let(:category) { topic.category }
 
     before do
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 0ae41c669b..55ac7c961c 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -129,7 +129,7 @@ RSpec.describe PostSerializer do
   end
 
   context "with a hidden post with add_raw enabled" do
-    let(:user) { Fabricate(:user, id: -99999) }
+    let(:user) { Fabricate(:user) }
     let(:raw)  { "Raw contents of the post." }
 
     context "with a public post" do

From 0730a56ce770ea9adbf34479cd7cf58a9d6499fc Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 25 Oct 2022 08:59:17 +1000
Subject: [PATCH 263/332] FEATURE: Generic hashtag autocomplete sorting
 (#18718)

Adds sorting for the HashtagAutocompleteService to
sort the results by case-insensitive text _within_
the type sort order specified by the params. This
should fix some flaky specs as well.
---
 app/services/hashtag_autocomplete_service.rb  |  5 ++-
 .../hashtag_autocomplete_service_spec.rb      | 39 ++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/services/hashtag_autocomplete_service.rb b/app/services/hashtag_autocomplete_service.rb
index 3d1efe2227..1280f267df 100644
--- a/app/services/hashtag_autocomplete_service.rb
+++ b/app/services/hashtag_autocomplete_service.rb
@@ -2,6 +2,7 @@
 
 class HashtagAutocompleteService
   HASHTAGS_PER_REQUEST = 20
+  SEARCH_MAX_LIMIT = 20
 
   attr_reader :guardian
   cattr_reader :data_sources
@@ -137,8 +138,9 @@ class HashtagAutocompleteService
     { categories: categories_hashtags, tags: tag_hashtags }
   end
 
-  def search(term, types_in_priority_order, limit = 5)
+  def search(term, types_in_priority_order, limit: 5)
     raise Discourse::InvalidParameters.new(:order) if !types_in_priority_order.is_a?(Array)
+    limit = [limit, SEARCH_MAX_LIMIT].min
 
     results = []
     slugs_by_type = {}
@@ -159,6 +161,7 @@ class HashtagAutocompleteService
         item.type = type
         item.ref = item.ref || item.slug
       end
+      data.sort_by! { |item| item.text.downcase }
       slugs_by_type[type] = data.map(&:slug)
 
       results.concat(data)
diff --git a/spec/services/hashtag_autocomplete_service_spec.rb b/spec/services/hashtag_autocomplete_service_spec.rb
index c098dd3f5e..94281c4c66 100644
--- a/spec/services/hashtag_autocomplete_service_spec.rb
+++ b/spec/services/hashtag_autocomplete_service_spec.rb
@@ -41,12 +41,25 @@ RSpec.describe HashtagAutocompleteService do
     end
 
     it "respects the limit param" do
-      expect(subject.search("book", %w[tag category], 1).map(&:text)).to eq(["great-books x 0"])
+      expect(subject.search("book", %w[tag category], limit: 1).map(&:text)).to eq(["great-books x 0"])
+    end
+
+    it "does not allow more than SEARCH_MAX_LIMIT results to be specified by the limit param" do
+      stub_const(HashtagAutocompleteService, "SEARCH_MAX_LIMIT", 1) do
+        expect(subject.search("book", %w[category tag], limit: 1000).map(&:text)).to eq(
+          ["Book Club"],
+        )
+      end
+    end
+
+    it "does not search other data sources if the limit is reached by earlier type data sources" do
+      Site.any_instance.expects(:categories).never
+      subject.search("book", %w[tag category], limit: 1)
     end
 
     it "includes the tag count" do
       tag1.update!(topic_count: 78)
-      expect(subject.search("book", %w[tag category], 1).map(&:text)).to eq(["great-books x 78"])
+      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(["great-books x 78", "Book Club"])
     end
 
     it "does case-insensitive search" do
@@ -68,11 +81,6 @@ RSpec.describe HashtagAutocompleteService do
       expect(subject.search("book", %w[tag]).map(&:text)).to be_empty
     end
 
-    it "does not search other data sources if the limit is reached by earlier type data sources" do
-      Site.any_instance.expects(:categories).never
-      subject.search("book", %w[tag category], 1)
-    end
-
     it "includes other data sources" do
       Fabricate(:bookmark, user: user, name: "read review of this fantasy book")
       Fabricate(:bookmark, user: user, name: "cool rock song")
@@ -109,7 +117,7 @@ RSpec.describe HashtagAutocompleteService do
     it "appends type suffixes for the ref on conflicting slugs on items that are not the top priority type" do
       Fabricate(:tag, name: "book-club")
       expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
-        %w[book-club great-books book-club::tag],
+        %w[book-club book-club::tag great-books],
       )
 
       Fabricate(:bookmark, user: user, name: "book club")
@@ -118,10 +126,23 @@ RSpec.describe HashtagAutocompleteService do
       register_bookmark_data_source
 
       expect(subject.search("book", %w[category tag bookmark]).map(&:ref)).to eq(
-        %w[book-club great-books book-club::tag book-club::bookmark],
+        %w[book-club book-club::tag great-books book-club::bookmark],
       )
     end
 
+    context "when multiple tags and categories are returned" do
+      fab!(:category2) { Fabricate(:category, name: "Book Zone", slug: "book-zone") }
+      fab!(:category3) { Fabricate(:category, name: "Book Dome", slug: "book-dome") }
+      fab!(:tag2) { Fabricate(:tag, name: "mid-books") }
+      fab!(:tag3) { Fabricate(:tag, name: "terrible-books") }
+
+      it "orders them by name within their type order" do
+        expect(subject.search("book", %w[category tag], limit: 10).map(&:ref)).to eq(
+          %w[book-club book-dome book-zone great-books mid-books terrible-books],
+        )
+      end
+    end
+
     context "when not tagging_enabled" do
       before { SiteSetting.tagging_enabled = false }
 

From cde2719ea14cb1b93b840f9ef78b4f3602133bc6 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 25 Oct 2022 09:01:15 +1000
Subject: [PATCH 264/332] DEV: Fix flaky uploads:disable_secure_uploads spec
 (#18719)

This test flakes occassionally, possibly because
of the arg ordering which we do not guarantee.
In future if this keeps occurring we may want to
try make expect_enqueued_with not care about argument
orders or the order of arrays etc within those arguments.
---
 spec/tasks/uploads_spec.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 9ebc5097dd..0b801c28cd 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -209,13 +209,11 @@ RSpec.describe "tasks/uploads" do
       expect(post2.reload.baked_at).not_to eq_time(1.week.ago)
     end
 
-    it "updates the affected ACLs" do
-      expect_enqueued_with(
-        job: :sync_acls_for_uploads,
-        args: { upload_ids: [upload1.id, upload2.id, upload3.id, upload4.id] },
-      ) do
-        invoke_task
-      end
+    it "updates the affected ACLs via the SyncAclsForUploads job" do
+      invoke_task
+      expect(Jobs::SyncAclsForUploads.jobs.last["args"][0]["upload_ids"]).to match_array(
+        [upload1.id, upload2.id, upload3.id, upload4.id]
+      )
     end
   end
 end

From b6f5b236b38d5ef00a9c1d12b39c584ba6f3b544 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 24 Oct 2022 19:22:02 -0400
Subject: [PATCH 265/332] UX: drag new user menus, scroll primary user nav
 (#18690)

---
 .../app/components/horizontal-overflow-nav.js | 72 +++++++++++-----
 .../discourse/app/components/user-nav.hbs     |  4 +-
 .../components/horizontal-overflow-nav.hbs    |  8 +-
 .../stylesheets/common/base/new-user.scss     | 84 +++----------------
 .../stylesheets/common/components/_index.scss |  1 +
 .../components/horizontal-overflow-nav.scss   | 78 +++++++++++++++++
 6 files changed, 150 insertions(+), 97 deletions(-)
 create mode 100644 app/assets/stylesheets/common/components/horizontal-overflow-nav.scss

diff --git a/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
index 79d0a06519..24d2f4292f 100644
--- a/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
+++ b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
@@ -12,10 +12,8 @@ export default class HorizontalOverflowNav extends Component {
   scrollInterval;
 
   @bind
-  scrollToActive() {
-    const activeElement = document.querySelector(
-      ".user-navigation-secondary a.active"
-    );
+  scrollToActive(element) {
+    const activeElement = element.querySelector("a.active");
 
     activeElement?.scrollIntoView({
       block: "nearest",
@@ -24,14 +22,14 @@ export default class HorizontalOverflowNav extends Component {
   }
 
   @bind
-  checkScroll(element) {
+  checkScroll(event) {
     if (this.site.mobileView) {
       return;
     }
 
-    this.watchScroll(element);
+    this.watchScroll(event);
     return (this.hasScroll =
-      element.target.scrollWidth > element.target.offsetWidth);
+      event.target.scrollWidth > event.target.offsetWidth);
   }
 
   @bind
@@ -40,14 +38,14 @@ export default class HorizontalOverflowNav extends Component {
   }
 
   @bind
-  watchScroll(element) {
+  watchScroll(event) {
     if (this.site.mobileView) {
       return;
     }
 
     if (
-      element.target.offsetWidth + element.target.scrollLeft ===
-      element.target.scrollWidth
+      event.target.offsetWidth + event.target.scrollLeft ===
+      event.target.scrollWidth
     ) {
       this.hideRightScroll = true;
       clearInterval(this.scrollInterval);
@@ -55,7 +53,7 @@ export default class HorizontalOverflowNav extends Component {
       this.hideRightScroll = false;
     }
 
-    if (element.target.scrollLeft === 0) {
+    if (event.target.scrollLeft === 0) {
       this.hideLeftScroll = true;
       clearInterval(this.scrollInterval);
     } else {
@@ -63,21 +61,57 @@ export default class HorizontalOverflowNav extends Component {
     }
   }
 
-  @action
-  horizScroll(element) {
-    let scrollSpeed = 100;
-    let siblingTarget = element.target.previousElementSibling;
+  @bind
+  scrollDrag(event) {
+    if (this.site.mobileView) {
+      return;
+    }
 
-    if (element.target.dataset.direction === "left") {
+    event.preventDefault();
+
+    const navPills = event.target.closest(".nav-pills");
+
+    const position = {
+      left: navPills.scrollLeft, // current scroll
+      x: event.clientX, // mouse position
+    };
+
+    const mouseDragScroll = function (e) {
+      let mouseChange = e.clientX - position.x;
+      navPills.scrollLeft = position.left - mouseChange;
+
+      navPills.querySelectorAll("a").forEach((a) => {
+        a.style.cursor = "grabbing";
+      });
+    };
+
+    const removeDragScroll = function () {
+      document.removeEventListener("mousemove", mouseDragScroll);
+
+      navPills.querySelectorAll("a").forEach((a) => {
+        a.style.cursor = "pointer";
+      });
+    };
+
+    document.addEventListener("mousemove", mouseDragScroll);
+    document.addEventListener("mouseup", removeDragScroll);
+  }
+
+  @action
+  horizScroll(event) {
+    let scrollSpeed = 175;
+    let siblingTarget = event.target.previousElementSibling;
+
+    if (event.target.dataset.direction === "left") {
       scrollSpeed = scrollSpeed * -1;
-      siblingTarget = element.target.nextElementSibling;
+      siblingTarget = event.target.nextElementSibling;
     }
 
     this.scrollInterval = setInterval(function () {
       siblingTarget.scrollLeft += scrollSpeed;
     }, 50);
 
-    element.target.addEventListener("mouseup", this.stopScroll);
-    element.target.addEventListener("mouseleave", this.stopScroll);
+    event.target.addEventListener("mouseup", this.stopScroll);
+    event.target.addEventListener("mouseleave", this.stopScroll);
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 6a832c2d89..4caa7d2e7a 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -1,5 +1,5 @@
 <section class="user-navigation user-navigation-primary">
-  <ul class="main-nav nav nav-pills user-nav">
+  <HorizontalOverflowNav @className="main-nav nav user-nav">
     {{#unless @user.profile_hidden}}
       <li class="summary">
         <LinkTo @route="user.summary">
@@ -74,5 +74,5 @@
         </a>
       </li>
     {{/if}}
-  </ul>
+  </HorizontalOverflowNav>
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs b/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
index d726eb8eef..e3963b966e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
@@ -1,4 +1,5 @@
 {{!-- template-lint-disable no-down-event-binding --}}
+{{!-- template-lint-disable no-invalid-interactive --}}
 
 <div class="horizontal-overflow-nav {{if this.hasScroll "has-scroll"}}">
   {{#if this.hasScroll}}
@@ -6,7 +7,7 @@
       role="button"
       {{on "mousedown" this.horizScroll}}
       data-direction="left"
-      class="nav-overflow__scroll-left btn-flat {{if this.hideLeftScroll "transparent"}}"
+      class="horizontal-overflow-nav__scroll-left {{if this.hideLeftScroll "disabled"}}"
     >
       {{d-icon "chevron-left"}}
     </a>
@@ -16,7 +17,8 @@
     {{on-resize this.checkScroll}}
     {{on "scroll" this.watchScroll}}
     {{did-insert this.scrollToActive}}
-    class="nav-pills action-list"
+    {{on "mousedown" this.scrollDrag}}
+    class="nav-pills action-list {{@className}}"
   >
     {{yield}}
   </ul>
@@ -25,7 +27,7 @@
     <a
       role="button"
       {{on "mousedown" this.horizScroll}}
-      class="nav-overflow__scroll-right btn-flat {{if this.hideRightScroll "transparent"}}"
+      class="horizontal-overflow-nav__scroll-right {{if this.hideRightScroll "disabled"}}"
     >
       {{d-icon "chevron-right"}}
     </a>
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index c666ce8461..85772e3fe3 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -2,9 +2,8 @@
   margin-top: -15px; // temp, can remove margin from sibling element after nav finalized
   .user-navigation {
     --user-navigation__border-width: 4px;
-    &.user-navigation-primary {
-      border-bottom: 1px solid var(--primary-low);
-    }
+    border-bottom: 1px solid var(--primary-low);
+
     .nav-pills {
       width: 100%;
       margin: 0;
@@ -37,7 +36,6 @@
       li {
         flex: 1 1 auto;
         margin: 0;
-        overflow: hidden;
         display: flex;
 
         a {
@@ -80,6 +78,15 @@
     }
   }
 
+  .user-navigation-primary {
+    [class*="horizontal-overflow-nav__scroll"] {
+      font-size: var(--font-up-1);
+      .d-icon {
+        margin-top: 0.15em; // minor alignment
+      }
+    }
+  }
+
   .user-navigation-secondary {
     --user-navigation__border-width: 2px;
     position: relative;
@@ -89,12 +96,6 @@
     gap: 0 0.5em;
     border-bottom: 1px solid var(--primary-low);
 
-    .horizontal-overflow-nav {
-      position: relative;
-      min-width: 0;
-      width: 100%;
-    }
-
     .select-kit .select-kit-header {
       height: 100%;
       padding: 0.5em 1em;
@@ -116,73 +117,10 @@
       }
     }
 
-    .nav-overflow__scroll-right,
-    .nav-overflow__scroll-left {
-      --fade-width: 20px;
-      opacity: 1;
-      position: absolute;
-      z-index: 2;
-      background-color: var(--secondary);
-      top: 0;
-      bottom: 0;
-      display: flex;
-      align-items: center;
-      transition: opacity 0.25s;
-      .d-icon {
-        pointer-events: none;
-        margin-bottom: 0.2em;
-        color: var(--quaternary);
-      }
-      &.transparent {
-        // hiding with opacity so we can transition visibility
-        opacity: 0;
-        pointer-events: none;
-      }
-    }
-
-    .nav-overflow__scroll-right {
-      right: 0;
-      &:before {
-        content: "";
-        margin-left: -1.5em;
-        height: 100%;
-        width: 1.5em;
-        background: linear-gradient(
-          to left,
-          rgba(var(--secondary-rgb), 1),
-          rgba(var(--secondary-rgb), 0)
-        );
-      }
-    }
-
-    .nav-overflow__scroll-left {
-      left: 0;
-      &:after {
-        content: "";
-        margin-right: -1.5em;
-        height: 100%;
-        width: 1.5em;
-        background: linear-gradient(
-          to right,
-          rgba(var(--secondary-rgb), 1),
-          rgba(var(--secondary-rgb), 0)
-        );
-      }
-    }
-
     .nav-pills {
       flex: 1 1 auto;
       font-size: var(--font-down-1);
       justify-content: flex-start;
-      overflow: auto;
-      position: relative;
-      scroll-behavior: smooth;
-
-      // hides scrollbars, but allows mouse scrolling
-      scrollbar-width: none;
-      &::-webkit-scrollbar {
-        height: 0;
-      }
 
       li {
         flex: 1 0 auto;
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
index a054cd4478..361546e053 100644
--- a/app/assets/stylesheets/common/components/_index.scss
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -15,6 +15,7 @@
 @import "group-member-dropdown";
 @import "groups-form-membership-fields";
 @import "hashtag";
+@import "horizontal-overflow-nav";
 @import "iframed-html";
 @import "ignored-user-list";
 @import "keyboard_shortcuts";
diff --git a/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss b/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss
new file mode 100644
index 0000000000..9f2f817c02
--- /dev/null
+++ b/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss
@@ -0,0 +1,78 @@
+.horizontal-overflow-nav {
+  position: relative;
+  min-width: 0;
+  width: 100%;
+  .nav-pills {
+    overflow: auto;
+    min-width: 0;
+    position: relative;
+
+    // avoids auto-scroll on initial load if active nav item is overflowed
+    scroll-behavior: auto;
+
+    // hides scrollbars, but allows mouse scrolling
+    scrollbar-width: none;
+    &::-webkit-scrollbar {
+      height: 0;
+    }
+  }
+  &.has-scroll {
+    .nav-pills {
+      scroll-behavior: smooth; // smooth scrolling on user interaction
+    }
+  }
+}
+
+.horizontal-overflow-nav__scroll-right,
+.horizontal-overflow-nav__scroll-left {
+  --fade-width: 1.5em;
+  opacity: 1;
+  position: absolute;
+  z-index: 2;
+  background-color: var(--secondary);
+  top: 0;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  transition: opacity 0.25s;
+  .d-icon {
+    pointer-events: none;
+    margin-bottom: 0.2em;
+    color: var(--quaternary);
+  }
+  &.disabled {
+    // hiding with opacity so we can transition visibility
+    opacity: 0;
+    pointer-events: none;
+  }
+}
+
+.horizontal-overflow-nav__scroll-right {
+  right: 0;
+  &:before {
+    content: "";
+    margin-left: calc(var(--fade-width) * -1);
+    height: 100%;
+    width: var(--fade-width);
+    background: linear-gradient(
+      to left,
+      rgba(var(--secondary-rgb), 1),
+      rgba(var(--secondary-rgb), 0)
+    );
+  }
+}
+
+.horizontal-overflow-nav__scroll-left {
+  left: 0;
+  &:after {
+    content: "";
+    margin-right: calc(var(--fade-width) * -1);
+    height: 100%;
+    width: var(--fade-width);
+    background: linear-gradient(
+      to right,
+      rgba(var(--secondary-rgb), 1),
+      rgba(var(--secondary-rgb), 0)
+    );
+  }
+}

From fd8fd0a1f0d21f5fd2c5b2bb93e32a6bb68f592e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 24 Oct 2022 18:55:51 -0600
Subject: [PATCH 266/332] DEV: Document create group api params (#18736)

* DEV: Document create group api params

Documenting more params that are available to the create group api
endpoint.

* fix spelling
---
 spec/requests/api/groups_spec.rb              |  2 +-
 .../schemas/json/group_create_request.json    | 76 +++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 048c1f4e2c..fb58ae03d0 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'groups' do
   end
 
   path '/admin/groups.json' do
-    post 'Creates a group' do
+    post 'Create a group' do
       tags 'Groups'
       operationId 'createGroup'
       consumes 'application/json'
diff --git a/spec/requests/api/schemas/json/group_create_request.json b/spec/requests/api/schemas/json/group_create_request.json
index 5be58664cf..bcbd237b78 100644
--- a/spec/requests/api/schemas/json/group_create_request.json
+++ b/spec/requests/api/schemas/json/group_create_request.json
@@ -7,6 +7,82 @@
       "properties": {
         "name": {
           "type": "string"
+        },
+        "full_name": {
+          "type": "string"
+        },
+        "bio_raw": {
+          "type": "string",
+          "description": "About Group"
+        },
+        "usernames": {
+          "type": "string",
+          "description": "comma,separated"
+        },
+        "owner_usernames": {
+          "type": "string",
+          "description": "comma,separated"
+        },
+        "automatic_membership_email_domains": {
+          "type": "string",
+          "description": "pipe|separated"
+        },
+        "visibility_level": {
+          "type": "integer"
+        },
+        "primary_group": {
+          "type": "boolean"
+        },
+        "flair_icon": {
+          "type": "string"
+        },
+        "flair_upload_id": {
+          "type": "integer"
+        },
+        "flair_bg_color": {
+          "type": "string"
+        },
+        "public_admission": {
+          "type": "boolean"
+        },
+        "public_exit": {
+          "type": "boolean"
+        },
+        "public_exit": {
+          "type": "boolean"
+        },
+        "default_notification_level": {
+          "type": "integer"
+        },
+        "muted_category_ids": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        "regular_category_ids": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        "watching_category_ids": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        "tracking_category_ids": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        "watching_first_post_category_ids": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
         }
       },
       "required": [

From d85c89ba6d06a36fec2eee85821a8c62d8203e74 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 25 Oct 2022 09:13:37 +0800
Subject: [PATCH 267/332] FIX: Category chooser not updating selection when
 editing reviewable (#18737)

---
 .../components/reviewable-field-category.js   | 21 +++++++++++--------
 .../components/reviewable-field-category.hbs  |  2 +-
 .../discourse/tests/acceptance/review-test.js | 14 +++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/reviewable-field-category.js b/app/assets/javascripts/discourse/app/components/reviewable-field-category.js
index 5bf439319c..d780f4d983 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-field-category.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-field-category.js
@@ -1,10 +1,13 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
 
-export default Component.extend({
-  actions: {
-    onChange(category) {
-      this.set("value", category);
-      this.categoryChanged && this.categoryChanged(category);
-    },
-  },
-});
+export default class extends Component {
+  @tracked categoryId = this.args.value;
+
+  @action
+  onChange(category) {
+    this.categoryId = category;
+    this.args.categoryChanged?.(category);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
index 94bd6a0ba1..924af758af 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
@@ -1 +1 @@
-<CategoryChooser @value={{this.value}} @onChange={{action "onChange"}} />
+<CategoryChooser @value={{this.categoryId}} @onChange={{this.onChange}} />
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index 3272b8bd15..212ada586f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -135,13 +135,17 @@ acceptance("Review", function (needs) {
 
   test("Editing a reviewable", async function (assert) {
     const topic = '.reviewable-item[data-reviewable-id="4321"]';
+
     await visit("/review");
+
     assert.ok(exists(`${topic} .reviewable-action.approve`));
     assert.ok(!exists(`${topic} .category-name`));
+
     assert.strictEqual(
       query(`${topic} .discourse-tag:nth-of-type(1)`).innerText,
       "hello"
     );
+
     assert.strictEqual(
       query(`${topic} .discourse-tag:nth-of-type(2)`).innerText,
       "world"
@@ -154,10 +158,12 @@ acceptance("Review", function (needs) {
 
     await click(`${topic} .reviewable-action.edit`);
     await click(`${topic} .reviewable-action.save-edit`);
+
     assert.ok(
       exists(`${topic} .reviewable-action.approve`),
       "saving without changes is a cancel"
     );
+
     await click(`${topic} .reviewable-action.edit`);
 
     assert.ok(
@@ -167,6 +173,7 @@ acceptance("Review", function (needs) {
 
     await fillIn(".editable-field.payload-raw textarea", "new raw contents");
     await click(`${topic} .reviewable-action.cancel-edit`);
+
     assert.strictEqual(
       query(`${topic} .post-body`).innerText.trim(),
       "existing body",
@@ -175,9 +182,16 @@ acceptance("Review", function (needs) {
 
     await click(`${topic} .reviewable-action.edit`);
     let category = selectKit(`${topic} .category-id .select-kit`);
+
     await category.expand();
     await category.selectRowByValue("6");
 
+    assert.strictEqual(
+      category.header().name(),
+      "support",
+      "displays the right header"
+    );
+
     let tags = selectKit(`${topic} .payload-tags .mini-tag-chooser`);
     requests = [];
     await tags.expand();

From df56ab172ae94ba0d9df436c06b77064d83b730e Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 25 Oct 2022 09:29:09 +0200
Subject: [PATCH 268/332] DEV: Remove remaining hardcoded ids (#18735)

---
 spec/fabricators/user_fabricator.rb           |  7 +++++
 spec/lib/email/processor_spec.rb              |  9 +++----
 spec/lib/email/receiver_spec.rb               | 13 ++++-----
 spec/lib/file_store/base_store_spec.rb        |  5 +++-
 spec/lib/guardian_spec.rb                     |  2 +-
 spec/lib/site_setting_extension_spec.rb       |  3 ++-
 spec/lib/unread_spec.rb                       | 27 +++++++++----------
 spec/lib/validators/post_validator_spec.rb    |  2 +-
 spec/models/topic_spec.rb                     |  2 +-
 spec/models/user_spec.rb                      |  2 +-
 spec/requests/groups_controller_spec.rb       |  3 +--
 .../vanilla_body_parser_spec.rb               | 14 +++++-----
 .../current_user_serializer_spec.rb           |  2 +-
 spec/serializers/user_card_serializer_spec.rb | 12 ++++-----
 spec/serializers/user_serializer_spec.rb      | 13 +++------
 15 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 385340ea08..09ad6c57cc 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -132,3 +132,10 @@ end
 Fabricator(:unicode_user, from: :user) do
   username { sequence(:username) { |i| "Löwe#{i}" } }
 end
+
+Fabricator(:bot, from: :user) do
+  id do
+    min_id = User.minimum(:id)
+    [(min_id || 0) - 1, -10].min
+  end
+end
diff --git a/spec/lib/email/processor_spec.rb b/spec/lib/email/processor_spec.rb
index 01a0dc6161..42b6efe37e 100644
--- a/spec/lib/email/processor_spec.rb
+++ b/spec/lib/email/processor_spec.rb
@@ -172,14 +172,13 @@ RSpec.describe Email::Processor do
   end
 
   describe 'when replying to a post that is too old' do
-    let(:mail) { file_from_fixtures("old_destination.eml", "emails").read }
     fab!(:user) { Fabricate(:user, email: "discourse@bar.com") }
+    fab!(:topic) { Fabricate(:topic) }
+    fab!(:post) { Fabricate(:post, topic: topic, created_at: 3.days.ago) }
+    let(:mail) { file_from_fixtures("old_destination.eml", "emails").read.gsub("424242", topic.id.to_s).gsub("123456", post.id.to_s) }
+
     it 'rejects the email with the right response' do
       SiteSetting.disallow_reply_by_email_after_days = 2
-
-      topic = Fabricate(:topic, id: 424242)
-      post  = Fabricate(:post, topic: topic, id: 123456, created_at: 3.days.ago)
-
       processor = Email::Processor.new(mail)
       processor.process!
 
diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rb
index f286e2b334..fe90637742 100644
--- a/spec/lib/email/receiver_spec.rb
+++ b/spec/lib/email/receiver_spec.rb
@@ -83,18 +83,19 @@ RSpec.describe Email::Receiver do
   it "raises an OldDestinationError when notification is too old" do
     SiteSetting.disallow_reply_by_email_after_days = 2
 
-    topic = Fabricate(:topic, id: 424242)
-    post  = Fabricate(:post, topic: topic, id: 123456)
+    topic = Fabricate(:topic)
+    post  = Fabricate(:post, topic: topic)
     user  = Fabricate(:user, email: "discourse@bar.com")
 
-    expect { process(:old_destination) }.to raise_error(
+    mail = email(:old_destination).gsub("424242", topic.id.to_s)
+    expect { Email::Receiver.new(mail).process! }.to raise_error(
       Email::Receiver::BadDestinationAddress
     )
 
     IncomingEmail.destroy_all
     post.update!(created_at: 3.days.ago)
 
-    expect { process(:old_destination) }.to raise_error(
+    expect { Email::Receiver.new(mail).process! }.to raise_error(
       Email::Receiver::OldDestinationError
     )
     expect(IncomingEmail.last.error).to eq("Email::Receiver::OldDestinationError")
@@ -102,7 +103,7 @@ RSpec.describe Email::Receiver do
     SiteSetting.disallow_reply_by_email_after_days = 0
     IncomingEmail.destroy_all
 
-    expect { process(:old_destination) }.to raise_error(
+    expect { Email::Receiver.new(mail).process! }.to raise_error(
       Email::Receiver::BadDestinationAddress
     )
   end
@@ -434,7 +435,7 @@ RSpec.describe Email::Receiver do
       expect(topic.posts.last.raw).to eq("This will not include the previous discussion that is present in this email.")
     end
 
-    it "removes the trnaslated 'Previous Replies' marker" do
+    it "removes the translated 'Previous Replies' marker" do
       expect { process(:previous_replies_de) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("This will not include the previous discussion that is present in this email.")
     end
diff --git a/spec/lib/file_store/base_store_spec.rb b/spec/lib/file_store/base_store_spec.rb
index cd45506413..18bf38d08c 100644
--- a/spec/lib/file_store/base_store_spec.rb
+++ b/spec/lib/file_store/base_store_spec.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe FileStore::BaseStore do
-  fab!(:upload) { Fabricate(:upload, id: 9999, sha1: Digest::SHA1.hexdigest('9999')) }
+  fab!(:upload) do
+    Upload.delete(9999) # In case of any collisions
+    Fabricate(:upload, id: 9999, sha1: Digest::SHA1.hexdigest('9999'))
+  end
 
   describe '#get_path_for_upload' do
     def expect_correct_path(expected_path)
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index 59a219f73d..f9f3bfe234 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -303,7 +303,7 @@ RSpec.describe Guardian do
       end
 
       it "returns true for bot user" do
-        expect(Guardian.new(Fabricate(:user, id: -19876)).can_send_private_message?(another_user)).to be_truthy
+        expect(Guardian.new(Fabricate(:bot)).can_send_private_message?(another_user)).to be_truthy
       end
 
       it "returns true for system user" do
diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rb
index ad39c656ef..bf5fd92b38 100644
--- a/spec/lib/site_setting_extension_spec.rb
+++ b/spec/lib/site_setting_extension_spec.rb
@@ -771,7 +771,8 @@ RSpec.describe SiteSettingExtension do
   describe '.all_settings' do
     describe 'uploads settings' do
       it 'should return the right values' do
-        system_upload = Fabricate(:upload, id: -999)
+        negative_upload_id = [(Upload.minimum(:id) || 0) - 1, -10].min
+        system_upload = Fabricate(:upload, id: negative_upload_id)
         settings.setting(:logo, system_upload.id, type: :upload)
         settings.refresh!
         setting = settings.all_settings.last
diff --git a/spec/lib/unread_spec.rb b/spec/lib/unread_spec.rb
index 8b953fbcaf..88d3a1c66a 100644
--- a/spec/lib/unread_spec.rb
+++ b/spec/lib/unread_spec.rb
@@ -3,22 +3,22 @@
 require 'unread'
 
 RSpec.describe Unread do
-
   let(:whisperers_group) { Fabricate(:group) }
-  let(:user) { Fabricate(:user, id: 1, groups: [whisperers_group]) }
+  let(:user) { Fabricate(:user, groups: [whisperers_group]) }
   let(:topic) do
-    Fabricate.build(:topic,
-                       posts_count: 13,
-                       highest_staff_post_number: 15,
-                       highest_post_number: 13,
-                       id: 1)
+    Fabricate(:topic,
+      posts_count: 13,
+      highest_staff_post_number: 15,
+      highest_post_number: 13,
+    )
   end
 
-  let (:topic_user) do
-    Fabricate.build(:topic_user,
-                        notification_level: TopicUser.notification_levels[:tracking],
-                        topic_id: topic.id,
-                        user_id: user.id)
+  let(:topic_user) do
+    Fabricate(:topic_user,
+      notification_level: TopicUser.notification_levels[:tracking],
+      topic_id: topic.id,
+      user_id: user.id
+    )
   end
 
   def unread
@@ -73,10 +73,9 @@ RSpec.describe Unread do
       expect(unread.unread_posts).to eq(0)
     end
 
-    it 'has 0 unread psots if the user has not seen the topic' do
+    it 'has 0 unread posts if the user has not seen the topic' do
       topic_user.last_read_post_number = nil
       expect(unread.unread_posts).to eq(0)
     end
   end
-
 end
diff --git a/spec/lib/validators/post_validator_spec.rb b/spec/lib/validators/post_validator_spec.rb
index b167130e9a..79255723bd 100644
--- a/spec/lib/validators/post_validator_spec.rb
+++ b/spec/lib/validators/post_validator_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe PostValidator do
     end
 
     context "when post's topic is a PM between a human and a non human user" do
-      fab!(:robot) { Fabricate(:user, id: -3) }
+      fab!(:robot) { Fabricate(:bot) }
       fab!(:user) { Fabricate(:user) }
 
       let(:topic) do
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 3b569b901e..e98d872f41 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2801,7 +2801,7 @@ RSpec.describe Topic do
   end
 
   describe '#pm_with_non_human_user?' do
-    fab!(:robot) { Fabricate(:user, id: -3) }
+    fab!(:robot) { Fabricate(:bot) }
 
     fab!(:topic) do
       topic = Fabricate(:private_message_topic,
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a1a91cf9bd..60d6a9e202 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1992,7 +1992,7 @@ RSpec.describe User do
 
   describe '.human_users' do
     it 'should only return users with a positive primary key' do
-      Fabricate(:user, id: -1979)
+      Fabricate(:bot)
       user = Fabricate(:user)
 
       expect(User.human_users).to eq([user])
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index f4f1b41a4e..493a4cc599 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1136,8 +1136,7 @@ RSpec.describe GroupsController do
       )
     end
 
-    fab!(:bot) { Fabricate(:user, id: -999) }
-
+    fab!(:bot) { Fabricate(:bot) }
     let(:group) { Fabricate(:group, users: [user1, user2, user3, bot]) }
 
     it "should allow members to be sorted by" do
diff --git a/spec/script/import_scripts/vanilla_body_parser_spec.rb b/spec/script/import_scripts/vanilla_body_parser_spec.rb
index 51e1106a9d..31a2fdb385 100644
--- a/spec/script/import_scripts/vanilla_body_parser_spec.rb
+++ b/spec/script/import_scripts/vanilla_body_parser_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe VanillaBodyParser do
   let(:lookup) { ImportScripts::LookupContainer.new }
   let(:uploader) { ImportScripts::Uploader.new }
   let(:uploads_path) { 'spec/fixtures/images/vanilla_import' }
-  let(:user) { Fabricate(:user, id: '34567', email: 'saruman@maiar.org', name: 'Saruman, Multicolor', username: 'saruman_multicolor') }
-  let(:user_id) { lookup.add_user('34567', user) }
+  let(:user) { Fabricate(:user, email: 'saruman@maiar.org', name: 'Saruman, Multicolor', username: 'saruman_multicolor') }
+  let(:user_id) { lookup.add_user(user.id.to_s, user) }
 
   before do
     STDOUT.stubs(:write)
@@ -68,10 +68,11 @@ this starts with spaces but IS NOT a quote'''
     end
 
     it 'supports mentions imported users' do
-      mentioned = Fabricate(:user, id: '666', email: 'gandalf@maiar.com', name: 'Gandalf The Grey', username: 'gandalf_the_grey')
-      lookup.add_user('666', mentioned)
+      mentioned = Fabricate(:user, email: 'gandalf@maiar.com', name: 'Gandalf The Grey', username: 'gandalf_the_grey')
+      lookup.add_user(mentioned.id.to_s, mentioned)
 
-      parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:mention].to_json }, user_id).parse
+      body = rich_bodies[:mention].to_json.gsub("666", mentioned.id.to_s)
+      parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => body }, user_id).parse
       expect(parsed).to eq "@gandalf_the_grey, what do you think?"
     end
 
@@ -91,7 +92,8 @@ this starts with spaces but IS NOT a quote'''
       topic_id = lookup.add_topic(post)
       lookup.add_post('discussion#12345', post)
 
-      parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:quote].to_json }, user_id).parse
+      body = rich_bodies[:quote].to_json.gsub("34567", user.id.to_s)
+      parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => body }, user_id).parse
       expect(parsed).to eq "[quote=\"#{user.username}, post: #{post.post_number}, topic: #{post.topic.id}\"]\n\nThis is the full<br \/>body<br \/>of the quoted discussion.<br \/>\n\n[/quote]\n\nWhen did this happen?"
     end
 
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index a8095e7557..68479524d8 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -297,7 +297,7 @@ RSpec.describe CurrentUserSerializer do
     let(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user) }
     let(:category_sidebar_section_link_2) { Fabricate(:category_sidebar_section_link, user: user) }
 
-    it "is not included when SiteSeting.enable_experimental_sidebar_hamburger is false" do
+    it "is not included when SiteSetting.enable_experimental_sidebar_hamburger is false" do
       category_sidebar_section_link
       SiteSetting.enable_experimental_sidebar_hamburger = false
 
diff --git a/spec/serializers/user_card_serializer_spec.rb b/spec/serializers/user_card_serializer_spec.rb
index 0e070cfcc5..94c6efe233 100644
--- a/spec/serializers/user_card_serializer_spec.rb
+++ b/spec/serializers/user_card_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe UserCardSerializer do
   context "with a TL0 user seen as anonymous" do
-    let(:user) { Fabricate.build(:user, trust_level: 0, user_profile: Fabricate.build(:user_profile)) }
+    let(:user) { Fabricate(:user, trust_level: 0) }
     let(:serializer) { described_class.new(user, scope: Guardian.new, root: false) }
     let(:json) { serializer.as_json }
 
@@ -14,12 +14,9 @@ RSpec.describe UserCardSerializer do
 
   context "as current user" do
     it "serializes emails correctly" do
-      user = Fabricate.build(:user,
-                             id: 1,
-                             user_profile: Fabricate.build(:user_profile),
-                             user_option: UserOption.new(dynamic_favicon: true),
-                             user_stat: UserStat.new
-                            )
+      user = Fabricate(:user)
+      user.user_option.update(dynamic_favicon: true)
+
       json = described_class.new(user, scope: Guardian.new(user), root: false).as_json
       expect(json[:secondary_emails]).to eq([])
       expect(json[:unconfirmed_emails]).to eq([])
@@ -29,6 +26,7 @@ RSpec.describe UserCardSerializer do
   context "as different user" do
     let(:user) { Fabricate(:user, trust_level: 0) }
     let(:user2) { Fabricate(:user, trust_level: 1) }
+
     it "does not serialize emails" do
       json = described_class.new(user, scope: Guardian.new(user2), root: false).as_json
       expect(json[:secondary_emails]).to be_nil
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index b5abe360d2..0576545325 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -38,13 +38,8 @@ RSpec.describe UserSerializer do
       SiteSetting.default_other_notification_level_when_replying = 3
       SiteSetting.default_other_new_topic_duration_minutes = 60 * 24
 
-      user = Fabricate.build(:user,
-                             id: 1,
-                             user_profile: Fabricate.build(:user_profile),
-                             user_option: UserOption.new(dynamic_favicon: true, skip_new_user_tips: true),
-                             user_stat: UserStat.new,
-                             created_at: Time.zone.now
-                            )
+      user = Fabricate(:user)
+      user.user_option.update(dynamic_favicon: true, skip_new_user_tips: true)
 
       json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
 
@@ -384,14 +379,14 @@ RSpec.describe UserSerializer do
     context 'when viewing self' do
       subject(:json) { UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json }
 
-      it "is not included when SiteSeting.enable_experimental_sidebar_hamburger is false" do
+      it "is not included when SiteSetting.enable_experimental_sidebar_hamburger is false" do
         SiteSetting.enable_experimental_sidebar_hamburger = false
         SiteSetting.tagging_enabled = true
 
         expect(json[:sidebar_tags]).to eq(nil)
       end
 
-      it "is not included when SiteSeting.tagging_enabled is false" do
+      it "is not included when SiteSetting.tagging_enabled is false" do
         SiteSetting.enable_experimental_sidebar_hamburger = true
         SiteSetting.tagging_enabled = false
 

From af3b5e9345ca618b0473cbcf161ed74b0d41f849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:29:48 +0800
Subject: [PATCH 269/332] Build(deps): Bump oauth-tty from 1.0.3 to 1.0.5
 (#18697)

Bumps [oauth-tty](https://gitlab.com/oauth-xx/oauth-tty) from 1.0.3 to 1.0.5.
- [Release notes](https://gitlab.com/oauth-xx/oauth-tty/tags)
- [Changelog](https://gitlab.com/oauth-xx/oauth-tty/blob/main/CHANGELOG.md)
- [Commits](https://gitlab.com/oauth-xx/oauth-tty/compare/v1.0.3...v1.0.5)

---
updated-dependencies:
- dependency-name: oauth-tty
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 31d09e2dac..fe7ff70ca5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -270,8 +270,8 @@ GEM
       oauth-tty (~> 1.0, >= 1.0.1)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    oauth-tty (1.0.3)
-      version_gem (~> 1.1)
+    oauth-tty (1.0.5)
+      version_gem (~> 1.1, >= 1.1.1)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -489,7 +489,7 @@ GEM
     uniform_notifier (1.16.0)
     uri (0.11.0)
     uri_template (0.7.0)
-    version_gem (1.1.0)
+    version_gem (1.1.1)
     webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)

From 63bb1ca488372c39fd3594b2b32ac4c52c188b7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:30:06 +0800
Subject: [PATCH 270/332] Build(deps): Bump snaky_hash from 2.0.0 to 2.0.1
 (#18696)

Bumps [snaky_hash](https://gitlab.com/oauth-xx/snaky_hash) from 2.0.0 to 2.0.1.
- [Release notes](https://gitlab.com/oauth-xx/snaky_hash/tags)
- [Changelog](https://gitlab.com/oauth-xx/snaky_hash/blob/main/CHANGELOG.md)
- [Commits](https://gitlab.com/oauth-xx/snaky_hash/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: snaky_hash
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fe7ff70ca5..517bf2b225 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -459,9 +459,9 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    snaky_hash (2.0.0)
+    snaky_hash (2.0.1)
       hashie
-      version_gem (~> 1.1)
+      version_gem (~> 1.1, >= 1.1.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

From 8979adc3afa4cb6c0cd3b47a8d1172583a01a510 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Tue, 25 Oct 2022 11:25:26 +0300
Subject: [PATCH 271/332] FIX: Log user addition/deletion from groups when
 they're changed via DiscourseConnect (#18677)

Discourse Connect can be used to manage group memberships of users by including a `add_groups`, `remove_groups` or `groups` attribute in the Discourse Connect payload. However, additions/deletions of users from groups aren't logged to the groups logs (available at `/g/<group>/manage/logs`) which can cause confusions to admins they try to figure out when/how users were added or removed from a group. This commit makes Discourse Connect add entries to the groups logs when it makes changes to users' group memberships.
---
 app/models/discourse_connect.rb       | 61 +++++++++++------
 spec/models/discourse_connect_spec.rb | 98 +++++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 19 deletions(-)

diff --git a/app/models/discourse_connect.rb b/app/models/discourse_connect.rb
index 91e0181a34..fcdae32a4f 100644
--- a/app/models/discourse_connect.rb
+++ b/app/models/discourse_connect.rb
@@ -186,22 +186,23 @@ class DiscourseConnect < DiscourseConnectBase
 
   def synchronize_groups(user)
     names = (groups || "").split(",").map(&:downcase)
-    ids = Group.where('LOWER(NAME) in (?) AND NOT automatic', names).pluck(:id)
 
-    group_users = GroupUser
-      .where('group_id IN (SELECT id FROM groups WHERE NOT automatic)')
-      .where(user_id: user.id)
+    to_be_added = Group.where('LOWER(NAME) in (?) AND NOT automatic', names)
+    to_be_removed = Group.joins(:group_users).where(automatic: false, group_users: { user_id: user.id })
 
-    delete_group_users = group_users
-    if ids.length > 0
-      delete_group_users = group_users.where('group_id NOT IN (?)', ids)
+    if to_be_added.present?
+      to_be_removed = to_be_removed.where("groups.id NOT IN (?)", to_be_added.map(&:id)).to_a
     end
-    delete_group_users.destroy_all
 
-    ids -= group_users.where('group_id IN (?)', ids).pluck(:group_id)
+    if to_be_removed.present?
+      to_be_added = to_be_added.where("groups.id NOT IN (?)", to_be_removed.map(&:id)).to_a
+    end
 
-    ids.each do |group_id|
-      GroupUser.create(group_id: group_id, user_id: user.id)
+    if to_be_added.present? || to_be_removed.present?
+      GroupUser.transaction do
+        add_user_to_groups(user, to_be_added) if to_be_added.present?
+        remove_user_from_groups(user, to_be_removed) if to_be_removed.present?
+      end
     end
   end
 
@@ -211,24 +212,32 @@ class DiscourseConnect < DiscourseConnectBase
       return
     end
 
+    to_be_added = nil
     if add_groups
       split = add_groups.split(",").map(&:downcase)
       if split.length > 0
-        Group.where('LOWER(name) in (?) AND NOT automatic', split).pluck(:id).each do |id|
-          unless GroupUser.where(group_id: id, user_id: user.id).exists?
-            GroupUser.create(group_id: id, user_id: user.id)
-          end
+        to_be_added = Group.where('LOWER(name) in (?) AND NOT automatic', split)
+        if already_member = GroupUser.where(user_id: user.id).pluck(:group_id).presence
+          to_be_added = to_be_added.where("id NOT IN (?)", already_member)
         end
       end
     end
 
+    to_be_removed = nil
     if remove_groups
       split = remove_groups.split(",").map(&:downcase)
       if split.length > 0
-        GroupUser
-          .where(user_id: user.id)
-          .where('group_id IN (SELECT id FROM groups WHERE LOWER(name) in (?))', split)
-          .destroy_all
+        to_be_removed = Group
+          .joins(:group_users)
+          .where(automatic: false, group_users: { user_id: user.id })
+          .where("LOWER(name) IN (?)", split)
+      end
+    end
+
+    if to_be_added || to_be_removed
+      GroupUser.transaction do
+        add_user_to_groups(user, to_be_added) if to_be_added
+        remove_user_from_groups(user, to_be_removed) if to_be_removed
       end
     end
   end
@@ -394,4 +403,18 @@ class DiscourseConnect < DiscourseConnectBase
 
     name.presence || User.suggest_name(name_suggester_input)
   end
+
+  def add_user_to_groups(user, groups)
+    groups.each do |group|
+      GroupUser.create!(user_id: user.id, group_id: group.id)
+      GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
+    end
+  end
+
+  def remove_user_from_groups(user, groups)
+    GroupUser.where(user_id: user.id, group_id: groups.map(&:id)).destroy_all
+    groups.each do |group|
+      GroupActionLogger.new(Discourse.system_user, group).log_remove_user_from_group(user)
+    end
+  end
 end
diff --git a/spec/models/discourse_connect_spec.rb b/spec/models/discourse_connect_spec.rb
index fa2de7795e..a55a50b519 100644
--- a/spec/models/discourse_connect_spec.rb
+++ b/spec/models/discourse_connect_spec.rb
@@ -263,6 +263,104 @@ RSpec.describe DiscourseConnect do
     expect(add_group4.usernames).to eq(user.username)
   end
 
+  it 'creates group logs when users are added to groups' do
+    user = Fabricate(:user)
+    group = Fabricate(:group, name: 'group1')
+
+    sso = new_discourse_sso
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+    sso.add_groups = "#{group.name},badname"
+
+    GroupHistory.destroy_all
+
+    sso.lookup_or_create_user(ip_address)
+
+    expect(group.reload.usernames).to eq(user.username)
+    expect(GroupHistory.exists?(
+      target_user_id: user.id,
+      acting_user: Discourse.system_user.id,
+      action: GroupHistory.actions[:add_user_to_group]
+    )).to eq(true)
+  end
+
+  it 'creates group logs when users are removed from groups' do
+    user = Fabricate(:user)
+    group = Fabricate(:group, name: 'group1')
+    group.add(user)
+
+    sso = new_discourse_sso
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+    sso.remove_groups = "#{group.name},badname"
+
+    GroupHistory.destroy_all
+
+    sso.lookup_or_create_user(ip_address)
+
+    expect(group.reload.usernames).to be_blank
+    expect(GroupHistory.exists?(
+      target_user_id: user.id,
+      acting_user: Discourse.system_user.id,
+      action: GroupHistory.actions[:remove_user_from_group]
+    )).to eq(true)
+  end
+
+  it 'creates group logs when users are added to groups when discourse_connect_overrides_groups setting is true' do
+    SiteSetting.discourse_connect_overrides_groups = true
+
+    user = Fabricate(:user)
+    group = Fabricate(:group, name: 'group1')
+
+    sso = new_discourse_sso
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+    sso.groups = "#{group.name},badname"
+
+    GroupHistory.destroy_all
+
+    sso.lookup_or_create_user(ip_address)
+
+    expect(group.reload.usernames).to eq(user.username)
+    expect(GroupHistory.exists?(
+      target_user_id: user.id,
+      acting_user: Discourse.system_user.id,
+      action: GroupHistory.actions[:add_user_to_group]
+    )).to eq(true)
+  end
+
+  it 'creates group logs when users are removed from groups when discourse_connect_overrides_groups setting is true' do
+    SiteSetting.discourse_connect_overrides_groups = true
+
+    user = Fabricate(:user)
+    group = Fabricate(:group, name: 'group1')
+    group.add(user)
+
+    sso = new_discourse_sso
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+    sso.groups = "badname"
+
+    GroupHistory.destroy_all
+
+    sso.lookup_or_create_user(ip_address)
+
+    expect(group.reload.usernames).to be_blank
+    expect(GroupHistory.exists?(
+      target_user_id: user.id,
+      acting_user: Discourse.system_user.id,
+      action: GroupHistory.actions[:remove_user_from_group]
+    )).to eq(true)
+  end
+
   it 'behaves properly when auth_overrides_username is set but username is missing or blank' do
     SiteSetting.auth_overrides_username = true
 

From 43ef44127c49babeae4afb65878b93a67d3498a7 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Tue, 25 Oct 2022 11:53:35 +0300
Subject: [PATCH 272/332] UX: Send notification of type `replied` to topic
 author if they're watching the topic (#18684)

Related to aeee7ed.

Before the change in aeee7ed, notifications for direct replies to your posts and notifications for replies in watched topics looked the same in the notifications menu -- they both used the arrow icon.

We decided in aeee7ed to distinguish them by changing "watched topics" notifications to use the bell icon because it was confusing for users who watch topics to see the same icon for direct replies and "watched topics". However, that change also means that non-power/new users who receive replies to topics _they create_ will get notifications with the bell icon because technically they're watching the topic, but the arrow icon is more appropriate for this case because we use it throughout the app to indicate "replies".

This commit adds a special-case so that if a user is watching a topic AND the topic is created by them, they receive notifications with the arrow icon (type `replied`) instead of the bell icon (type `posted`) for new posts in the topic.

Internal topic: t/79051.
---
 app/services/post_alerter.rb       | 19 +++++++++++++++++--
 spec/services/post_alerter_spec.rb | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 83ae94e17a..edd0deb69b 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -146,8 +146,15 @@ class PostAlerter
     # replies
     reply_to_user = post.reply_notification_target
 
-    if new_record && reply_to_user && !notified.include?(reply_to_user) && notify_about_reply?(post)
-      notified += notify_non_pm_users(reply_to_user, :replied, post)
+    if new_record
+      if reply_to_user && !notified.include?(reply_to_user) && notify_about_reply?(post)
+        notified += notify_non_pm_users(reply_to_user, :replied, post)
+      end
+
+      topic_author = post.topic.user
+      if topic_author && !notified.include?(topic_author) && user_watching_topic?(topic_author, post.topic)
+        notified += notify_non_pm_users(topic_author, :replied, post)
+      end
     end
 
     DiscourseEvent.trigger(:post_alerter_before_quotes, post, new_record, notified)
@@ -885,4 +892,12 @@ class PostAlerter
   def is_replying?(user, reply_to_user, quoted_users)
     reply_to_user == user || quoted_users.include?(user)
   end
+
+  def user_watching_topic?(user, topic)
+    TopicUser.exists?(
+      user_id: user.id,
+      topic_id: topic.id,
+      notification_level: TopicUser.notification_levels[:watching]
+    )
+  end
 end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 67d1508ce2..4dac502dd8 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -1322,6 +1322,27 @@ RSpec.describe PostAlerter do
       NotificationEmailer.expects(:process_notification).once
       expect { PostAlerter.post_created(reply) }.to change(user.notifications, :count).by(1)
     end
+
+    it "creates a notification of type `replied` instead of `posted` for the topic author if they're watching the topic" do
+      Jobs.run_immediately!
+
+      u1 = Fabricate(:admin)
+      u2 = Fabricate(:admin)
+
+      topic = create_topic(user: u1)
+
+      u1.notifications.destroy_all
+
+      expect do
+        create_post(topic: topic, user: u2)
+      end.to change { u1.reload.notifications.count }.by(1)
+      expect(u1.notifications.exists?(
+        topic_id: topic.id,
+        notification_type: Notification.types[:replied],
+        post_number: 1,
+        read: false
+      )).to eq(true)
+    end
   end
 
   context "with category" do

From ca978507264a4593bd9510ac4791748762b1a0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <loic@discourse.org>
Date: Mon, 24 Oct 2022 17:55:48 +0200
Subject: [PATCH 273/332] DEV: remove deprecation warnings related to Nokogiri

---
 lib/html_to_markdown.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index bcd0da8132..2d2783d467 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -59,13 +59,13 @@ class HtmlToMarkdown
           before, after = parent.children.slice_when { |n| n == br }.to_a
 
           if before.size > 1
-            b = Nokogiri::XML::Node.new(parent.name, doc.document)
+            b = doc.document.create_element(parent.name)
             before[0...-1].each { |c| b.add_child(c) }
             parent.previous = b if b.inner_html.present?
           end
 
           if after.present?
-            a = Nokogiri::XML::Node.new(parent.name, doc.document)
+            a = doc.document.create_element(parent.name)
             after.each { |c| a.add_child(c) }
             parent.next = a if a.inner_html.present?
           end

From 3949efb45f4562fcec718f0e0c4f9bdd55918288 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 25 Oct 2022 12:17:00 +0200
Subject: [PATCH 274/332] FIX: Reset error props on Topic model (#18739)

If there's an error loading a topic, and later you load it successfully - the the stale error message would still briefly show up every time you navigate to that topic
---
 .../javascripts/discourse/app/models/post-stream.js      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index af28c25b94..6cc36267a0 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -358,6 +358,15 @@ export default RestModel.extend({
           loaded: true,
         });
         this._checkIfShouldShowRevisions();
+
+        // Reset all error props
+        topic.setProperties({
+          errorLoading: false,
+          errorTitle: null,
+          errorHtml: null,
+          errorMessage: null,
+          noRetry: false,
+        });
       })
       .catch((result) => {
         this.errorLoading(result);

From 5f02f11accfcee1c1714e5037fe41670920cd952 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Tue, 25 Oct 2022 11:00:49 -0400
Subject: [PATCH 275/332] Update translations (#18740)

---
 config/locales/client.ar.yml                  |   1 -
 config/locales/client.de.yml                  |   5 +-
 config/locales/client.es.yml                  |   1 -
 config/locales/client.fa_IR.yml               |   2 +
 config/locales/client.fi.yml                  | 500 +++++++++++++++++-
 config/locales/client.fr.yml                  | 378 ++++++++-----
 config/locales/client.he.yml                  |   8 +-
 config/locales/client.hr.yml                  |   1 -
 config/locales/client.it.yml                  |   1 -
 config/locales/client.ja.yml                  | 386 +++++++++++++-
 config/locales/client.pl_PL.yml               |  47 +-
 config/locales/client.pt_BR.yml               | 182 ++++++-
 config/locales/client.ro.yml                  |  12 +-
 config/locales/client.ru.yml                  | 206 ++++----
 config/locales/client.sv.yml                  |  19 +-
 config/locales/client.tr_TR.yml               |   5 +
 config/locales/client.uk.yml                  |   1 -
 config/locales/client.ur.yml                  |   1 -
 config/locales/client.vi.yml                  |   1 -
 config/locales/client.zh_CN.yml               |   3 +-
 config/locales/client.zh_TW.yml               |  45 +-
 config/locales/server.fi.yml                  | 396 +++++++++++++-
 config/locales/server.fr.yml                  | 355 ++++++++-----
 config/locales/server.he.yml                  |   7 +
 config/locales/server.ja.yml                  | 382 ++++++++++++-
 config/locales/server.pl_PL.yml               |   4 +
 config/locales/server.pt_BR.yml               | 116 ++++
 config/locales/server.ro.yml                  |   6 +
 config/locales/server.ru.yml                  | 306 +++++------
 config/locales/server.zh_CN.yml               |  12 +-
 config/locales/server.zh_TW.yml               |  50 +-
 .../config/locales/server.ru.yml              |   2 +-
 .../config/locales/client.fi.yml              |   2 +
 .../config/locales/client.ja.yml              |   2 +
 .../config/locales/server.ru.yml              |   2 +-
 .../config/locales/server.fi.yml              |   9 +
 .../config/locales/server.fr.yml              |  10 +-
 .../config/locales/server.ja.yml              |   9 +
 .../config/locales/server.ru.yml              |  16 +-
 .../config/locales/server.zh_TW.yml           |  13 +
 plugins/poll/config/locales/client.fi.yml     |   3 +
 plugins/poll/config/locales/client.ja.yml     |   3 +
 plugins/poll/config/locales/client.ru.yml     |   6 +-
 plugins/poll/config/locales/server.fi.yml     |   7 +
 plugins/poll/config/locales/server.fr.yml     |   4 +-
 plugins/poll/config/locales/server.ja.yml     |   4 +-
 .../styleguide/config/locales/client.fi.yml   |   4 +
 .../styleguide/config/locales/client.ja.yml   |   4 +
 48 files changed, 2939 insertions(+), 600 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index c572e875e1..3da9dbe0d9 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -5859,7 +5859,6 @@ ar:
       embedding:
         get_started: "إذا كنت تريد تضمين Discourse في موقع آخر، فابدأ بإضافة مضيفه."
         confirm_delete: "هل تريد بالتأكيد حذف هذا المضيف؟"
-        sample: "استخدم رمز HTML التالي في موقعك لإنشاء موضوعات discourse وتضمينها. استبدل <b>REPLACE_ME</b> بالرابط الأساسي للصفحة التي تضمِّنه فيها."
         title: "التضمين"
         host: "المضيفون المسموح بهم"
         class_name: "اسم الفئة"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 16ae595d15..ceea169249 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -3862,7 +3862,7 @@ de:
             about:
               content: "Über uns"
             admin:
-              content: "Administration"
+              content: "Admin-Panel"
             badges:
               content: "Abzeichen"
             everything:
@@ -5396,7 +5396,6 @@ de:
       embedding:
         get_started: "Wenn du Discourse in einer anderen Website einbetten möchtest, beginne mit dem Hinzufügen des Hosts."
         confirm_delete: "Möchtest du wirklich diesen Host löschen?"
-        sample: "Verwende den folgenden HTML-Code auf deiner Website, um Discourse-Themen zu erstellen und einzubetten. Ersetze <b>REPLACE_ME</b> mit der URL der Seite, auf der du den Inhalt einbettest."
         title: "Einbettung"
         host: "Erlaubte Hosts"
         class_name: "Klassenname"
@@ -5447,7 +5446,7 @@ de:
           replace: "Ersetzen"
   wizard_js:
     wizard:
-      jump_in: "Leg los!"
+      jump_in: "Jetzt loslegen!"
       finish: "Installation verlassen"
       back: "Zurück"
       next: "Nächstes"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 71c278df63..66b6e916bd 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -5395,7 +5395,6 @@ es:
       embedding:
         get_started: "Si quieres insertar Discourse en otro sitio web, empieza por añadir su host."
         confirm_delete: "¿Seguro que quieres eliminar este host?"
-        sample: "Incluye el siguiente código HTML en tu página para crear e incrustar en ella temas de Discourse. Sustituye <b>REPLACE_ME</b> con la dirección URL real de la página en la que estés incrustando el código."
         title: "Incrustado"
         host: "Hosts permitidos"
         class_name: "Nombre de clase"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 0adfc9aba3..c338a8c52b 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -783,6 +783,7 @@ fa_IR:
         group_type: "نوع گروه"
         is_group_user: "عضو"
         is_group_owner: "مالک"
+        search_results: "نتایج جستجو در زیر ظاهر خواهد شد."
       title:
         one: "گروه ها"
         other: "گروه ها"
@@ -805,6 +806,7 @@ fa_IR:
         forbidden: "شما مجاز به دیدن کاربران نیستید."
       topics: "موضوعات"
       posts: "نوشته‌ها"
+      aria_post_number: "%{title} - نوشته #%{postNumber}"
       mentions: "اشاره‌ها"
       messages: "پیام‌ها"
       notification_level: "سطح آگاه‌سازی پیش‌فرض برای پیام‌های گروهی"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 2eca72e888..b72ba022cd 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -41,6 +41,7 @@ fi:
       long_date_without_year_with_linebreak: "D. MMMM[ta] <br/>LT"
       long_date_with_year_with_linebreak: "D. MMMM[ta] YYYY <br/>LT"
       wrap_ago: "%{date} sitten"
+      wrap_on: "%{date}"
       tiny:
         half_a_minute: "< 1 min"
         less_than_x_seconds:
@@ -76,15 +77,33 @@ fi:
         date_month: "D. MMM"
         date_year: "MMM YY"
       medium:
+        less_than_x_minutes:
+          one: "alle %{count} min"
+          other: "alle %{count} min"
         x_minutes:
           one: "%{count} minuutti"
           other: "%{count} minuuttia"
         x_hours:
           one: "%{count} tunti"
           other: "%{count} tuntia"
+        about_x_hours:
+          one: "noin %{count} tunti"
+          other: "noin %{count} tuntia"
         x_days:
           one: "%{count} päivä"
           other: "%{count} päivää"
+        x_months:
+          one: "%{count} kuukausi"
+          other: "%{count} kuukautta"
+        about_x_years:
+          one: "noin %{count} vuosi"
+          other: "noin %{count} vuotta"
+        over_x_years:
+          one: "yli %{count} vuosi"
+          other: "yli %{count} vuotta"
+        almost_x_years:
+          one: "lähes %{count} vuosi"
+          other: "lähes %{count} vuotta"
         date_year: "D. MMMM[ta] YYYY"
       medium_with_ago:
         x_minutes:
@@ -115,9 +134,11 @@ fi:
       previous_month: "Edellinen kuukausi"
       next_month: "Seuraava kuukausi"
       placeholder: päivämäärä
+      from_placeholder: "alkaen päivämäärästä"
       to_placeholder: "päivämäärään"
     share:
       topic_html: 'Ketju: <span class="topic-title">%{topicTitle}</span>'
+      post: "viesti %{postNumber} käyttäjältä @%{username}"
       close: "sulje"
       twitter: "Jaa Twitterissä"
       facebook: "Jaa Facebookissa"
@@ -125,6 +146,7 @@ fi:
       url: "Kopioi ja jaa URL"
     action_codes:
       public_topic: "muutettu ketju julkiseksi %{when}"
+      open_topic: "muunsi tämän ketjuksi %{when}"
       private_topic: "muutettu yksityseksi keskusteluksi %{when}"
       split_topic: "ketju jaettu %{when}"
       invited_user: "kutsui käyttäjän %{who} %{when}"
@@ -156,7 +178,9 @@ fi:
         disabled: "poistettu banneri näkyvistä %{when}. Sitä ei enää näytetä jokaisen sivun ylälaidassa."
       forwarded: "välitetty yllä oleva sähköposti"
     topic_admin_menu: "ketjun toiminnot"
+    skip_to_main_content: "Siirry pääsisältöön"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
+    emails_are_disabled_non_staff: "Lähtevät sähköpostit on poistettu käytöstä muilta kuin henkilökunnan käyttäjiltä."
     software_update_prompt:
       message: "Sivusto on juuri päivitetty, <span>päivitä sivu</span>, tai sivusto voi käyttäytyä odottamattomasti."
       dismiss: "Sulje"
@@ -165,8 +189,13 @@ fi:
       other: "Jotta sivusto saisi lentävämmän lähdön, olet aloitustilassa. Kaikki käyttäjät nousevat heti luottamustasolle 1, ja päivittäiset sähköpostitiivistelmät kytketään päälle. Tila kytkeytyy pois päältä, kun %{count} käyttäjää on liittynyt."
     bootstrap_mode_disabled: "Aloitustila poistetaan käytöstä seuraavan 24 tunnin aikana."
     bootstrap_invite_button_title: "Lähetä kutsuja"
+    bootstrap_wizard_link_title: "Viimeistele ohjattu määritys"
     themes:
       default_description: "Oletus"
+      broken_theme_alert: "Sivustosi ei välttämättä toimi, koska teemassa tai komponentissa on virheitä."
+      error_caused_by: "Aiheuttaja: '%{name}'. Päivitä, määritä uudelleen tai poista se käytöstä <a target='blank' href='%{path}'>napsauttamalla tätä</a>."
+      only_admins: "(tämä viesti näytetään vain sivuston ylläpitäjille)"
+    broken_decorator_alert: "Viestit eivät välttämättä näy oikein, koska yksi sivustosi viestien sisällön somistajista ilmoitti virheestä."
     s3:
       regions:
         ap_northeast_1: "Aasia ja Tyynimeri (Tokio)"
@@ -180,6 +209,7 @@ fi:
         cn_northwest_1: "Kiina (Ningxia)"
         eu_central_1: "EU (Frankfurt)"
         eu_north_1: "EU (Tukholma)"
+        eu_south_1: "EU (Milano)"
         eu_west_1: "EU (Irlanti)"
         eu_west_2: "EU (Lontoo)"
         eu_west_3: "EU (Pariisi)"
@@ -240,6 +270,8 @@ fi:
     character_count:
       one: "%{count} merkki"
       other: "%{count} merkkiä"
+    period_chooser:
+      aria_label: "Suodata ajanjakson mukaan"
     related_messages:
       title: "Aiheeseen liittyviä viestejä"
       see_all: 'Katso <a href="%{path}">kaikki viestit</a> käyttäjältä @%{username}...'
@@ -272,14 +304,18 @@ fi:
       help:
         bookmark: "Klikkaa lisätäksesi ketjun ensimmäisen viestin kirjanmerkkeihin"
         edit_bookmark: "Klikkaa muokataksesi tämän ketjun kirjanmerkkiä"
+        edit_bookmark_for_topic: "Klikkaa muokataksesi tämän ketjun kirjanmerkkiä"
         unbookmark: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit"
         unbookmark_with_reminder: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit ja muistutukset."
     bookmarks:
       created: "Olet kirjanmerkinnyt tämän viestin. %{name}"
+      created_generic: "Olet kirjanmerkinnyt tämän. %{name}"
       create: "Luo kirjanmerkki"
       edit: "Muokkaa kirjanmerkkiä"
       not_bookmarked: "lisää viesti kirjanmerkkeihin"
+      remove_reminder_keep_bookmark: "Poista muistutus ja säilytä kirjanmerkki"
       created_with_reminder: "Olet kirjanmerkinnyt tämän viestin muistutuksen kera %{date}. %{name}"
+      created_with_reminder_generic: "Olet lisännyt tämän kirjanmerkkeihin muistutuksella %{date}. %{name}"
       remove: "Poista kirjanmerkki"
       delete: "Poista kirjanmerkki"
       confirm_delete: "Oletko varma, että haluat poistaa tämän kirjanmerkin? Muistutus poistetaan myös."
@@ -290,7 +326,11 @@ fi:
       list_permission_denied: "Et voi nähdä tämän käyttäjän kirjanmerkkejä."
       no_user_bookmarks: "Kirjanmerkeissäsi ei ole mitään. Kirjanmerkitsemällä viestin löydät sen myöhemmin helposti."
       auto_delete_preference:
+        label: "Kun sinulle on ilmoitettu"
+        never: "Säilytä kirjanmerkki"
         when_reminder_sent: "Poista kirjanmerkki"
+        on_owner_reply: "Poista kirjanmerkki, kun vastaan"
+        clear_reminder: "Säilytä kirjanmerkki ja tyhjennä muistutus"
       search_placeholder: "Hae kirjanmerkkejä nimen, ketjun otsikon tai viestin sisällön perusteella"
       search: "Haku"
       reminders:
@@ -300,12 +340,16 @@ fi:
         existing_reminder: "Olet pyytänyt muistutuksen tästä kirjanmerkistä, joka lähetetään %{at_date_time}"
     copy_codeblock:
       copied: "kopioitiin!"
+      copy: "kopioi koodi leikepöydälle"
+      fullscreen: "näytä koodi koko näytössä"
     drafts:
       label: "Luonnokset"
+      label_with_count: "Luonnokset (%{count})"
       resume: "Jatka"
       remove: "Poista"
       remove_confirmation: "Haluatko varmasti poistaa luonnoksen?"
       new_topic: "Uusi ketjuluonnos"
+      new_private_message: "Uusi yksityisviestin luonnos"
       topic_reply: "Vastausluonnos"
       abandon:
         confirm: "Sinulla on meneillään luonnos tätä ketjua varten. Mitä haluaisit tehdä sen kanssa?"
@@ -334,6 +378,7 @@ fi:
     saved: "Tallennettu!"
     upload: "Lataa"
     uploading: "Ladataan..."
+    processing: "Käsitellään..."
     uploading_filename: "Ladataan: %{filename}"
     processing_filename: "Käsitellään: %{filename}..."
     clipboard: "leikepöytä"
@@ -364,6 +409,7 @@ fi:
         placeholder: "Syötä viestin otsikko, url tai tunnus tähän"
     review:
       order_by: "Järjestä"
+      date_filter: "Lähetetty välillä"
       in_reply_to: "vastauksena:"
       explain:
         why: "selitä miksi tämä päätyi jonoon"
@@ -385,6 +431,7 @@ fi:
         type_bonus:
           name: "tyyppibonus"
           title: "Henkilökunta voi määrittää tietyille käsiteltävälle tyypeille bonuksen, jotta ne saavat korkeamman prioriteetin."
+      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."
@@ -543,7 +590,10 @@ fi:
       relative: "Suhteellinen"
     time_shortcut:
       now: "Nyt"
+      in_one_hour: "Tunnin kuluttua"
+      in_two_hours: "Kahden tunnin kuluttua"
       later_today: "Myöhemmin tänään"
+      two_days: "Kaksi päivää"
       next_business_day: "Seuraavana arkipäivänä"
       tomorrow: "Huomenna"
       post_local_date: "Päivämäärä viestissä"
@@ -551,7 +601,7 @@ fi:
       this_weekend: "Viikonloppuna"
       start_of_next_business_week: "Maanantaina"
       start_of_next_business_week_alt: "Seuraavana maanantaina"
-      next_week: "Ensi viikolla"
+      next_week: "Ensi viikko"
       two_weeks: "Kaksi viikkoa"
       next_month: "Ensi kuussa"
       two_months: "Kaksi kuukautta"
@@ -608,6 +658,8 @@ fi:
         reset_to_default: "Palauta oletus"
       group:
         all: "kaikki ryhmät"
+      sort:
+        label: "Lajitteluperuste: %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Muuta ryhmän asetusta"
@@ -685,6 +737,8 @@ fi:
             title: "Asetukset"
             allow_unknown_sender_topic_replies: "Salli tuntemattomien lähettäjien vastaukset ketjuun."
             allow_unknown_sender_topic_replies_hint: "Salli tuntemattomien lähettäjien vastata ryhmän ketjuihin. Jos tämä ei ole käytössä, vastaukset sähköpostiosoitteista, joita ei ole kutsuttu ketjuun, luovat uuden ketjun."
+            from_alias: "Lähettäjän alias"
+            from_alias_hint: "Lähettäjän osoitteena käytettävä alias lähetettäessä ryhmä-SMTP-sähköposteja. Huomioithan, että kaikki sähköpostipalveluntarjoajat eivät välttämättä tue tätä; katso tiedot sähköpostipalveluntarjoajasi ohjeista."
           mailboxes:
             synchronized: "Synkronoitu postilaatikko"
             none_found: "Tältä sähköpostitililtä ei löytynyt postilaatikoita."
@@ -770,6 +824,7 @@ fi:
         group_type: "Ryhmän tyyppi"
         is_group_user: "Jäsen"
         is_group_owner: "Isäntä"
+        search_results: "Hakutulokset näkyvät alla."
       title:
         one: "Ryhmä"
         other: "Ryhmät"
@@ -801,8 +856,10 @@ fi:
         owner: "Isäntä"
         primary: "Ensisijainen"
         forbidden: "Et voi tarkastella jäseniä."
+        no_filter_matches: "Hakua vastaavia jäseniä ei ole."
       topics: "Ketjut"
       posts: "Viestit"
+      aria_post_number: "%{title} – viesti %{postNumber}"
       mentions: "Maininnat"
       messages: "Viestit"
       notification_level: "Ryhmäviestien oletusilmoitustaso"
@@ -843,7 +900,8 @@ fi:
         icon: "Valitse kuvake"
         image: "Lataa kuva"
       default_notifications:
-        modal_description: "Haluatko tämän muutoksen vaikuttavan takautuvasti? Tämä muuttaa kaikkien %{count} olemassa olevan käyttäjän asetusta."
+        modal_title: "Käyttäjän oletusilmoitukset"
+        modal_description: "Haluatko tämän muutoksen vaikuttavan takautuvasti? Tämä muuttaa kaikkien %{count}:n olemassa olevan käyttäjän asetusta."
         modal_yes: "Kyllä"
         modal_no: "Ei, käytä muutosta vain jatkossa"
     user_action_groups:
@@ -916,6 +974,7 @@ fi:
     user_fields:
       none: "(valitse vaihtoehto)"
       required: '"%{name}" on pakollinen'
+      same_as_password: 'Salasanaasi ei tulisi toistaa muissa kentissä.'
     user:
       said: "%{username}:"
       profile: "Profiili"
@@ -935,6 +994,7 @@ fi:
           all: "Kaikki"
           read: "Luetut"
           unread: "Lukemattomat"
+          unseen: "Näkemätön"
         ignore_duration_title: "Sivuuta käyttäjä"
         ignore_duration_username: "Käyttäjätunnus"
         ignore_duration_when: "Kesto:"
@@ -978,7 +1038,9 @@ fi:
       use_current_timezone: "Käytä nykyistä aikavyöhykettäni"
       profile_hidden: "Käyttäjän julkinen profiili ei ole nähtävillä."
       expand_profile: "Laajenna"
+      sr_expand_profile: "Laajenna profiilin tiedot"
       collapse_profile: "Supista"
+      sr_collapse_profile: "Kutista profiilin tiedot"
       bookmarks: "Kirjanmerkit"
       bio: "Tietoa minusta"
       timezone: "Aikavyöhyke"
@@ -999,6 +1061,8 @@ fi:
       dismiss: "Kuittaa"
       dismiss_notifications: "Kuittaa kaikki"
       dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi"
+      dismiss_bookmarks_tooltip: "Merkitse kaikki lukemattomat kirjanmerkkimuistutukset luetuiksi"
+      dismiss_messages_tooltip: "Merkitse kaikki lukemattomien yksityisviestien ilmoitukset luetuiksi"
       no_messages_title: "Sinulla ei ole viestejä"
       no_messages_body: >
         Haluatko suoraa henkilökohtaista keskustelua jonkun kanssa normaalin keskusteluvirran ulkopuolella? Lähetä hänelle viesti napsauttamalla hänen profiilikuvaansa ja käyttämällä viestipainiketta %{icon}.<br><br> Jos tarvitset apua, voit <a href='%{aboutUrl}'>lähettää viestin henkilökunnan jäsenelle</a>.
@@ -1009,7 +1073,12 @@ fi:
       no_notifications_title: "Sinulla ei ole vielä ilmoituksia"
       no_notifications_body: >
         Tässä paneelissa näytetään ilmoituksia sinulle relevantista toiminnasta, kuten omien ketjujesi viestit ja vastaukset, kun joku <b>@mainitsee</b> nimesi tai lainaa sinua, tai vastaa ketjuihin joita tarkkailet. Ilmoitukset lähetetään sinulle sähköpostitse silloin, kun et ole kirjautunut hetkeen. <br><br> Napsauta painiketta %{icon}, kun haluat ilmoituksia tietystä ketjusta, alueesta tai tunnisteesta. Lisää valintoja löydät <a href='%{preferencesUrl}'>ilmoitusasetuksista</a>.
+      no_other_notifications_title: "Sinulla ei ole vielä muita ilmoituksia"
+      no_other_notifications_body: >
+        Saat tässä paneelissa ilmoituksen muunlaisesta toiminnasta, joka voi olla sinulle merkityksellistä – esimerkiksi kun joku linkittää johonkin viesteistäsi tai muokkaa jotakin niistä.
       no_notifications_page_title: "Sinulla ei ole vielä ilmoituksia"
+      no_notifications_page_body: >
+        Saat ilmoituksia sinulle relevantista toiminnasta, kuten omien ketjujesi viesteistä ja vastauksista, kun joku <b>@mainitsee</b> nimesi tai lainaa sinua tai vastaa tarkkailemiisi ketjuihin. Ilmoitukset lähetetään sinulle sähköpostitse silloin, kun et ole kirjautunut hetkeen. <br><br> Napsauta painiketta %{icon}, kun haluat ilmoituksia tietystä ketjusta, alueista tai tunnisteista. Lisää valintoja löydät <a href='%{preferencesUrl}'>ilmoitusasetuksista</a>.
       first_notification: "Ensimmäinen ilmoitus sinulle! Valitse se aloittaaksesi."
       dynamic_favicon: "Näytä määrät selaimen kuvakkeessa"
       skip_new_user_tips:
@@ -1017,6 +1086,7 @@ fi:
         not_first_time: "Eikö tämä ole ensikertasi?"
         skip_link: "Ohita nämä vinkit"
         read_later: "Luen sen myöhemmin."
+      reset_seen_popups: "Näytä aloitusvinkit uudelleen"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
       color_scheme_default_on_all_devices: "Aseta oletusvärimalli(t) kaikille laitteilleni"
       color_scheme: "Värimalli"
@@ -1036,7 +1106,16 @@ fi:
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       enable_defer: "Ota käyttöön lykkäystoiminto, jolla voi merkitä ketjun lukemattomaksi"
       experimental_sidebar:
+        enable: "Ota sivupalkki käyttöön"
         options: "Asetukset"
+        categories_section: "Alueet-osio"
+        categories_section_instruction: "Valitut alueet näkyvät sivupalkin alueet-osiossa."
+        tags_section: "Tunnisteet-osio"
+        tags_section_instruction: "Valitut tunnisteet näkyvät sivupalkin tunnisteet-osiossa."
+        navigation_section: "Navigointi"
+        list_destination_instruction: "Kun napsautan sivupalkin ketjuluettelon linkkiä, jossa on uusia tai lukemattomia ketjuja, siirry kohtaan"
+        list_destination_default: "Oletus"
+        list_destination_unread_new: "Uudet/lukemattomat"
       change: "vaihda"
       featured_topic: "Valikoitu ketju"
       moderator: "%{user} on valvoja"
@@ -1114,7 +1193,9 @@ fi:
         warnings_received: "varoituksia"
         rejected_posts: "hylättyjä viestejä"
       messages:
+        all: "kaikki postilaatikot"
         inbox: "Saapuneet"
+        personal: "Henkilökohtainen"
         latest: "Tuoreimmat"
         sent: "Lähetetyt"
         unread: "Lukemattomat"
@@ -1133,6 +1214,10 @@ fi:
         tags: "Tunnisteet"
         all_tags: "Kaikki tunnisteet"
         warnings: "Viralliset varoitukset"
+        read_more_in_group: "Haluatko lukea lisää? Selaile muita ryhmän %{groupLink} viestejä."
+        read_more: "Haluatko lukea lisää? Selaa muita viestejä <a href='%{basePath}/u/%{username}/messages'>yksityisviesteissä</a>."
+        read_more_group_pm_MF: "Jäljellä on{ UNREAD, plural, =0 {} one { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># lukematon</a> } other { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># lukematonta</a>} }{ NEW, plural, =0 {} one { {BOTH, select, true{ja} false {is } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># uusi</a> viesti} other { {BOTH, select, true{ja} false {ja} other{ja}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># uutta</a> viestiä} }, tai selaa muita viestejä ryhmässä {groupLink}"
+        read_more_personal_pm_MF: "Jäljellä { UNREAD, plural, =0 {} one { on <a href='{basePath}/u/{username}/messages/unread'># lukematon</a>} other { on <a href='{basePath}/u/{username}/messages/unread'># lukematonta</a>} } { NEW, plural, =0 {} one { {BOTH, select, true{ja } false {on } other{}} <a href='{basePath}/u/{username}/messages/new'># uusi</a> viesti} other { {BOTH, select, true{ja } false {on } other{}} <a href='{basePath}/u/{username}/messages/new'># uutta</a> viestiä} }, tai selaa muita <a href='{basePath}/u/{username}/messages'>yksityisviestejä</a>"
       preferences_nav:
         account: "Tili"
         security: "Tietoturva"
@@ -1144,6 +1229,7 @@ fi:
         tags: "Tunnisteet"
         interface: "Käyttöliittymä"
         apps: "Sovellukset"
+        sidebar: "Sivupalkki"
       change_password:
         success: "(sähköposti lähetetty)"
         in_progress: "(sähköpostia lähetetään)"
@@ -1200,6 +1286,8 @@ fi:
         edit: "Muokkaa"
         edit_title: "Muokkaa todentajaa"
         edit_description: "Todentajan nimi"
+        enable_security_key_description: |
+          Kun <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">tunnistautumislaite</a> tai yhteensopiva mobiililaite on valmiina, paina alla olevaa Rekisteröi-painiketta.
         totp:
           title: "Tunnuksiin perustuvat todentajat"
           add: "Lisää todentaja"
@@ -1207,10 +1295,16 @@ fi:
           name_and_code_required_error: "Anna nimi sekä todentajasovelluksesta löytyvä koodi."
         security_key:
           register: "Rekisteröi"
+          title: "Tunnistautumislaitteet"
+          add: "Lisää tunnistautumislaite"
           default_name: "Päätunnistautumislaite"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "Tunnistautumislaitteen rekisteröintiprosessi joko vanheni tai peruutettiin."
           already_added_error: "Olet jo rekisteröinyt tämän tunnistautumislaitteen. Sitä ei tarvitse rekisteröidä uudelleen."
+          edit: "Muokkaa tunnistautumislaitetta"
           save: "Tallenna"
+          edit_description: "Tunnistautumislaitteen nimi"
           name_required_error: "Tunnistautumislaite tarvitsee nimen."
       change_about:
         title: "Muokkaa kuvaustasi"
@@ -1242,6 +1336,7 @@ fi:
         upload_title: "Lataa oma kuva"
         image_is_not_a_square: "Varoitus: olemme rajanneet kuvaasti; korkeus ja leveys eivät olleet samoja"
         logo_small: "Sivuston pieni logo. Käytetään oletuksena."
+        use_custom: "Tai lataa mukautettu avatar:"
       change_profile_background:
         title: "Profiilin yläkuva"
         instructions: "Profiilin yläkuva keskitetään, ja sen oletusleveys on 1 110 px."
@@ -1286,6 +1381,7 @@ fi:
         not_connected: "(ei liitetty)"
         confirm_modal_title: "Yhdistä palvelun %{provider} tili"
         confirm_description:
+          disconnect: "Yhteys nykyiseen %{provider}-tiliisi '%{account_description}' katkaistaan."
           account_specific: "Palvelun %{provider} tiliäsi \"%{account_description}\" käytetään todentamiseen."
           generic: "Palvelun %{provider} tiliäsi käytetään todentamiseen."
       name:
@@ -1373,9 +1469,11 @@ fi:
         every_month: "kuukausittain"
         every_six_months: "kuuden kuukauden välein"
       email_level:
+        title: "Lähetä minulle sähköpostiviesti, kun minua lainataan, minulle vastataan, @käyttäjätunnukseni mainitaan tai kun tarkkailemillani alueilla, tunnisteissa tai ketjuissa on uutta toimintaa"
         always: "aina"
         only_when_away: "vain, kun olen poissa"
         never: "ei koskaan"
+      email_messages_level: "Lähetä minulle sähköpostiviesti, kun minulle lähetetään yksityisviesti"
       include_tl0_in_digests: "Lisää uusien käyttäjien sisältö yhteenvetosähköposteihin"
       email_in_reply_to: "Sisällytä lyhennelmä vastattavasta viestistä sähköposteihin"
       other_settings: "Muut"
@@ -1460,11 +1558,17 @@ fi:
           expired_at_time: "Vanhentunut %{time}"
           show_advanced: "Näytä lisäasetukset"
           hide_advanced: "Piilota lisäasetukset"
+          restrict: "Rajoita:"
+          restrict_email: "Rajoita sähköpostiosoitteeseen"
+          restrict_domain: "Rajoita verkkotunnukseen"
+          email_or_domain_placeholder: "nimi@esimerkki.fi tai esimerkki.fi"
           max_redemptions_allowed: "Käyttökertoja enintään"
           add_to_groups: "Lisää ryhmiin"
+          invite_to_topic: "Saavu ketjuun"
           expires_at: "Aikaa vanhenemiseen"
           custom_message: "Valinnainen henkilökohtainen viesti"
           send_invite_email: "Tallenna ja lähetä sähköposti"
+          send_invite_email_instructions: "Rajoita kutsu sähköpostiin lähettääksesi kutsusähköpostin"
           save_invite: "Tallenna kutsu"
           invite_saved: "Kutsu tallennettu."
         bulk_invite:
@@ -1490,7 +1594,9 @@ fi:
         title: "Yhteenveto"
         stats: "Tilastot"
         time_read: "lukuaika"
+        time_read_title: "%{duration} (kaikkina aikoina)"
         recent_time_read: "viimeisin lukuaika"
+        recent_time_read_title: "%{duration} (viimeisten 60 päivän aikana)"
         topic_count:
           one: "avattu ketju"
           other: "aloitettua ketjua"
@@ -1550,6 +1656,9 @@ fi:
         title: "Flairi"
         none: "(ei mitään)"
         instructions: "kuvake, joka näytetään profiilikuvasi vieressä"
+      status:
+        title: "Mukautettu tila"
+        not_set: "Ei asetettu"
       primary_group:
         title: "Ensisijainen ryhmä"
         none: "(ei mitään)"
@@ -1562,6 +1671,18 @@ fi:
         the_topic: "ketju"
     user_status:
       save: "Tallenna"
+      set_custom_status: "Aseta mukautettu tila"
+      what_are_you_doing: "Mitä teet?"
+      remove_status: "Poista tila"
+    popup:
+      primary: "Selvä!"
+      secondary: "älä näytä minulle näitä vinkkejä"
+      first_notification:
+        title: "Ensimmäinen ilmoituksesi!"
+        content: "Ilmoitusten avulla pysyt ajan tasalla siitä, mitä yhteisössä tapahtuu."
+      topic_timeline:
+        title: "Ketjun aikajana"
+        content: "Selaa viestiä nopeasti käyttämällä ketjun aikajanaa."
     loading: "Ladataan..."
     errors:
       prev_page: "yrittäessä ladata"
@@ -1594,6 +1715,8 @@ fi:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
+    staff_writes_only_mode:
+      enabled: "Sivusto on vain henkilökunta -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on rajoitettu vain henkilökunnan jäsenille."
     too_few_topics_and_posts_notice_MF: >-
       Laitetaanpa <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">keskustelu alulle!</a> Ketjuja {currentTopics, plural, one {on <strong>#</strong>} other {on <strong>#</strong>}} ja viestejä {currentPosts, plural, one {<strong>#</strong>} other {<strong>#</strong>}}. Vierailijoilla tulisi olla enemmän vastauksia innoittavaa luettavaa – suositamme ainakin {requiredTopics, plural, one {<strong>#</strong> ketjun} other {<strong>#</strong> ketjua}} ja {requiredPosts, plural, one {<strong>#</strong> viestin} other {<strong>#</strong> viestiä}}. Tämä viesti näkyy vain henkilökunnalle.
     too_few_topics_notice_MF: >-
@@ -1621,9 +1744,11 @@ fi:
       other: vastausta
     signup_cta:
       sign_up: "Rekisteröidy"
+      hide_session: "Ehkä myöhemmin"
       hide_forever: "ei kiitos"
       hidden_for_session: "OK, kysymme sinulta huomenna. Voit myös aina käyttää 'Kirjaudu sisään' -linkkiä tilin luomiseen."
       intro: "Hei! Vaikuttaa siltä, että olet pitänyt keskusteluista, muttet ole luonut käyttäjätiliä."
+      value_prop: "Oletko kyllästynyt selaamaan samoja viestejä? Kun luot tilin, palaat aina siihen, mihin jäit. Tilin avulla voit myös saada ilmoituksia uusista vastauksista, tallentaa kirjanmerkkejä ja käyttää tykkäyksiä kiittääksesi muita. Voimme kaikki työskennellä yhdessä tehdäksemme tästä yhteisöstä mahtavan. :heart:"
     summary:
       enabled_description: "Tarkastelet yhteenvetoa tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella."
       description:
@@ -1632,6 +1757,8 @@ fi:
       description_time_MF: "Ketjussa {replyCount, plural, one {on <b>#</b> vastaus} other {on <b>#</b> vastausta}}, joiden arvioitu lukuaika on <b>{readingTime, plural, one {# minuutti} other {# minuuttia}}</b>."
       enable: "Näytä ketjun tiivistelmä"
       disable: "Näytä kaikki viestit"
+      short_label: "Tee yhteenveto"
+      short_title: "Näytä tämän ketjun yhteenveto: mielenkiintoisimmat viestit käyttäjien toiminnan perusteella"
     deleted_filter:
       enabled_description: "Tämä ketju sisältää poistettuja viestejä, jotka on piilotettu."
       disabled_description: "Ketjun poistetut viestit näytetään."
@@ -1647,6 +1774,7 @@ fi:
       remove_allowed_user: "Haluatko varmasti poistaa käyttäjän %{name} tästä viestistä?"
       remove_allowed_group: "Haluatko varmasti poistaa käyttäjän %{name} tästä viestistä?"
       leave: "Poistu"
+      remove_group: "Poista ryhmä"
       remove_user: "Poista käyttäjä"
     email: "Sähköposti"
     username: "Käyttäjätunnus"
@@ -1661,10 +1789,12 @@ fi:
       disclaimer: "Kun rekisteröidyt, hyväksyt <a href='%{privacy_link}' target='blank'>tietosuojaselosteen</a> ja <a href='%{tos_link}' target='blank'>käyttöehdot</a>."
       title: "Luo tili"
       failed: "Jokin meni vikaan. Tämä sähköpostiosoite on ehkä jo rekisteröity, kokeile salasanan unohduslinkkiä"
+      associate: "Onko sinulla jo tili? <a href='%{associate_link}'>Kirjaudu sisään</a> yhdistääksesi %{provider}-tilisi."
     forgot_password:
       title: "Salasanan palautus"
       action: "Unohdin salasanani"
-      invite: "Syötä käyttäjätunnuksesi tai sähköpostiosoitteesi, niin lähetämme sinulle salasanan palutusviestin."
+      invite: "Syötä käyttäjätunnuksesi tai sähköpostiosoitteesi, niin lähetämme sinulle salasananpalautusviestin."
+      invite_no_username: "Syötä sähköpostiosoitteesi, niin lähetämme sinulle salasananpalautusviestin."
       reset: "Palauta salasana"
       complete_username: "Jos käyttäjätunnusta <b>%{username}</b> vastaava tili löytyy, saat kohta sähköpostin, jossa on ohjeet salasanan palauttamiseen."
       complete_email: "Jos sähköpostiosoitetta <b>%{email}</b> vastaava tili löytyy, saat kohta sähköpostin, jossa on ohjeet salasanan palauttamiseen."
@@ -1701,6 +1831,7 @@ fi:
       second_factor_backup_title: "Kaksivaiheinen vara"
       second_factor_backup_description: "Syötä yksi varakoodeistasi:"
       second_factor: "Kirjaudu todentajasovelluksella"
+      security_key_description: "Kun tunnistautumislaite tai yhteensopiva mobiililaite on kätesi ulottuvilla, klikkaa alla olevaa \"Tunnistaudu tunnistautumislaitteella\" -painiketta."
       security_key_alternative: "Kokeile muuta tapaa"
       security_key_authenticate: "Tee todennus tunnistautumislaitteella"
       security_key_not_allowed_error: "Tunnistautumislaitteen todennusprosessi joko vanheni tai peruutettiin."
@@ -1736,19 +1867,32 @@ fi:
       not_approved: "Tiliäsi ei ole vielä hyväksytty. Saat ilmoituksen sähköpostilla, kun voit kirjautua sisään."
       google_oauth2:
         name: "Google"
+        title: "Kirjaudu sisään Google-tilillä"
+        sr_title: "Kirjaudu sisään Google-tilillä"
       twitter:
         name: "Twitter"
+        title: "Kirjaudu sisään Twitter-tilillä"
+        sr_title: "Kirjaudu sisään Twitter-tilillä"
       instagram:
         name: "Instagram"
+        title: "Kirjaudu sisään Instagram-tilillä"
+        sr_title: "Kirjaudu sisään Instagram-tilillä"
       facebook:
         name: "Facebook"
+        title: "Kirjaudu sisään Facebook-tilillä"
+        sr_title: "Kirjaudu sisään Facebook-tilillä"
       github:
         name: "GitHub"
+        title: "Kirjaudu sisään GitHub-tilillä"
+        sr_title: "Kirjaudu sisään GitHub-tilillä"
       discord:
         name: "Discord"
+        title: "Kirjaudu sisään Discord-tilillä"
+        sr_title: "Kirjaudu sisään Discord-tilillä"
       second_factor_toggle:
         totp: "Käytä todentajasovellusta tämän sijaan"
         backup_code: "Käytä varakoodia tämän sijaan"
+        security_key: "Käytä sen sijaan tunnistautumislaitetta"
     invites:
       accept_title: "Kutsu"
       emoji: "kirjekuoriemoji"
@@ -1773,9 +1917,11 @@ fi:
       categories_only: "Vain alueet"
       categories_with_featured_topics: "Alueet, joissa on esiteltyjä ketjuja"
       categories_and_latest_topics: "Alueet ja tuoreimmat ketjut"
+      categories_and_latest_topics_created_date: "Alueet ja tuoreimmat ketjut (lajiteltuna ketjun luomispäivän mukaan)"
       categories_and_top_topics: "Alueet ja suosittuja ketjuja"
       categories_boxes: "Laatikot, joissa ala-alueita"
       categories_boxes_with_topics: "Laatikot, joissa esiteltyjä ketjuja"
+      subcategories_with_featured_topics: "Ala-alueet, joissa on esiteltyjä ketjuja"
     shortcut_modifier_key:
       shift: "Vaihto"
       ctrl: "Ctrl"
@@ -1799,6 +1945,9 @@ fi:
       select_to_filter: "Valitse suodatettava arvo"
       default_header_text: Valitse...
       no_content: Ei osumia
+      results_count:
+        one: "%{count} tulos"
+        other: "%{count} tulosta"
       filter_placeholder: Hae...
       filter_placeholder_with_any: Hae tai luo...
       create: "Luo: '%{content}'"
@@ -1856,12 +2005,23 @@ fi:
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline-luonnokset"
       edit_conflict: "muokkauskonflikti"
+      esc: "esc"
+      esc_label: "Kuittaa napsauttamalla tai painamalla Esc-näppäintä"
+      ok_proceed: "Ok, jatka"
       group_mentioned_limit:
         one: "<b>Varoitus!</b> Olet maininnut ryhmän <a href='%{group_link}'>%{group}</a>, mutta ryhmässä on yli %{count} käyttäjä, mikä on ylläpitäjän asettama rajoitus maininnoille. Kukaan ei saa ilmoitusta."
         other: "<b>Varoitus!</b> Olet maininnut ryhmän <a href='%{group_link}'>%{group}</a>, mutta ryhmässä on yli %{count} käyttäjää, mikä on ylläpitäjän asettama rajoitus maininnoille. Kukaan ei saa ilmoitusta."
       group_mentioned:
         one: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjä</a> saa ilmoituksen – oletko varma?"
         other: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjää</a> saa ilmoituksen – oletko varma?"
+      cannot_see_mention:
+        category: "Mainitsit käyttäjän @%{username}, mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet täytyy lisätä ryhmään, jolla on pääsy alueelle."
+        private: "Mainitsit käyttäjän @%{username}, mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet täytyy kutsua tähän yksityiskeskusteluun."
+        muted_topic: "Mainitsit käyttäjän @%{username}, mutta hän ei saa ilmoitusta, koska hän on vaimentanut tämän ketjun."
+        not_allowed: "Mainitsit käyttäjän @%{username}, mutta hän ei saa ilmoitusta, koska häntä ei ole kutsuttu tähän ketjuun."
+      here_mention:
+        one: "Maininta <b>@%{here}</b> lähettää ilmoituksen %{count} käyttäjälle – oletko varma?"
+        other: "Maininta <b>@%{here}</b> lähettää ilmoituksen %{count} käyttäjälle – oletko varma?"
       duplicate_link: "Näyttää siltä, että <b>@%{username}</b> linkitti jo samaan kohteeseen <b>%{domain}</b> ketjun <a href='%{post_url}'>aiemmassa vastauksessa %{ago}</a> – oletko varma, että haluat lähettää sen uudestaan?"
       reference_topic_title: "RE: %{title}"
       error:
@@ -1893,6 +2053,8 @@ fi:
       create_whisper: "Kuiskaa"
       create_shared_draft: "Luo jaettu luonnos"
       edit_shared_draft: "Muokkaa jaettua luonnosta"
+      title: "Tai paina %{modifier}Enter"
+      users_placeholder: "Lisää käyttäjiä tai ryhmiä"
       title_placeholder: "Kuvaile lyhyesti mistä tässä keskustelussa on kyse?"
       title_or_link_placeholder: "Kirjoita otsikko tai liitä linkki tähän"
       edit_reason_placeholder: "miksi muokkaat viestiä?"
@@ -1937,6 +2099,7 @@ fi:
       abandon: "sulje kirjoitustila ja hylkää luonnos"
       enter_fullscreen: "siirry koko ruudun kirjoitustilaan"
       exit_fullscreen: "poistu koko ruudun kirjoitustilasta"
+      exit_fullscreen_prompt: "Poistu koko näytön tilasta painamalla <kbd>Esc</kbd>-näppäintä"
       show_toolbar: "näytä kirjoitustilan työkalurivi"
       hide_toolbar: "piilota kirjoitustilan työkalurivi"
       modal_ok: "OK"
@@ -1947,6 +2110,9 @@ fi:
         body: "Olet lähettämässä viestiä vain itsellesi!"
       slow_mode:
         error: "Tämä ketju on hitaassa tilassa. Lähetit viestin äskettäin; voit lähettää uuden %{timeLeft} kuluttua."
+      user_not_seen_in_a_while:
+        single: "Käyttäjää <b>%{usernames}</b>, jolle lähetät viestiä, ei ole nähty täällä pitkään aikaan – %{time_ago}. Hän ei ehkä saa viestiäsi. Voit halutessasi etsiä vaihtoehtoisia tapoja ottaa yhteyttä käyttäjään %{usernames}."
+        multiple: "Seuraavia käyttäjiä, joille lähettä viestiä: <b>%{usernames}</b> ei ole nähty täällä pitkään aikaan – %{time_ago}. He eivät ehkä saa viestiäsi. Voit halutessasi etsiä vaihtoehtoisia tapoja ottaa yhteyttä heihin."
       admin_options_title: "Tämän ketjun vain henkilökunnalle näytettävät asetukset"
       composer_actions:
         reply: Vastaa
@@ -1961,6 +2127,7 @@ fi:
           confirm: Sinulla on tallennettuna uusi ketjuluonnos, joka korvataan, jos luot liittyvän ketjun.
         reply_as_new_group_message:
           label: Vastaa uudessa ryhmäviestissä
+          desc: Luo uusi viesti aloittaen samoista vastaanottajista
         reply_to_topic:
           label: Vastaa ketjuun
           desc: Vastaa ketjuun, muttei mihinkään tiettyyn viestiin
@@ -1977,6 +2144,9 @@ fi:
           desc: "Vastaa muuttamatta ketjun viimeisimmän vastauksen päivämäärää"
       reload: "Lataa uudelleen"
       ignore: "Ohita"
+      image_alt_text:
+        aria_label: Kuvan vaihtoehtoinen teksti
+      delete_image_button: Poista kuva
     notifications:
       tooltip:
         regular:
@@ -1994,6 +2164,7 @@ fi:
       post_approved: "Viestisi hyväksyttiin"
       reviewable_items: "käsittelyä odottavaa kohdetta"
       watching_first_post_label: "Uusi ketju"
+      user_moved_post: "%{username} siirretty"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2018,6 +2189,7 @@ fi:
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
       invited_to_topic: "<span>%{username}</span> %{description}"
       invitee_accepted: "<span>%{username}</span> hyväksyi kutsusi"
+      invitee_accepted_your_invitation: "hyväksyi kutsusi"
       moved_post: "<span>%{username}</span> siirsi kohteen %{description}"
       linked: "<span>%{username}</span> %{description}"
       granted_badge: "Ansaitsit kunniamerkin '%{description}'"
@@ -2031,6 +2203,16 @@ fi:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} – valmis"
       dismiss_confirmation:
+        body:
+          default:
+            one: "Oletko varma? Sinulla on %{count} tärkeä ilmoitus."
+            other: "Oletko varma? Sinulla on %{count} tärkeää ilmoitusta."
+          bookmarks:
+            one: "Oletko varma? Sinulla on %{count} lukematon kirjanmerkkimuistutus."
+            other: "Oletko varma? Sinulla on %{count} lukematonta kirjanmerkkimuistutusta."
+          messages:
+            one: "Oletko varma? Sinulla on %{count} lukematon yksityisviesti."
+            other: "Oletko varma? Sinulla on %{count} lukematonta yksityisviestiä."
         dismiss: "Kuittaa"
         cancel: "Peruuta"
       group_message_summary:
@@ -2088,6 +2270,9 @@ fi:
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
+      open_advanced: "Avaa tarkennettu haku"
+      clear_search: "Tyhjennä haku"
+      sort_or_bulk_actions: "Lajittele tai valitse tuloksia joukkona"
       result_count:
         one: "<span>%{count} tulos haulle</span><span class='term'>%{term}</span>"
         other: "<span>%{count}%{plus} tulosta haulle</span><span class='term'>%{term}</span>"
@@ -2104,20 +2289,44 @@ fi:
       search_google: "Kokeile Google-hakua:"
       search_google_button: "Google"
       search_button: "Hae"
+      search_term_label: "anna hakusana"
       categories: "Alueet"
       tags: "Tunnisteet"
+      in: "kohteessa"
+      in_this_topic: "tässä ketjussa"
+      in_this_topic_tooltip: "vaihda kaikkien ketjujen hakuun"
+      in_messages: "viesteissä"
+      in_messages_tooltip: "vaihda tavallisten ketjujen hakuun"
+      in_topics_posts: "kaikissa ketjuissa ja viesteissä"
+      enter_hint: "tai paina Enter"
+      in_posts_by: "käyttäjän %{username} viesteissä"
+      browser_tip: "%{modifier} + f"
+      browser_tip_description: "uudelleen käyttääksesi selaimen hakua"
+      recent: "Viimeisimmät haut"
+      clear_recent: "Tyhjennä viimeisimmät haut"
       type:
+        default: "Ketjut/viestit"
         users: "Käyttäjiä"
         categories: "Alueet"
+        categories_and_tags: "Alueet/tunnisteet"
       context:
         user: "Hae käyttäjän @%{username} viestejä"
         category: "Hae alueelta #%{category}"
         tag: "Hae tunnistetta #%{tag}"
         topic: "Hae tästä ketjusta"
         private_messages: "Hae viesteistä"
+      tips:
+        category_tag: "suodatus alueen tai tunnisteen mukaan"
+        author: "suodatus viestin kirjoittajan mukaan"
+        in: "suodatus metatietojen mukaan (esim. in:title, in:personal, in:pinned)"
+        status: "suodatus ketjun tilan mukaan"
+        full_search: "käynnistää koko sivun haun"
+        full_search_key: "%{modifier} + Enter"
       advanced:
+        title: Tarkemmat suodattimet
         posted_by:
           label: Kirjoittaja
+          aria_label: Suodata viestin kirjoittajan mukaan
         in_category:
           label: Alueella
         in_group:
@@ -2126,6 +2335,7 @@ fi:
           label: Kirjoittajalla kunniamerkki
         with_tags:
           label: Ketjulla on tunniste
+          aria_label: Suodata tunnisteiden avulla
         filters:
           label: Tuloksiin vain ketjuja/viestejä...
           title: Hae vain otsikoista
@@ -2156,30 +2366,81 @@ fi:
             label: Viestejä
           min:
             placeholder: vähintään
+            aria_label: suodata viestien vähimmäismäärän mukaan
           max:
             placeholder: enintään
+            aria_label: suodata viestien enimmäismäärän mukaan
           time:
             label: Kirjoitettu
+            aria_label: Suodata lähetyspäivän mukaan
             before: ennen
             after: jälkeen
         views:
           label: Katseluita
         min_views:
           placeholder: vähintään
+          aria_label: suodata vähimmäiskatselukertojen mukaan
         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: "valikko"
     new_item: "uusi"
     go_back: "palaa takaisin"
     not_logged_in_user: "käyttäjäsivu, jossa on yhteenveto käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset"
     current_user: "siirry omalle käyttäjäsivullesi"
     view_all: "näytä kaikki %{tab}"
     user_menu:
+      generic_no_items: "Tässä luettelossa ei ole kohteita."
+      sr_menu_tabs: "Käyttäjävalikon välilehdet"
+      view_all_notifications: "näytä kaikki ilmoitukset"
+      view_all_bookmarks: "näytä kaikki kirjanmerkit"
+      view_all_messages: "näytä kaikki yksityisviestit"
       tabs:
+        all_notifications: "Kaikki ilmoitukset"
         replies: "Vastaukset"
+        replies_with_unread:
+          one: "Vastaukset – %{count} lukematon vastaus"
+          other: "Vastaukset – %{count} lukematonta vastaustata"
         mentions: "Maininnat"
+        mentions_with_unread:
+          one: "Maininnat – %{count} lukematon maininta"
+          other: "Maininnat – %{count} lukematonta mainintaa"
         likes: "Tykkäykset"
+        likes_with_unread:
+          one: "Tykkäykset – %{count} lukematon tykkäys"
+          other: "Tykkäykset – %{count} lukematonta tykkäystä"
+        watching: "Tarkkaillut ketjut"
+        watching_with_unread:
+          one: "Tarkkaillut ketjut – %{count} lukematon tarkkailtu ketju"
+          other: "Tarkkaillut ketjut – %{count} lukematonta tarkkailtua ketjua"
+        messages: "Yksityisviestit"
+        messages_with_unread:
+          one: "Yksityisviestit – %{count} lukematon viesti"
+          other: "Yksityisviestit – %{count} lukematonta viestiä"
         bookmarks: "Kirjanmerkit"
+        bookmarks_with_unread:
+          one: "Kirjanmerkit – %{count} lukematon kirjanmerkki"
+          other: "Kirjanmerkit – %{count} lukematonta kirjanmerkkiä"
+        review_queue: "Tarkastusjono"
+        review_queue_with_unread:
+          one: "Tarkistusjono – %{count} kohde vaatii tarkistuksen"
+          other: "Tarkistusjono – %{count} kohdetta vaatii tarkistuksen"
+        other_notifications: "Muut ilmoitukset"
+        other_notifications_with_unread:
+          one: "Muut ilmoitukset – %{count} lukematon ilmoitus"
+          other: "Muut ilmoitukset – %{count} lukematonta ilmoitusta"
         profile: "Profiili"
+      reviewable:
+        view_all: "näytä kaikki tarkastuskohteet"
+        queue: "Jono"
+        deleted_user: "(poistettu käyttäjä)"
+        deleted_post: "(poistettu viesti)"
+        post_number_with_topic_title: "viesti %{post_number} – %{title}"
+        new_post_in_topic: "uusi viesti ketjussa %{title}"
+        user_requires_approval: "%{username} vaatii hyväksynnän"
+        default_item: "käsiteltävä kohde %{reviewable_id}"
     topics:
       new_messages_marker: "edellinen vierailu"
       bulk:
@@ -2187,6 +2448,7 @@ fi:
         clear_all: "Tyhjennä kaikki"
         unlist_topics: "Poista ketjuja listauksista"
         relist_topics: "Palauta ketjuja listauksiin"
+        reset_bump_dates: "Nollaa nostopäivät"
         defer: "Lykkää"
         delete: "Poista ketjut"
         dismiss: "Kuittaa"
@@ -2206,9 +2468,11 @@ fi:
           other: "Kuittaa uudet (%{count})"
         toggle: "Vaihda useamman ketjun valintaa"
         actions: "Joukkotoiminnot"
+        change_category: "Määritä alue..."
         close_topics: "Sulje ketjut"
         archive_topics: "Arkistoi ketjut"
         move_messages_to_inbox: "Siirrä saapuneisiin"
+        notification_level: "Ilmoitukset..."
         change_notification_level: "Muuta ilmoitustasoa"
         choose_new_category: "Valitse uusi alue ketjuille:"
         selected:
@@ -2228,6 +2492,7 @@ fi:
           other: "Edetty: <strong>%{count}</strong> ketjua"
       none:
         unread: "Sinulla ei ole lukemattomia ketjuja."
+        unseen: "Sinulla ei ole näkemättömiä ketjuja."
         new: "Sinulla ei ole uusia ketjuja."
         read: "Et ole lukenut vielä yhtään ketjua."
         posted: "Et ole kirjoittanut vielä yhteenkään ketjuun."
@@ -2244,6 +2509,7 @@ fi:
         read: "Luettuja ketjuja ei ole enempää."
         new: "Uusia ketjuja ei ole enempää."
         unread: "Ketjuja ei ole enempää lukematta."
+        unseen: "Näkemättömiä ketjuja ei ole enempää."
         category: "Alueen %{category} ketjuja ei ole enempää."
         tag: "Tunnisteella %{tag} merkittyjä ketjuja ei ole enempää."
         top: "Suosittuja ketjuja ei ole enempää."
@@ -2453,27 +2719,36 @@ fi:
         open: "Avaa ketju"
         close: "Sulje ketju"
         multi_select: "Valitse viestejä..."
+        slow_mode: "Ota Hidas tila käyttöön..."
         timed_update: "Aseta ajastin ketjulle..."
         pin: "Kiinnitä ketju..."
         unpin: "Poista ketjun kiinnitys..."
         unarchive: "Peru ketjun arkistointi"
         archive: "Arkistoi ketju"
+        invisible: "Poista ketju listauksista"
+        visible: "Listaa ketju"
         reset_read: "Nollaa tiedot lukemisista"
+        make_public: "Tee ketjusta julkinen..."
         make_private: "Muuta yksityisviestiksi"
         reset_bump_date: "Palauta ketjun päiväysleima"
       feature:
         pin: "Kiinnitä ketju"
         unpin: "Poista ketjun kiinnitys"
         pin_globally: "Kiinnitä ketju koko palstalle"
+        make_banner: "Luo banneriketju"
         remove_banner: "Poista banneriketju"
       reply:
         title: "Vastaa"
         help: "aloita kirjoittamaan vastausta tähän ketjuun"
       share:
+        title: "Jaa ketju"
         extended_title: "Jaa linkki"
         help: "jaa linkki tähän ketjuun"
         instructions: "Jaa linkki tähän ketjuun:"
         copied: "Ketjun linkki kopioitu."
+        restricted_groups:
+          one: "Näkyy vain ryhmän jäsenille: %{groupNames}"
+          other: "Näkyy vain ryhmien jäsenille: %{groupNames}"
         invite_users: "Kutsu"
       print:
         title: "Tulosta"
@@ -2644,8 +2919,11 @@ fi:
           other: "Olet valinnut <b>%{count}</b> viestiä."
       deleted_by_author_simple: "(kirjoittajan poistama ketju)"
     post:
+      confirm_delete: "Oletko varma, että haluat poistaa tämän viestin?"
       quote_reply: "Lainaa"
+      quote_reply_shortcut: "Tai paina q"
       quote_edit: "Muokkaa"
+      quote_edit_shortcut: "Tai paina e"
       quote_share: "Jaa"
       edit_reason: "Syy: "
       post_number: "viesti %{number}"
@@ -2660,11 +2938,19 @@ fi:
       show_hidden: "Katso sivuutettu sisältö."
       deleted_by_author_simple: "(kirjoittajan poistama viesti)"
       collapse: "kutista"
+      sr_collapse_replies: "Kutista upotetut vastaukset"
+      sr_date: "Viestin päivämäärä"
+      sr_expand_replies:
+        one: "Tällä viestillä on %{count} vastaus. Laajenna napsauttamalla."
+        other: "Tällä viestillä on %{count} vastausta. Laajenna napsauttamalla."
       expand_collapse: "laajenna/kutista"
+      sr_below_embedded_posts_description: "viestin %{post_number} vastaukset"
+      sr_embedded_reply_description: "käyttäjän %{username} vastaus viestiin %{post_number}"
       locked: "henkilökunnan jäsen on estänyt tämän viestin muokkaamisen"
       gap:
         one: "näytä %{count} piilotettu vastaus"
         other: "näytä %{count} piilotettua vastausta"
+      sr_reply_to: "Vastaus käyttäjän @%{username} viestiin %{post_number}"
       notice:
         new_user: "Tämä on ensimmäinen kerta kun %{user} kirjoittaa — toivotetaan hänet tervetulleeksi yhteisöömme!"
         returning_user: "Siitä on aikaa kun %{user} on viimeksi nähty — hän oli viimeksi kirjoittanut %{time}."
@@ -2681,6 +2967,12 @@ fi:
       has_likes_title_you:
         one: "Sinä ja %{count} muuta tykkäsitte tästä viestistä"
         other: "Sinä ja %{count} muuta tykkäsitte tästä viestistä"
+      sr_post_like_count_button:
+        one: "%{count} henkilö tykkäsi tästä viestistä. Katso klikkaamalla."
+        other: "%{count} henkilöä tykkäsi tästä viestistä. Katso klikkaamalla."
+      sr_post_read_count_button:
+        one: "%{count} henkilö luki tämän viestin. Katso klikkaamalla."
+        other: "%{count} henkilöä luki tämän viestin. Katso klikkaamalla."
       filtered_replies_hint:
         one: "Näytä tämä viesti ja siihen liittyvä vastaus"
         other: "Näytä tämä viesti ja %{count} siihen liittyvää vastausta"
@@ -2694,6 +2986,8 @@ fi:
         edit: "Viestin muokkaus epäonnistui. Yritä uudelleen."
         upload: "Tiedoston lataaminen epäonnistui. Yritä uudelleen."
         file_too_large: "Tiedosto on valitettavasti liian suuri (enimmäiskoko on %{max_size_kb} kt). Mitäpä jos lataisit suuren tiedostosi johonkin pilvipalveluun ja jakaisit linkin?"
+        file_size_zero: "Jokin näyttää menneen vikaan. Tiedosto, jota yrität ladata, on 0 tavua. Yritä uudelleen."
+        file_too_large_humanized: "Tiedosto on valitettavasti liian suuri (enimmäiskoko on %{max_size}). Mitäpä jos lataisit suuren tiedostosi johonkin pilvipalveluun ja jakaisit linkin?"
         too_many_uploads: "Voit ladata vain yhden tiedoston kerrallaan."
         too_many_dragged_and_dropped_files:
           one: "Voit ladata vain %{count} tiedoston kerrallaan."
@@ -2738,6 +3032,7 @@ fi:
           just_the_post: "Ei, vain tämä viesti"
         admin: "viestin ylläpitotoimet"
         permanently_delete: "Poista pysyvästi"
+        permanently_delete_confirmation: "Haluatko varmasti poistaa tämän viestin pysyvästi? Et voi palauttaa sitä."
         wiki: "Tee wiki"
         unwiki: "Poista wiki"
         convert_to_moderator: "Lisää henkilökunnan taustaväri"
@@ -2745,6 +3040,8 @@ fi:
         rebake: "Koosta HTML uudelleen"
         publish_page: "Sivujulkaisu"
         unhide: "Poista piilotus"
+        change_owner: "Vaihda omistajuutta..."
+        grant_badge: "Myönnä kunniamerkki..."
         lock_post: "Lukitse viesti"
         lock_post_description: "estä kirjoittajaa muokkaamasta tätä viestiä"
         unlock_post: "Poista viestin lukitus"
@@ -2758,6 +3055,8 @@ fi:
         delete_topic_confirm_modal_no: "Ei, säilytä ketju"
         delete_topic_error: "Ketjua poistettaessa tapahtui virhe"
         delete_topic: "poista ketju"
+        add_post_notice: "Lisää ilmoitus henkilökunnalle..."
+        change_post_notice: "Muuta ilmoitusta henkilökunnalle..."
         delete_post_notice: "Poista ilmoitus henkilökunnalle"
         remove_timer: "poista ajastin"
         edit_timer: "muokkaa ajastusta"
@@ -2775,6 +3074,8 @@ fi:
           read_capped:
             one: "ja %{count} muu lukivat tämän"
             other: "ja %{count} muuta lukivat tämän"
+          sr_post_likers_list_description: "käyttäjät, jotka tykkäsivät tästä viestistä"
+          sr_post_readers_list_description: "käyttäjät, jotka ovat lukeneet tämän viestin"
         by_you:
           off_topic: "Liputit tämän eksyvän aiheesta"
           spam: "Liputit tämän roskapostiksi"
@@ -2785,6 +3086,10 @@ fi:
         confirm:
           one: "Oletko varma, että haluat poistaa viestin?"
           other: "Oletko varma, että haluat poistaa %{count} viestiä?"
+      merge:
+        confirm:
+          one: "Oletko varma, että haluat yhdistää nämä viestit?"
+          other: "Oletko varma, että haluat yhdistää nämä %{count} viestiä?"
       revisions:
         controls:
           first: "Ensimmäinen revisio"
@@ -2820,7 +3125,9 @@ fi:
             button: "HTML"
       bookmarks:
         create: "Luo kirjanmerkki"
+        create_for_topic: "Luo kirjanmerkki ketjulle"
         edit: "Muokkaa kirjanmerkkiä"
+        edit_for_topic: "Muokkaa ketjun kirjanmerkkiä"
         created: "Luotu"
         updated: "Päivitetty"
         name: "Nimi"
@@ -2834,6 +3141,9 @@ fi:
           edit_bookmark:
             name: "Muokkaa kirjanmerkkiä"
             description: "Muokkaa kirjanmerkin nimeä tai muuta muistutuksen päivämäärää ja kellonaikaa"
+          clear_bookmark_reminder:
+            name: "Tyhjennä muistutus"
+            description: "Tyhjennä muistutuksen päivämäärä ja aika"
           pin_bookmark:
             name: "Kiinnitä kirjanmerkki"
             description: "Kiinnitä kirjanmerkki. Näin se näkyy kirjanmerkkiluettelon yläosassa."
@@ -2846,11 +3156,15 @@ fi:
         viewing_summary: "Katsellaan ketjun yhteenvetoa"
         post_number: "%{username}, viesti #%{post_number}"
         show_all: "Näytä kaikki"
+      share:
+        title: "Jaa viesti %{post_number}"
+        instructions: "Jaa linkki tähän viestiin:"
     category:
       none: "(ei aluetta)"
       all: "Kaikki alueet"
       choose: "alue&hellip;"
       edit: "Muokkaa"
+      edit_title: "Muokkaa tätä aluetta"
       edit_dialog_title: "Muokkaa: %{categoryName}"
       view: "Katsele alueen ketjuja"
       back: "Takaisin alueelle"
@@ -2866,7 +3180,10 @@ fi:
       manage_tag_groups_link: "Hallitse tunnisteryhmiä"
       allow_global_tags_label: "Salli myös muut tunnisteet"
       required_tag_group:
+        description: "Edellytä, että uudella ketjulla on tunnisteita tunnisteryhmäitä:"
         delete: "Poista"
+        add: "Lisää pakollinen tunnisteryhmä"
+        placeholder: "valitse tunnisteryhmä..."
       topic_featured_link_allowed: "Salli ketjulinkit tällä alueella"
       delete: "Poista alue"
       create: "Uusi alue"
@@ -2879,6 +3196,7 @@ fi:
       name: "Alueen nimi"
       description: "Kuvaus"
       logo: "Alueen logokuva"
+      logo_dark: "Tumman tilan alueen logokuva"
       background_image: "Alueen taustakuva"
       badge_colors: "Kunniamerkin värit"
       background_color: "Taustaväri"
@@ -2926,6 +3244,7 @@ fi:
       default_list_filter: "Oletusluettelosuodatin:"
       allow_badges_label: "Salli kunniamerkkien myöntäminen tällä alueella"
       edit_permissions: "Muokkaa oikeuksia"
+      reviewable_by_group: "Henkilökunnan lisäksi tämän alueen sisältöä voi käsitellä myös:"
       review_group_name: "ryhmän nimi"
       require_topic_approval: "Edellytä valvojan hyväksyntää kaikille uusille ketjuille"
       require_reply_approval: "Edellytä valvojan hyväksyntää kaikille uusille vastauksille"
@@ -2935,10 +3254,12 @@ fi:
       position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä, "
       position_disabled_click: 'ota käyttöön pysyvien aluesijoitusten asetus.'
       minimum_required_tags: "Ketjussa vaadittavien tunnisteiden vähimmäismäärä:"
+      default_slow_mode: 'Ota "Hidas tila" käyttöön tämän alueen uusille ketjuille.'
       parent: "Ylätason alue"
       num_auto_bump_daily: "Päivittäin nostettavien avointen ketjujen määrä:"
       navigate_to_first_post_after_read: "Siirry ensimmäiseen viestiin, kun ketjut on luettu"
       notifications:
+        title: "muuta tämän alueen ilmoitustasoa"
         watching:
           title: "Tarkkailu"
           description: "Tarkkailet automaattisesti kaikkia ketjuja tällä alueella. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
@@ -3085,15 +3406,20 @@ fi:
       other {}}
     original_post: "Aloitusviesti"
     views: "Katseluita"
+    sr_views: "Lajittele katselukertojen mukaan"
     views_lowercase:
       one: "katselu"
       other: "katselua"
     replies: "Vastauksia"
+    sr_replies: "Lajittele vastausten mukaan"
     views_long:
       one: "ketjua on katseltu %{count} kerran"
       other: "ketjua on katseltu %{number} kertaa"
     activity: "Toiminta"
+    sr_activity: "Lajittele toiminnan mukaan"
     likes: "Tykkäykset"
+    sr_likes: "Lajittele tykkäysten mukaan"
+    sr_op_likes: "Lajittele alkuperäisen viestin tykkäysten mukaan"
     likes_lowercase:
       one: "tykkäys"
       other: "tykkäystä"
@@ -3103,6 +3429,7 @@ fi:
       other: "käyttäjää"
     category_title: "Alue"
     history_capped_revisions: "Historia, viimeiset 100 versiota"
+    history: "Historia"
     changed_by: "käyttäjältä %{author}"
     raw_email:
       title: "Saapuva sähköposti"
@@ -3133,6 +3460,10 @@ fi:
         lower_title_with_count:
           one: "%{count} lukematta"
           other: "%{count} lukematta"
+      unseen:
+        title: "Näkemätön"
+        lower_title: "näkemätön"
+        help: "uudet ketjut ja ketjut, joita seuraat tai tarkkailet tällä hetkellä ja joissa on lukemattomia viestejä"
       new:
         lower_title_with_count:
           one: "%{count} uusi"
@@ -3177,6 +3508,8 @@ fi:
         this_week: "Viikko"
         today: "Tänään"
         other_periods: "katso suosituimmat:"
+    browser_update: 'Valitettavasti <a href="https://www.discourse.org/faq/#browser">selaintasi ei tueta</a>. <a href="https://browsehappy.com">Vaihda tuettuun selaimeen</a>, niin voit katsella monipuolista sisältöä, kirjautua sisään ja vastata.'
+    safari_13_warning: Tämä sivusto poistaa pian iOS:n ja Safarin version 13 ja sitä vanhempien versioiden tuen. Yksinkertaistettu vain luku -versio on edelleen käytettävissä. (<a href="https://meta.discourse.org/t/224747">Lisätietoja</a>)
     permission_types:
       full: "Luoda / Vastata / Nähdä"
       create_post: "Vastata / Nähdä"
@@ -3184,6 +3517,7 @@ fi:
     preloader_text: "Ladataan"
     lightbox:
       download: "lataa"
+      open: "alkuperäinen kuva"
       previous: "Edellinen (vasen nuolinäppäin)"
       next: "Seuraava (oikea nuolinäppäin)"
       counter: "%curr% / %total%"
@@ -3198,6 +3532,7 @@ fi:
       shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
       shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Pikanäppäimet"
+      short_title: "Pikavalinnat"
       jump_to:
         title: "Siirry"
         home: "%{shortcut} Aloitussivulle"
@@ -3265,6 +3600,7 @@ fi:
         edit: "%{shortcut} Muokkaa viestiä"
         delete: "%{shortcut} Poista viesti"
         mark_muted: "%{shortcut} Vaimenna ketju"
+        mark_regular: "%{shortcut} Normaali ketju (oletus)"
         mark_tracking: "%{shortcut} Seuraa ketjua"
         mark_watching: "%{shortcut} Tarkkaile ketjua"
         print: "%{shortcut} Tulosta ketju"
@@ -3274,6 +3610,7 @@ fi:
         title: "Hakuvalikko"
         prev_next: "%{shortcut} Siirry valinnassa ylös ja alas"
         insert_url: "%{shortcut} Lisää valinta avoinna olevaan kirjoitustyökaluun"
+        full_page_search: "%{shortcut} Käynnistää koko sivun haun"
     badges:
       earned_n_times:
         one: "On ansainnut tämän kunniamerkin %{count} kerran"
@@ -3310,25 +3647,45 @@ fi:
       favorite_max_not_reached: "Merkitse tämä kunniamerkki suosikiksi"
       favorite_count: "%{count}/%{max} kunniamerkkiä merkitty suosikeiksi"
     download_calendar:
+      title: "Lataa kalenteri"
+      save_ics: "Lataa .ics-tiedosto"
+      save_google: "Lisää Google-kalenteriin"
+      remember: "Älä kysy uudelleen"
+      remember_explanation: "(voit muuttaa tätä asetusta käyttäjäasetuksissasi)"
       download: "Lataa"
+      default_calendar: "Oletuskalenteri"
+      default_calendar_instruction: "Määritä, mitä kalenteria käytetään, kun päivämäärät tallennetaan"
+      add_to_calendar: "Lisää kalenteriin"
+      google: "Google-kalenteri"
+      ics: "ICS"
     tagging:
+      all_tags: "Kaikki tunnisteet"
       other_tags: "Muut tunnisteet"
       selector_all_tags: "kaikki tunnisteet"
       selector_no_tags: "ei tunnisteita"
       changed: "muutetut tunnisteet"
       tags: "Tunnisteet"
       choose_for_topic: "valinnaiset tunnisteet"
+      choose_for_topic_required:
+        one: "valitse ainakin %{count} tunniste..."
+        other: "valitse ainakin %{count} tunnistetta..."
+      choose_for_topic_required_group:
+        one: "valitse %{count} tunniste joukosta %{name}..."
+        other: "valitse %{count} tunnistetta joukosta %{name}..."
       info: "Tietoa"
-      default_info: "Tätä tunnistetta ei ole rajattu millekään alueelle eikä sillä ole synonyymejä."
+      default_info: "Tätä tunnistetta ei ole rajattu millekään alueelle, eikä sillä ole synonyymejä."
+      staff_info: "Lisää rajoituksia asettamalla tämä tunniste <a href=%{basePath}/tag_groups>-tunnisteryhmään</a>."
       category_restricted: "Tämä tunniste on rajoitettu alueille, joille sinulla ei ole pääsyoikeutta."
       synonyms: "Synonyymit"
       synonyms_description: "Kun näitä tunnisteita käytetään, ne korvataan tunnisteella <b>%{base_tag_name}</b>."
+      save: "Tallenna tunnisteen nimi ja kuvaus"
       tag_groups_info:
         one: 'Tunniste kuuluu ryhmään "%{tag_groups}".'
         other: "Tunniste kuuluu näihin ryhmiin: %{tag_groups}"
       category_restrictions:
         one: "Sitä voi käyttää vain tällä alueella:"
         other: "Sitä voi käyttää vain näillä alueilla:"
+      edit_synonyms: "Muokkaa synonyymejä"
       add_synonyms_label: "Lisää synonyymejä:"
       add_synonyms: "Lisää"
       add_synonyms_explanation:
@@ -3345,6 +3702,7 @@ fi:
       delete_confirm_synonyms:
         one: "Sen synonyymi poistetaan myös."
         other: "Sen %{count} synonyymiä poistetaan myös."
+      edit_tag: "Muokkaa tunnisteen nimeä ja kuvausta"
       description: "Kuvaus"
       sort_by: "Järjestys:"
       sort_by_count: "lukumäärä"
@@ -3387,6 +3745,7 @@ fi:
           title: "Vaimennettu"
           description: "Et saa ilmoituksia ketjusta, jolla on tämä tunniste, eivätkä ne näy lukemattomien välilehdessä."
       groups:
+        back_btn: "Takaisin kaikkiin tunnisteisiin"
         title: "Tunnisteryhmät"
         about_heading: "Valitse tunnisteryhmä tai luo uusi"
         about_heading_empty: "Aloita luomalla uusi tunnisteryhmä"
@@ -3414,6 +3773,7 @@ fi:
       topics:
         none:
           unread: "Sinulla ei ole lukemattomia ketjuja."
+          unseen: "Sinulla ei ole näkemättömiä ketjuja."
           new: "Sinulla ei ole uusia ketjuja."
           read: "Et ole lukenut vielä yhtään ketjua."
           posted: "Et ole kirjoittanut vielä yhteenkään ketjuun."
@@ -3455,6 +3815,32 @@ fi:
         regular: "mestari"
         leader: "johtaja"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Olet valinnut tiedoston, jota ei tueta. Tuetut tiedostotyypit – %{types}."
+    user_activity:
+      no_activity_title: "Ei vielä toimintaa."
+      no_activity_body: "Tervetuloa yhteisöömme! Olet uusi täällä etkä ole vielä osallistunut keskusteluihin. Aloita vierailemalla <a href='%{topUrl}'>Suosituissa</a> tai <a href='%{categoriesUrl}'>alueissa</a> ja aloita lukeminen! Valitse %{heartIcon} viesteissä, joista pidät tai haluat lisätietoja. Kun osallistut, toimintasi listataan täällä."
+      no_replies_title: "Et ole vielä vastannut yhteenkään ketjuun"
+      no_replies_title_others: "%{username} ei ole vielä vastannut yhteenkään ketjuun"
+      no_replies_body: "Kun <a href='%{searchUrl}'>löydät</a> mielenkiintoisen keskustelun, johon haluat osallistua, voit vastata kyseiseen viestiin painamalla <kbd>Vastaa</kbd>-painiketta suoraan viestin alapuolella. Jos haluat mieluummin vastata yleiseen ketjuun kuin yksittäiseen viestiin tai yksittäiselle henkilölle, etsi <kbd>Vastaa</kbd>-painike ketjun alalaidasta tai ketjun aikajanalta."
+      no_drafts_title: "Et ole aloittanut luonnoksia"
+      no_drafts_body: "Etkö ole valmis lähettämään viestiäsi? Tallennamme automaattisesti uuden luonnoksen ja listaamme sen tänne aina, kun alat kirjoittamaan ketjua, vastausta tai yksityisviestiä. Hylkää luonnos valitsemalla peruutuspainike tai tallenna luonnos jatkaaksesi myöhemmin."
+      no_likes_title: "Et ole vielä tykännyt ketjuista"
+      no_likes_title_others: "%{username} ei ole vielä tykännyt ketjuista"
+      no_likes_body: "Erinomainen tapa osallistua on aloittaa lukemalla jo käytyjä keskusteluita ja valita %{heartIcon} tykkäämissäsi viesteissä!"
+      no_topics_title: "Et ole vielä aloittanut ketjuja"
+      no_topics_body: "On aina hyvä idea <a href='%{searchUrl}'>hakea</a> olemassa olevia keskusteluketjuja ennen uuden aloittamista, mutta jos olet vakuuttunut siitä, että haluamaasi keskustelua ei vielä löydy, voit aloittaa oman uuden ketjusi. Etsi <kbd>+ Uusi ketju</kbd> -painike ketjuluettelon, alueen tai tunnisteen oikeasta yläkulmasta aloittaaksesi uuden ketjun luominen tällä alueella."
+      no_topics_title_others: "%{username} ei ole vielä aloittanut ketjuja"
+      no_read_topics_title: "Et ole vielä lukenut ketjuja"
+      no_read_topics_body: "Kun alat lukemaana keskusteluita, näet luettelon täällä. Aloita lukeminen etsimällä sinua kiinnostavia ketjuja <a href='%{topUrl}'>Suosituista</a> tai <a href='%{categoriesUrl}'>alueilta</a> tai hakemalla avainsanalla %{searchIcon}"
+    no_group_messages_title: "Ryhmäviestejä ei löytynyt"
+    topic_entrance:
+      sr_jump_top_button: "Siirry ensimmäiseen viestiin"
+      sr_jump_bottom_button: "Siirry viimeiseen viestiin"
+    fullscreen_table:
+      expand_btn: "Laajenna taulukko"
+    second_factor_auth:
+      redirect_after_success: "Kaksiosainen todennus onnistui. Sinut ohjataan edelliselle sivulle…"
     sidebar:
       unread_count:
         one: "%{count} lukematta"
@@ -3462,13 +3848,16 @@ fi:
       new_count:
         one: "%{count} uusi"
         other: "%{count} uutta"
+      toggle_section: "vaihda osa"
       more: "Lisää"
       all_categories: "Kaikki alueet"
+      all_tags: "Kaikki tunnisteet"
       sections:
         about:
           header_link_text: "Tietoa"
         messages:
           header_link_text: "Viestit"
+          header_action_title: "luo yksityisviesti"
           links:
             inbox: "Postilaatikko"
             sent: "Lähetetyt"
@@ -3478,11 +3867,20 @@ fi:
             unread_with_count: "Lukematta (%{count})"
             archive: "Arkisto"
         tags:
+          none: "Et ole lisännyt tunnisteita."
+          click_to_get_started: "Aloita napsauttamalla tätä."
           header_link_text: "Tunnisteet"
+          header_action_title: "muokkaa sivupalkin tunnisteitasi"
+          configure_defaults: "Määritä oletukset"
         categories:
+          none: "Et ole lisännyt alueita."
+          click_to_get_started: "Aloita napsauttamalla tätä."
           header_link_text: "Alueet"
+          header_action_title: "muokkaa sivupalkin alueitasi"
+          configure_defaults: "Määritä oletukset"
         community:
           header_link_text: "Yhteisö"
+          header_action_title: "aloita uusi ketju"
           links:
             about:
               content: "Tietoa"
@@ -3490,20 +3888,35 @@ fi:
               content: "Ylläpitäjä"
             badges:
               content: "Kunniamerkit"
+            everything:
+              content: "Kaikki"
+              title: "Kaikki ketjut"
             faq:
               content: "UKK"
             tracked:
               content: "Seuratut"
+              title: "Kaikki seuratut ketjut"
             groups:
               content: "Ryhmät"
               title: "Kaikki ryhmät"
             users:
               content: "Käyttäjät"
+              title: "Kaikki käyttäjät"
             my_posts:
               content: "Viestini"
+              title: "Viestini"
+              draft_count:
+                one: "%{count} luonnos"
+                other: "%{count} luonnosta"
             review:
               content: "Käsittele"
               title: "käsittele"
+              pending_count: "%{count} odottaa"
+    welcome_topic_banner:
+      title: "Luo tervetuloaiheesi"
+      description: 'Tervetuloaiheesi on ensimmäinen asia, jonka uudet jäsenet lukevat. Ajattele sitä "hissipuheenasi" tai "tavoitelausumanasi". Kerro kaikille, kenelle tämä yhteisö on tarkoitettu, mitä he voivat odottaa löytävänsä täältä ja mitä haluat heidän tekevän ensin.'
+      button_title: "Aloita muokkaaminen"
+    until: "Asti:"
   admin_js:
     type_to_filter: "kirjoita suodattaaksesi..."
     admin:
@@ -3637,6 +4050,7 @@ fi:
               description: "Ylläpitäjät näkevät kaikki ryhmät."
             members_visibility_levels:
               title: "Ketkä voivat nähdä ryhmän jäsenet?"
+              description: "Ylläpitäjät voivat nähdä kaikkien ryhmien jäsenet. Flairi näkyy kaikille käyttäjille."
             publish_read_state: "Näytä ryhmäviesteissä ryhmän lukutila"
           membership:
             automatic: Automaattinen
@@ -3647,6 +4061,7 @@ fi:
             automatic_membership_user_count:
               one: "%{count} käyttäjällä on jokin uusista sähköpostiverkkotunnuksista, ja hänet lisätään ryhmään."
               other: "%{count} käyttäjällä on jokin uusista sähköpostiverkkotunnuksista, ja heidät lisätään ryhmään."
+            automatic_membership_associated_groups: "Käyttäjät, jotka ovat ryhmän jäseniä tässä luetellussa palvelussa, lisätään automaattisesti tähän ryhmään, kun he kirjautuvat sisään palvelulla."
             primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
         name_placeholder: "Ryhmän nimi, ei välilyöntejä, samat säännöt kuin käyttäjätunnuksilla"
         primary: "Ensisijainen ryhmä"
@@ -3694,6 +4109,7 @@ fi:
         no_description: (ei kuvausta)
         all_api_keys: Kaikki API-avaimet
         user_mode: Käyttäjän taso
+        scope_mode: Näkyvyysalue
         impersonate_all_users: Esiinny minä käyttäjänä tahansa
         single_user: "Yksittäinen käyttäjä"
         user_placeholder: Anna käyttäjätunnus
@@ -3708,6 +4124,10 @@ fi:
           description: |
             Kun käytät näkyvyysalueita, voit rajoittaa API-avaimen tiettyyn joukkoon päätepisteitä. Voit myös määritellä mitkä parametrit ovat sallittuja. Erota eri arvot pilkuilla.
           title: Näkyvyysalueet
+          granular: Rakeinen
+          read_only: Vain luku
+          global: Yleinen
+          global_description: API-avaimella ei ole rajoituksia, ja kaikki päätepisteet ovat käytettävissä.
           resource: Resurssi
           action: Toiminto
           allowed_parameters: Sallitut parametrit
@@ -3715,12 +4135,20 @@ fi:
           any_parameter: (mikä tahansa parametri)
           allowed_urls: Sallitut URL-osoitteet
           descriptions:
+            global:
+              read: Rajoita API-avain vain luku -päätepisteisiin.
             topics:
               read: Lue ketjua tai tiettyä sen viestiä. RSS on myös tuettu.
               write: Aloita uusi ketju tai kirjoita olemassa olevaan.
+              update: Päivitä ketju. Muuta otsikkoa, aluetta, tunnisteita jne.
               read_lists: Lue ketjuluetteloita, kuten suositut, uudet, tuoreimmat jne. RSS on myös tuettu.
             posts:
               edit: Muokkaa mitä tahansa viestiä tai tiettyä viestiä.
+            categories:
+              list: Hae luettelo alueista.
+              show: Hae yksittäinen alue tunnuksen perusteella.
+            uploads:
+              create: Lataa uusi tiedosto tai aloita yksittäiset tai moniosaiset suorat lataukset ulkoiseen tallennustilaan.
             users:
               bookmarks: Listaa käyttäjien kirjanmerkit. Palauttaa kirjanmerkkien muistutukset, kun käytetään ICS-muotoa.
               sync_sso: Synkronoi käyttäjä DiscourseConnectin avulla.
@@ -3730,8 +4158,22 @@ fi:
               log_out: Kirjaa ulos kaikista käyttäjän istunnoista.
               anonymize: Anonymisoi käyttäjätilejä.
               delete: Poista käyttäjätilejä.
+              list: Hae luettelo käyttäjistä.
             email:
               receive_emails: Yhdistä tämä näkyvyysalue sähköpostivastaanottimen kanssa käsitelläksesi saapuvia sähköpostiviestejä.
+            badges:
+              create: Aloita uusi kunniamerkki.
+              show: Nouda tietoja kunniamerkistä.
+              update: Päivitä kunniamerkki.
+              delete: Poista kunniamerkki.
+              list_user_badges: Listaa käyttäjien kunniamerkit.
+              assign_badge_to_user: Anna kunniamerkki käyttäjälle.
+              revoke_badge_from_user: Poista kunniamerkki käyttäjältä.
+            wordpress:
+              publishing: Tarvitaan WP Discourse -lisäosan julkaisuominaisuuksiin (pakollinen).
+              commenting: Tarvitaan WP Discourse -lisäosan kommentointiominaisuuksiin.
+              discourse_connect: Tarvitaan WP Discourse -lisäosan DiscourseConnect-ominaisuuksiin.
+              utilities: Tarvitaan, jos käytät WP Discourse -lisäosan apuohjelmia.
       web_hooks:
         title: "Webhookit"
         none: "Webhookeja ei ole tällä hetkellä."
@@ -3790,6 +4232,9 @@ fi:
         notification_event:
           name: "Ilmoitustapahtuma"
           details: "Kun käyttäjä saa ilmoituksen syötteeseensä."
+        user_promoted_event:
+          name: "Käyttäjän ylennustapahtuma"
+          details: "Kun käyttäjä ylennetään luottamustasolta toiselle."
         user_badge_event:
           name: "Kunniamerkin myöntämistapahtuma"
           details: "Kun käyttäjä saa kunniamerkin."
@@ -3928,6 +4373,7 @@ fi:
         delete_confirm: 'Haluatko varmasti poistaa teeman "%{theme_name}"?'
         color: "Väri"
         opacity: "Läpinäkyvyys"
+        copy: "Monista"
         copy_to_clipboard: "Kopioi leikepöydälle"
         copied_to_clipboard: "Kopioitiin leikepöydälle"
         copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
@@ -3943,6 +4389,7 @@ fi:
           theme: "Teema"
           component: "Komponentti"
           components: "Komponentit"
+          filter_placeholder: "kirjoita suodattaaksesi…"
           theme_name: "Teeman nimi"
           component_name: "Komponentin nimi"
           themes_intro: "Aloita valitsemalla olemassa oleva teema tai asenna uusi"
@@ -4026,6 +4473,8 @@ fi:
           import_web_advanced: "Lisäasetukset..."
           import_file_tip: "Teeman sisältävä .tar.gz, .zip tai .dcstyle.json-tiedosto"
           is_private: "Teema on yksityisessä git-tietovarastossa"
+          finish_install: "Viimeistele teeman asennus"
+          last_attempt: "Asennusprosessi ei päättynyt, viimeisin yritys:"
           remote_branch: "Haaran nimi (valinnainen)"
           public_key: "Anna tietovaraston käyttöoikeus seuraavalle julkiselle avaimelle:"
           public_key_note: "Kun olet syöttänyt kelvollisen yksityisen tietovaraston URL-osoitteen yllä, SSH-avain luodaan ja näytetään tässä."
@@ -4036,6 +4485,8 @@ fi:
           install_git_repo: "Git-tietovarastosta"
           install_create: "Luo uusi"
           duplicate_remote_theme: "Teemakomponentti “%{name}” on jo asennettu. Haluatko varmasti asentaa toisen kopion?"
+          force_install: "Teemaa ei voi asentaa, koska Git-tietovarasto ei ole käytettävissä. Haluatko varmasti jatkaa sen asentamista?"
+          create_placeholder: "Luo paikkamerkki"
           about_theme: "Tietoa"
           license: "Lisenssi"
           version: "Versio:"
@@ -4058,6 +4509,7 @@ fi:
           has_overwritten_history: "Nykyistä teemaversiota ei enää ole, koska pakotettu työntö on korvannut git-historian."
           add: "Lisää"
           theme_settings: "Teeman asetukset"
+          overriden_settings_explanation: "Ohitetut asetukset on merkitty pisteellä, ja niissä on korostettu väri. Palauta nämä asetukset oletusarvoihin painamalla niiden vieressä olevaa nollauspainiketta."
           no_settings: "Teemalla ei ole asetuksia."
           theme_translations: "Teeman käännökset"
           empty: "Ei kohteita"
@@ -4095,8 +4547,12 @@ fi:
               %{example}
 
               Etuliitteen lisääminen CSS-kuvauksiin on erittäin suositeltavaa, jotta vältät ristiriidat lisäosien tai ydinsovelluksen kanssa.
+          head_tag:
+            text: "Head"
+            title: "HTML, joka sijoitetaan ennen head-tunnistetta"
           body_tag:
             text: "Leipäteksti"
+            title: "HTML, joka sijoitetaan ennen body-tunnistetta"
           yaml:
             text: "YAML"
             title: "Määritä teeman asetukset YAML-muodossa"
@@ -4194,6 +4650,7 @@ fi:
         time: "Aika"
         user: "Käyttäjä"
         email_type: "Sähköpostin tyyppi"
+        details_title: "Näytä sähköpostin tiedot"
         to_address: "Osoitteeseen"
         test_email_address: "testattava sähköpostiosoite"
         send_test: "Lähetä testisähköposti"
@@ -4211,6 +4668,7 @@ fi:
         last_seen_user: "Käyttäjän edellinen kirjautuminen:"
         no_result: "Tuloksia ei löydetty yhteenvetoa varten."
         reply_key: "Vastausavain"
+        post_link_with_smtp: "Viesti- ja SMTP-tiedot"
         skipped_reason: "Ohituksen syy"
         incoming_emails:
           from_address: "Lähettäjä"
@@ -4240,6 +4698,7 @@ fi:
             address_placeholder: "nimi@esimerkki.fi"
             type_placeholder: "yhteenveto, rekisteröityminen..."
             reply_key_placeholder: "vastausavain"
+            smtp_transaction_response_placeholder: "SMTP-tunnus"
       moderation_history:
         performed_by: "Toimija"
         no_results: "Ei valvontahistoriaa saatavilla."
@@ -4422,6 +4881,7 @@ fi:
         show_words:
           one: "näytä %{count} sana"
           other: "näytä %{count} sanaa"
+        case_sensitive: "(kirjainkoon huomioon ottava)"
         download: Lataa
         clear_all: Tyhjennä kaikki
         clear_all_confirm: "Haluatko varmasti tyhjentää kaikki tarkkaillut sanat toiminnosta %{action}?"
@@ -4459,6 +4919,8 @@ fi:
           exists: "On jo olemassa"
           upload: "Lisää tiedostosta"
           upload_successful: "Lataus onnistui. Sanoja lisättiin."
+          case_sensitivity_label: "Huomioi kirjainkoon"
+          case_sensitivity_description: "Vain sanat, joissa on vastaava kirjainkoko"
         test:
           button_label: "Testi"
           modal_title: "%{action}: Testaa tarkkailtuja sanoja"
@@ -4539,12 +5001,14 @@ fi:
         cant_suspend: "Käyttäjää ei voi hyllyttää."
         delete_posts_failed: "Viestien poistaminen epäonnistui."
         post_edits: "Viestimuokkaukset"
+        view_edits: "Näytä muokkaukset"
         penalty_post_actions: "Mitä haluat tehdä kyseiselle viestille?"
         penalty_post_delete: "Poista viesti"
         penalty_post_delete_replies: "Poista viesti + kaikki vastaukset"
         penalty_post_edit: "Muokkaa viestiä"
         penalty_post_none: "Älä tee mitään"
         penalty_count: "Rangaistusten määrä"
+        penalty_history: "Rangaistushistoria"
         clear_penalty_history:
           title: "Pyyhi rangaistushistoria"
           description: "käyttäjä, jota on rangaistu, ei voi nousta LT3:lle"
@@ -4557,6 +5021,7 @@ fi:
         suspended: "Hyllytetty?"
         staged: "Esikäyttäjä?"
         show_admin_profile: "Ylläpito"
+        manage_user: "Hallinnoi käyttäjää"
         show_public_profile: "Näytä julkinen profiili"
         impersonate: "Esiinny käyttäjänä"
         action_logs: "Toimintaloki"
@@ -4565,6 +5030,7 @@ fi:
         logged_out: "Käyttäjä on kirjautunut ulos kaikilla laitteilla"
         revoke_admin: "Peru ylläpitäjän oikeudet"
         grant_admin: "Myönnä ylläpitäjän oikeudet"
+        grant_admin_success: "Uusi ylläpitäjä vahvistettiin."
         grant_admin_confirm: "Lähetimme sinulle sähköpostin uuden ylläpitäjän vahvistamiseksi. Avaa se ja noudata ohjeita."
         revoke_moderation: "Peru valvojan oikeudet"
         grant_moderation: "Myönnä valvojan oikeudet"
@@ -4606,6 +5072,15 @@ fi:
             title: "Viestien poistamisen eteneminen"
             description: "Poistetaan viestejä..."
           confirmation:
+            title: "Poista kaikki käyttäjän @%{username} viestit"
+            description: |
+              <p>Oletko varma, että haluat poistaa <b>%{post_count}</b> käyttäjän @%{username} viestiä?
+
+              <p><b>Tätä ei voi peruuttaa!</b></p>
+
+              <p>Jatka kirjoittamalla: <code>%{text}</code></p>
+            text: "poista käyttäjän @%{username} viestit"
+            delete: "Poista käyttäjän @%{username} viestit"
             cancel: "Peruuta"
         merge:
           button: "Yhdistä"
@@ -4644,6 +5119,8 @@ fi:
         cant_delete_all_too_many_posts:
           one: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viesti. (delete_all_posts_max)"
           other: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viestiä. (delete_all_posts_max)"
+        delete_confirm_title: "Oletko VARMA, että haluat poistaa tämän käyttäjän? Käyttäjä poistetaan pysyvästi!"
+        delete_confirm: "On yleensä parempi anonymisoida käyttäjät poistamisen sijaan; näin vältät sisällön poistamisen olemassa olevista keskusteluista."
         delete_and_block: "Poista ja <b>estä</b> tämä sähköposti ja IP-osoite"
         delete_dont_block: "Ainoastaan poista"
         deleting_user: "Poistetaan käyttäjää..."
@@ -4684,6 +5161,7 @@ fi:
         unlock_trust_level: "Poista luottamustason lukitus"
         silenced_count: "Hiljennetty"
         suspended_count: "Hyllytetyt"
+        last_six_months: "Viimeiset 6 kuukautta"
         tl3_requirements:
           title: "Luottamustason 3 vaatimukset"
           table_title:
@@ -4828,6 +5306,7 @@ fi:
           search: "Haku"
           groups: "Ryhmät"
           dashboard: "Hallintapaneeli"
+          sidebar: "Sivupalkki"
         secret_list:
           invalid_input: "Tekstikentät eivät voi olla tyhjiä tai sisältää pystyviivamerkkiä."
         default_categories:
@@ -4923,10 +5402,16 @@ fi:
           perform: "Myönnä kunniamerkki käyttäjille"
           upload_csv: Lataa CSV, jossa on joko käyttäjien sähköpostiosoitteita tai käyttäjätunnuksia
           aborted: Lataa CSV, joka sisältää joko käyttäjien sähköpostiosoitteita tai käyttäjätunnuksia
+          success: CSV tuli perille ja %{count} käyttäjää saavat kunniamerkkinsä pian.
+          csv_has_unmatched_users: "Seuraavat merkinnät ovat CSV-tiedostossa, mutta niitä ei voitu yhdistää olemassa oleviin käyttäjiin, joten he eivät saa merkkiä:"
+          csv_has_unmatched_users_truncated_list: "CSV-tiedostossa oli %{count} merkintää, joita ei voitu yhdistää olemassa oleviin käyttäjiin, joten he eivät saa merkkiä. Koska yhdistämättömiä merkintöjä on paljon, vain 100 ensimmäistä näytetään:"
           replace_owners: Poista kunniamerkki aiemmilta omistajilta
+          grant_existing_holders: Myönnä lisämerkkejä nykyisille kunniamerkkien haltijoille
       emoji:
         title: "Emoji"
+        help: "Lisää uusi emoji, joka on kaikkien käytettävissä. Vedä ja pudota useita tiedostoja kerralla antamatta nimeä luodaksesi emojeja niiden tiedostonimillä. Valittua ryhmää käytetään kaikille tiedostoille, jotka lisätään samaan aikaan. Voit myös avata tiedostovalitsimen napsauttamalla Lisää uusi hymiö."
         add: "Lisää uusi emoji"
+        choose_files: "Valitse tiedostot"
         uploading: "Ladataan..."
         name: "Nimi"
         group: "Ryhmä"
@@ -4936,6 +5421,7 @@ fi:
       embedding:
         get_started: "Jos haluat upottaa Discoursen toiselle sivustolle, aloita lisäämällä sen isäntä."
         confirm_delete: "Oletko varma, että haluat poistaa tämän isännän?"
+        sample: "Liitä seuraava HTML-koodi sivustollesi, jotta voit luoda ja upottaa Discourse-ketjuja. Korvaa <b>REPLACE_ME</b> sen sivun kanonisella URL-osoitteella, jolle upotat sen."
         title: "Upottaminen"
         host: "Sallitut isännät"
         class_name: "Luokan nimi"
@@ -4986,8 +5472,11 @@ fi:
           replace: "Korvaa"
   wizard_js:
     wizard:
+      jump_in: "Aloitetaan!"
+      finish: "Poistu määrityksestä"
       back: "Takaisin"
       next: "Seuraava"
+      configure_more: "Määritä lisää..."
       step-text: "Askelväli"
       step: "%{current}/%{total}"
       upload: "Lataa"
@@ -5004,5 +5493,8 @@ fi:
           moderator: "Valvoja"
           regular: "Tavallinen käyttäjä"
       previews:
+        topic_title: "Keskusteluketjun otsikko"
         share_button: "Jaa"
         reply_button: "Vastaa"
+        topic_preview: "Ketjun esikatselu"
+        homepage_preview: "Aloitussivun esikatselu"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 81ec94d6c5..fd5842eca2 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -96,7 +96,7 @@ fr:
           one: "%{count} mois"
           other: "%{count} mois"
         about_x_years:
-          one: "environ %{count} ans"
+          one: "environ %{count} an"
           other: "environ %{count} ans"
         over_x_years:
           one: "plus de %{count} an"
@@ -135,7 +135,7 @@ fr:
       next_month: "Mois suivant"
       placeholder: date
       from_placeholder: "date de début"
-      to_placeholder: "à la date"
+      to_placeholder: "date de fin"
     share:
       topic_html: 'Sujet : <span class="topic-title">%{topicTitle}</span>'
       post: "message #%{postNumber} par @%{username}"
@@ -146,7 +146,7 @@ fr:
       url: "Copier et partager l'URL"
     action_codes:
       public_topic: "a rendu ce sujet public %{when}"
-      open_topic: "converti ceci en sujet %{when}"
+      open_topic: "a converti ceci en sujet %{when}"
       private_topic: "a fait de ce sujet un message direct %{when}"
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
@@ -180,7 +180,7 @@ fr:
     topic_admin_menu: "actions du sujet"
     skip_to_main_content: "Passer au contenu principal"
     emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification par courriel ne sera envoyée."
-    emails_are_disabled_non_staff: "L'envoi de courriel est désactivé pour les utilisateurs ne faisant pas partie des responsables."
+    emails_are_disabled_non_staff: "L'envoi d'e-mail est désactivé pour les utilisateurs ne faisant pas partie des responsables."
     software_update_prompt:
       message: "Nous avons fait une mise à jour du site, nous vous invitons donc à <span>actualiser cette page</span> pour éviter d'éventuels dysfonctionnements."
       dismiss: "Ignorer"
@@ -189,13 +189,13 @@ fr:
       other: "Pour faciliter son lancement, votre nouveau site se trouve en mode d'amorçage. Chaque nouvel utilisateur se verra accorder le niveau de confiance 1 et recevra des résumés quotidiens par courriel. Ce mode sera automatiquement désactivé dès que votre site possédera %{count} utilisateurs."
     bootstrap_mode_disabled: "Le mode d'amorçage sera désactivé dans les prochaines 24 heures."
     bootstrap_invite_button_title: "Envoyer des invitations"
-    bootstrap_wizard_link_title: "Fin de l'assistant d'installation"
+    bootstrap_wizard_link_title: "Terminer l'assistant de configuration"
     themes:
       default_description: "Par défaut"
-      broken_theme_alert: "Votre site risque de ne pas fonctionner car un thème ou un composant de thème a déclenché une ou plusieurs erreurs."
-      error_caused_by: "Déclenchée par '%{name}'. <a target='blank' href='%{path}'>Cliquez ici</a> pour mettre à jour, reconfigurer or désactiver."
-      only_admins: "(ce message ne s'affiche qu'aux administrateurs du site)"
-    broken_decorator_alert: "Les messages risquent de ne pas apparaître correctement car un décorateur de contenu de message de votre site a déclenché une erreur."
+      broken_theme_alert: "Votre site risque de ne pas fonctionner, car un thème ou un composant comprend des erreurs."
+      error_caused_by: "Causée par « %{name} ». <a target='blank' href='%{path}'>Cliquez ici</a> pour mettre à jour, reconfigurer or désactiver."
+      only_admins: "(ce message n'est visible que pour les administrateurs du site)"
+    broken_decorator_alert: "Les publications risquent de ne pas s'afficher correctement, car l'un des décorateurs de contenu de publication de votre site a généré une erreur."
     s3:
       regions:
         ap_northeast_1: "Asie-Pacifique (Tokyo)"
@@ -209,7 +209,7 @@ fr:
         cn_northwest_1: "Chine (Ningxia)"
         eu_central_1: "UE (Francfort)"
         eu_north_1: "UE (Stockholm)"
-        eu_south_1: "EU (Milan)"
+        eu_south_1: "UE (Milan)"
         eu_west_1: "UE (Irlande)"
         eu_west_2: "UE (Londres)"
         eu_west_3: "UE (Paris)"
@@ -309,13 +309,13 @@ fr:
         unbookmark_with_reminder: "Cliquez pour retirer tous les signets et rappels de ce sujet."
     bookmarks:
       created: "Vous avez mis un signet à ce message. %{name}"
-      created_generic: "Vous avez mis en signet à ceci. %{name}"
-      create: "Ajouter un signet"
+      created_generic: "Vous avez mis ceci en signet. %{name}"
+      create: "Créer un signet"
       edit: "Modifier le signet"
       not_bookmarked: "mettre un signet à ce message"
       remove_reminder_keep_bookmark: "Supprimer le rappel et conserver le signet"
       created_with_reminder: "Vous avez mis un signet à ce message avec un rappel pour le %{date}. %{name}"
-      created_with_reminder_generic: "Vous avez mis un signet à ceci avec un rappel pour le %{date}. %{name}"
+      created_with_reminder_generic: "Vous avez mis ceci en signet avec un rappel pour le %{date}. %{name}"
       remove: "Retirer le signet"
       delete: "Supprimer le signet"
       confirm_delete: "Voulez-vous vraiment supprimer ce signet ? Le rappel sera également supprimé."
@@ -326,7 +326,7 @@ fr:
       list_permission_denied: "Vous n'avez pas la permission de voir les signets de cet utilisateur."
       no_user_bookmarks: "Vous n'avez pas de messages dans vos signets ; les signets vous permettent de retrouver rapidement des sujets d'intérêt."
       auto_delete_preference:
-        label: "Après avoir été notifié"
+        label: "Après avoir reçu une notification"
         never: "Conserver le signet"
         when_reminder_sent: "Supprimer le signet"
         on_owner_reply: "Supprimer le signet quand j'aurai répondu"
@@ -340,8 +340,8 @@ fr:
         existing_reminder: "Vous avez configuré un rappel pour ce signet qui sera envoyé %{at_date_time}"
     copy_codeblock:
       copied: "copié !"
-      copy: "Copier ce code dans le presse-papier"
-      fullscreen: "afficher ce code en plein écran"
+      copy: "copier le code dans le presse-papiers"
+      fullscreen: "afficher le code en plein écran"
     drafts:
       label: "Brouillons"
       label_with_count: "Brouillons (%{count})"
@@ -378,7 +378,7 @@ fr:
     saved: "Enregistré avec succès !"
     upload: "Joindre un fichier"
     uploading: "Envoi en cours…"
-    processing: "Traitement..."
+    processing: "Traitement…"
     uploading_filename: "Envoi en cours : %{filename}…"
     processing_filename: "Traitement de : %{filename}…"
     clipboard: "presse-papier"
@@ -593,7 +593,7 @@ fr:
       in_one_hour: "Dans une heure"
       in_two_hours: "Dans deux heures"
       later_today: "Plus tard dans la journée"
-      two_days: "Deux jours"
+      two_days: "Dans deux jours"
       next_business_day: "Au prochain jour ouvré"
       tomorrow: "Demain"
       post_local_date: "Date indiquée dans le message"
@@ -602,16 +602,16 @@ fr:
       start_of_next_business_week: "Lundi"
       start_of_next_business_week_alt: "Lundi prochain"
       next_week: "La semaine prochaine"
-      two_weeks: "Deux semaines"
+      two_weeks: "Dans deux semaines"
       next_month: "Le mois prochain"
       two_months: "Dans deux mois"
       three_months: "Dans trois mois"
       four_months: "Dans quatre mois"
-      six_months: "Six mois"
-      one_year: "Un an"
-      forever: "Pour toujours"
-      relative: "Me le rappeler d'ici"
-      none: "Ne pas me le rappeler"
+      six_months: "Dans six mois"
+      one_year: "Dans un an"
+      forever: "Toujours"
+      relative: "Me le rappeler"
+      none: "Aucun rappel nécessaire"
       never: "Jamais"
       last_custom: "Date et heure personnalisées précédentes"
       custom: "Date et heure personnalisées"
@@ -658,6 +658,8 @@ fr:
         reset_to_default: "Rétablir les valeurs par défaut"
       group:
         all: "tous les groupes"
+      sort:
+        label: "Trier par %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Changer les paramètres du groupe"
@@ -822,6 +824,7 @@ fr:
         group_type: "Type de groupe"
         is_group_user: "Membre"
         is_group_owner: "Propriétaire"
+        search_results: "Les résultats de la recherche apparaîtront ci-dessous."
       title:
         one: "Groupe"
         other: "Groupes"
@@ -856,6 +859,7 @@ fr:
         no_filter_matches: "Aucun membre ne correspond à ces critères."
       topics: "Sujets"
       posts: "Messages"
+      aria_post_number: "%{title} - message #%{postNumber}"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Niveau de notification par défaut pour les messages de groupe"
@@ -970,6 +974,7 @@ fr:
     user_fields:
       none: "(choisir une option)"
       required: 'Veuillez saisir une valeur pour « %{name} »'
+      same_as_password: 'Votre mot de passe ne doit pas être répété dans d''autres champs.'
     user:
       said: "%{username} :"
       profile: "Profil"
@@ -1056,8 +1061,8 @@ fr:
       dismiss: "Vu"
       dismiss_notifications: "Tout vu"
       dismiss_notifications_tooltip: "Marquer les notifications comme lues"
-      dismiss_bookmarks_tooltip: "Marquer tous les rappels de favoris non-lus comme lus"
-      dismiss_messages_tooltip: "Marquer toutes les notifications de messages directs non-lues comme lues"
+      dismiss_bookmarks_tooltip: "Marquer tous les rappels de signets non lus comme lus"
+      dismiss_messages_tooltip: "Marquer toutes les notifications de messages directs non lues comme lues"
       no_messages_title: "Vous n'avez aucun message"
       no_messages_body: >
         Besoin d'échanger directement avec une personne en-dehors de la conversation principale ? Sélectionnez son avatar et utilisez le bouton %{icon} pour lui écrire un message.<br><br>Pour obtenir de l'aide, <a href='%{aboutUrl}'>adressez-vous à l'un des responsables du site</a>.
@@ -1068,9 +1073,12 @@ fr:
       no_notifications_title: "Vous n'avez pas encore reçu de notifications"
       no_notifications_body: >
         Des notifications s'afficheront ici pour vous informer de l'activité qui vous concerne directement sur le forum, telle que les réponses qui vous sont adressées, les personnes qui citent vos messages ou qui mentionnent votre <b>pseudo</b>, et les nouveaux messages publiés dans les sujets que vous suivez. Si vous ne vous êtes pas connecté(e) au forum depuis un moment, vous recevrez aussi ces notifications par courriel.<br><br>Le bouton %{icon} vous permettra de choisir les sujets, les catégories et les étiquettes pour lesquels vous souhaitez recevoir des notifications. Pour en savoir plus, consultez également vos <a href='%{preferencesUrl}'>préférences de notification</a>.
+      no_other_notifications_title: "Vous n'avez pas encore reçu d'autres notifications"
+      no_other_notifications_body: >
+        Vous serez informé(e) dans ce panneau au sujet des autres types d'activité qui peuvent vous intéresser. Par exemple, lorsque quelqu'un crée un lien ou modifie un de vos messages.
       no_notifications_page_title: "Vous n'avez pas encore reçu de notifications"
       no_notifications_page_body: >
-        Vous serez notifiés des activités qui vous concernent directement, incluant les réponses à vos sujets et messages, lorsque une personne mentionne votre <b>@pseudo</b>, vous cite ou répond aux sujets que vous suivez. Si votre dernière connexion remonte à un moment, vous recevrez aussi ces notifications par courriel.<br><br> Le bouton %{icon} vous permet de choisir les sujets, catégories et les étiquettes pour lesquels vous souhaitez recevoir une notification. Pour en savoir plus, consultez également vos <a href='%{preferencesUrl}'>préférences de notification</a>.
+        Des notifications s'afficheront ici pour vous informer des activités qui vous concerne directement sur le forum, telles que les réponses qui vous sont adressées, les personnes qui citent vos messages ou qui mentionnent votre <b>pseudo</b>, et les nouveaux messages publiés dans les sujets que vous suivez. Des notifications vous seront également envoyées par e-mail si vous ne vous êtes pas connecté(e) pendant un certain temps. <br><br>Le bouton %{icon} vous permettra de choisir les sujets, les catégories et les étiquettes pour lesquels vous souhaitez recevoir des notifications. Pour en savoir plus, consultez également vos <a href='%{preferencesUrl}'>préférences de notification</a>.
       first_notification: "Votre première notification ! Sélectionnez-la pour commencer."
       dynamic_favicon: "Afficher un compteur de notifications sur l'icône du navigateur"
       skip_new_user_tips:
@@ -1078,6 +1086,7 @@ fr:
         not_first_time: "Vous connaissez déjà ?"
         skip_link: "Ignorer ces conseils"
         read_later: "J'y jetterai un œil plus tard."
+      reset_seen_popups: "Afficher à nouveau les conseils d'intégration"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
       color_scheme_default_on_all_devices: "Définir comme jeu(x) de couleurs par défaut sur tous mes appareils"
       color_scheme: "Jeu de couleurs"
@@ -1097,11 +1106,16 @@ fr:
       enable_quoting: "Proposer de citer le texte sélectionné"
       enable_defer: "Activer le bouton pour reporter des sujets à plus tard en les marquant comme non lus"
       experimental_sidebar:
+        enable: "Activer la barre latérale"
         options: "Options"
         categories_section: "Section Catégories"
         categories_section_instruction: "Les catégories sélectionnées seront affichées dans la section Catégories de la barre latérale."
         tags_section: "Section Étiquettes"
         tags_section_instruction: "Les étiquettes sélectionnées seront affichées dans la section Étiquettes de la barre latérale."
+        navigation_section: "Navigation"
+        list_destination_instruction: "Lorsque je clique sur le lien d'une liste de sujets dans la barre latérale contenant des sujets nouveaux ou non lus, j'accède à"
+        list_destination_default: "Par défaut"
+        list_destination_unread_new: "Nouveau/Non lu"
       change: "modifier"
       featured_topic: "Sujet vedette"
       moderator: "%{user} a le rôle de modérateur(rice)"
@@ -1187,11 +1201,11 @@ fr:
         unread: "Non lus"
         unread_with_count:
           one: "Non lu (%{count})"
-          other: "Non lu (%{count})"
+          other: "Non lus (%{count})"
         new: "Nouveau"
         new_with_count:
           one: "Nouveau (%{count})"
-          other: "Nouveau (%{count})"
+          other: "Nouveaux (%{count})"
         archive: "Archivés"
         groups: "Mes groupes"
         move_to_inbox: "Déplacer dans la boîte de réception"
@@ -1200,10 +1214,10 @@ fr:
         tags: "Étiquettes"
         all_tags: "Toutes les étiquettes"
         warnings: "Avertissements officiels"
-        read_more_in_group: "Envie d'en lire encore&nbsp;? Consultez d'autres messages dans %{groupLink}."
-        read_more: "Envie d'en lire encore&nbsp;? Consultez d'autres messages dans vos <a href='%{basePath}/u/%{username}/messages'>messages personnels</a>."
-        read_more_group_pm_MF: "Il reste { UNREAD, plural, =0 {} one {1 sujet <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'>non lu</a>} other {# sujets <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'>non lus</a>} } { NEW, plural, =0 {} one { { BOTH, select, true { et } false {} other {} }1 <a href='{basePath}/u/{username}/messages/group/{groupName}/new'>nouveau</a> sujet} other { { BOTH, select, true { et } false {} other {} } # <a href='{basePath}/u/{username}/messages/group/{groupName}/new'>nouveaux</a> sujets}}, ou vous pouvez aussi consulter les autres sujets dans {groupLink}"
-        read_more_personal_pm_MF: "Il reste { UNREAD, plural, =0 {} one {un message <a href='{basePath}/u/{username}/messages/unread'>non lu</a>} other {# messages <a href='{basePath}/u/{username}/messages//unread'>non lus</a>} } { NEW, plural, =0 {} one { { BOTH, select, true { et } false {} other {} }un <a href='{basePath}/u/{username}/messages/new'>nouveau</a> message} other { { BOTH, select, true { et } false {} other {} } # <a href='{basePath}/u/{username}/messages/new'>nouveaux</a> messages}}, ou vous pouvez aussi consulter les autres <a href='{basePath}/u/{username}/messages'>messages personnels</a>"
+        read_more_in_group: "Vous voulez en savoir plus ? Parcourez les autres messages dans %{groupLink}."
+        read_more: "Vous voulez en savoir plus ? Parcourez les autres messages dans les <a href='%{basePath}/u/%{username}/messages'>messages personnels</a>."
+        read_more_group_pm_MF: "Il reste { UNREAD, plural, =0 {} one { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># message non lu</a> } other { are <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># messages non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false { } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># nouveau</a> message} other { {BOTH, select, true{et } false { } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># nouveaux</a> messages} }, ou vous pouvez parcourir les autres messages dans {groupLink}"
+        read_more_personal_pm_MF: "Il reste { UNREAD, plural, =0 {} one { <a href='{basePath}/u/{username}/messages/unread'># message non lu</a> } other { <a href='{basePath}/u/{username}/messages/unread'># messages non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false { } other{}} <a href='{basePath}/u/{username}/messages/new'># nouveau</a> message} other { {BOTH, select, true{et } false { } other{}} <a href='{basePath}/u/{username}/messages/new'># nouveaux</a> messages} }, ou vous pouvez parcourir les autres <a href='{basePath}/u/{username}/messages'>messages personnels</a>"
       preferences_nav:
         account: "Compte"
         security: "Sécurité"
@@ -1272,6 +1286,8 @@ fr:
         edit: "Modifier"
         edit_title: "Gérer l'application d'authentification"
         edit_description: "Nom de l'application d'authentification"
+        enable_security_key_description: |
+          Lorsque vous avez préparé votre <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">clé de sécurité matérielle</a> ou votre appareil mobile compatible, appuyez sur le bouton Enregistrer ci-dessous.
         totp:
           title: "Applications d'authentification basées sur les jetons"
           add: "Ajouter une application d'authentification"
@@ -1279,10 +1295,16 @@ fr:
           name_and_code_required_error: "Vous devez donner le nom et le code de votre application d'authentification."
         security_key:
           register: "Enregistrer"
+          title: "Clés de sécurité physiques"
+          add: "Ajouter une clé de sécurité physique"
           default_name: "Clé de sécurité principale"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "La procédure d'enregistrement de la clé de sécurité a expiré ou a été annulée."
           already_added_error: "Vous avez déjà enregistré cette clé de sécurité. Vous n'avez pas besoin de le faire à nouveau."
+          edit: "Modifier la clé de sécurité physique"
           save: "Enregistrer"
+          edit_description: "Nom de la clé de sécurité physique"
           name_required_error: "Vous devez donner un nom à votre clé de sécurité."
       change_about:
         title: "Modifier la rubrique « À propos de moi »"
@@ -1359,7 +1381,7 @@ fr:
         not_connected: "(non connecté)"
         confirm_modal_title: "Connectez le compte %{provider}"
         confirm_description:
-          disconnect: "Votre compte %{provider} existant '%{account_description}' sera déconnecté."
+          disconnect: "Votre compte %{provider} existant « %{account_description} » sera déconnecté."
           account_specific: "Votre compte %{provider} « %{account_description} » sera utilisé pour l'authentification."
           generic: "Votre compte %{provider} sera utilisé pour l'authentification."
       name:
@@ -1447,11 +1469,11 @@ fr:
         every_month: "tous les mois"
         every_six_months: "tous les six mois"
       email_level:
-        title: "Envoyez-moi un courriel lorsque je suis cité, que l’on me répond, que mon @username d’utilisateur est mentionné ou qu’il y a une nouvelle activité dans les catégories, les étiquettes ou les sujets que je surveille"
+        title: "Envoyez-moi un e-mail lorsque je suis cité(e), lorsque je reçois une réponse, lorsque mon @username est mentionné ou lorsqu'il y a une nouvelle activité dans les catégories, les étiquettes ou les sujets que je regarde"
         always: "toujours"
         only_when_away: "seulement en cas d'absence"
         never: "jamais"
-      email_messages_level: "Envoyez-moi un courriel lorsque je reçois un message personnel"
+      email_messages_level: "Envoyez-moi un e-mail lorsque je reçois un message personnel"
       include_tl0_in_digests: "Inclure les contributions des nouveaux utilisateurs dans les résumés par courriel"
       email_in_reply_to: "En plus du message notifié par courriel, inclure un extrait du message auquel il répond"
       other_settings: "Autre"
@@ -1530,14 +1552,14 @@ fr:
         invite:
           new_title: "Créer une invitation"
           edit_title: "Modifier l'invitation"
-          instructions: "Partagez ce lien pour donner instantanément accès au site :"
+          instructions: "Partagez ce lien pour accorder instantanément l'accès à ce site :"
           copy_link: "copier le lien"
           expires_in_time: "Arrivera à expiration dans %{time}"
           expired_at_time: "Arrivée à expiration le %{time}"
           show_advanced: "Afficher les options avancées"
           hide_advanced: "Masquer les options avancées"
-          restrict: "Restreint à"
-          restrict_email: "Restreint au courriel"
+          restrict: "Restreindre à"
+          restrict_email: "Restreindre aux e-mails"
           restrict_domain: "Restreindre au domaine"
           email_or_domain_placeholder: "nom@exemple.com ou exemple.com"
           max_redemptions_allowed: "Nombre max. d'utilisations"
@@ -1546,7 +1568,7 @@ fr:
           expires_at: "Ce lien expirera dans"
           custom_message: "Message personnel (facultatif)"
           send_invite_email: "Enregistrer et envoyer le courriel"
-          send_invite_email_instructions: "Restreindre l'invitation à l'email pour envoyer un email d'invitation"
+          send_invite_email_instructions: "Restreindre l'invitation à l'adresse email pour envoyer un email d'invitation"
           save_invite: "Enregistrer l'invitation"
           invite_saved: "Invitation enregistrée."
         bulk_invite:
@@ -1572,7 +1594,7 @@ fr:
         title: "Résumé"
         stats: "Statistiques"
         time_read: "temps de lecture"
-        time_read_title: "%{duration} (tout le temps)"
+        time_read_title: "%{duration} (total)"
         recent_time_read: "de lecture récente"
         recent_time_read_title: "%{duration} (au cours des 60 derniers jours)"
         topic_count:
@@ -1629,11 +1651,14 @@ fr:
       title:
         title: "Titre"
         none: "(aucun)"
-        instructions: "Apparaît après votre nom d'utilisateur"
+        instructions: "apparaît après votre nom d'utilisateur"
       flair:
         title: "Flair"
         none: "(aucun)"
         instructions: "icône affichée à côté de votre image de profil"
+      status:
+        title: "Statut personnalisé"
+        not_set: "Non défini"
       primary_group:
         title: "Groupe principal"
         none: "(aucun)"
@@ -1645,10 +1670,19 @@ fr:
         private_message: "message direct"
         the_topic: "le sujet"
     user_status:
-      save: "Sauvegarder"
+      save: "Enregistrer"
       set_custom_status: "Définir un statut personnalisé"
-      what_are_you_doing: "« Que faites-vous ? »"
+      what_are_you_doing: "Que faites-vous ?"
       remove_status: "Supprimer le statut"
+    popup:
+      primary: "J'ai compris !"
+      secondary: "ne me montrez pas ces conseils"
+      first_notification:
+        title: "Votre première notification !"
+        content: "Les notifications sont utilisées pour vous tenir au courant de ce qui se passe dans la communauté."
+      topic_timeline:
+        title: "Chronologie du sujet"
+        content: "Parcourez rapidement un article à l'aide de la chronologie des sujets."
     loading: "Chargement…"
     errors:
       prev_page: "lors du chargement de"
@@ -1681,6 +1715,8 @@ fr:
       enabled: "Le site est en mode lecture seule. Vous pouvez continuer à le parcourir, mais les réponses, « J'aime » et autres interactions sont désactivées pour l'instant."
       login_disabled: "La connexion est désactivée quand le site est en lecture seule."
       logout_disabled: "La déconnexion est désactivée quand le site est en lecture seule."
+    staff_writes_only_mode:
+      enabled: "Ce site est en mode réservé aux responsables. Vous pouvez continuer à naviguer, mais les réponses, les j'aime et les autres actions sont limitées aux responsables uniquement."
     too_few_topics_and_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Commençons la discussion !</a> Il y a {currentTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}} et {currentPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Il en faudrait davantage pour les visiteurs : nous recommandons au moins {requiredTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}} et {requiredPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Seuls les responsables peuvent voir ce message.
     too_few_topics_notice_MF: >-
@@ -1712,6 +1748,7 @@ fr:
       hide_forever: "non merci"
       hidden_for_session: "Très bien, nous vous le demanderons demain. Vous pouvez aussi utiliser le bouton « Se connecter » pour vous créer un compte."
       intro: "Bonjour ! Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
+      value_prop: "Vous en avez assez de faire défiler les mêmes messages ? En créant un compte, vous pourrez toujours revenir là où vous en étiez. Avec un compte, vous pouvez aussi recevoir des notifications de nouvelles réponses, enregistrer des signets et utiliser des cœurs pour remercier les autres utilisateurs. Nous pouvons travailler ensemble pour rendre cette communauté formidable. :heart:"
     summary:
       enabled_description: "Vous visualisez un résumé de ce sujet : les messages les plus intéressants choisis par la communauté."
       description:
@@ -1721,7 +1758,7 @@ fr:
       enable: "Résumer ce sujet"
       disable: "Afficher tous les messages"
       short_label: "Résumer"
-      short_title: "Afficher un résumé de ce sujet : les articles les plus intéressants tels que déterminés par la communauté"
+      short_title: "Afficher un résumé de ce sujet : les publications les plus intéressantes telles que déterminées par la communauté"
     deleted_filter:
       enabled_description: "Ce sujet contient des messages supprimés, qui ont été masqués."
       disabled_description: "Les messages supprimés du sujet sont visibles."
@@ -1737,6 +1774,7 @@ fr:
       remove_allowed_user: "Voulez-vous vraiment supprimer %{name} de ce message direct ?"
       remove_allowed_group: "Voulez-vous vraiment supprimer %{name} de ce message direct ?"
       leave: "Quitter"
+      remove_group: "Supprimer le groupe"
       remove_user: "Supprimer l'utilisateur"
     email: "Courriel"
     username: "Nom d'utilisateur"
@@ -1756,7 +1794,7 @@ fr:
       title: "Réinitialisation du mot de passe"
       action: "J'ai oublié mon mot de passe"
       invite: "Saisissez votre nom d'utilisateur ou votre adresse courriel et vous recevrez un nouveau mot de passe par courriel."
-      invite_no_username: "Saisissez votre adresse de courriel et nous vous enverrons un courriel de réinitialisation du mot de passe."
+      invite_no_username: "Saisissez votre adresse e-mail et nous vous enverrons un e-mail de réinitialisation du mot de passe."
       reset: "Réinitialiser votre mot de passe"
       complete_username: "Si un compte correspond au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel contenant les instructions permettant de réinitialiser votre mot de passe."
       complete_email: "Si un compte correspond à l'adresse courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel contenant les instructions permettant de réinitialiser votre mot de passe."
@@ -1793,6 +1831,7 @@ fr:
       second_factor_backup_title: "Authentification à deux facteurs (code de secours)"
       second_factor_backup_description: "Veuillez saisir un de vos codes de secours :"
       second_factor: "Se connecter avec une application"
+      security_key_description: "Dès que vous avez préparé votre clé de sécurité physique ou votre appareil mobile compatible, appuyez sur le bouton Authentifier avec une clé de sécurité ci-dessous."
       security_key_alternative: "Essayer une autre méthode"
       security_key_authenticate: "S'authentifier avec une clé de sécurité"
       security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
@@ -1836,20 +1875,20 @@ fr:
         sr_title: "Se connecter avec Twitter"
       instagram:
         name: "Instagram"
-        title: "Connectez-vous avec Instagram"
-        sr_title: "Connectez-vous avec Instagram"
+        title: "Se connecter avec Instagram"
+        sr_title: "Se connecter avec Instagram"
       facebook:
         name: "Facebook"
-        title: "Connectez-vous avec Facebook"
-        sr_title: "Connectez-vous avec Facebook"
+        title: "Se connecter avec Facebook"
+        sr_title: "Se connecter avec Facebook"
       github:
         name: "GitHub"
-        title: "Connectez-vous avec GitHub"
-        sr_title: "Connectez-vous avec GitHub"
+        title: "Se connecter avec GitHub"
+        sr_title: "Se connecter avec GitHub"
       discord:
         name: "Discord"
-        title: "Connectez-vous avec Discord"
-        sr_title: "Connectez-vous avec Discord"
+        title: "Se connecter avec Discord"
+        sr_title: "Se connecter avec Discord"
       second_factor_toggle:
         totp: "Utilisez plutôt une application d'authentification"
         backup_code: "Utilisez plutôt un code de secours"
@@ -1878,7 +1917,7 @@ fr:
       categories_only: "Catégories seules"
       categories_with_featured_topics: "Catégories avec sujets à la une"
       categories_and_latest_topics: "Catégories et sujets récents"
-      categories_and_latest_topics_created_date: "Catégories et Sujets récents (trier par date de création du sujet)"
+      categories_and_latest_topics_created_date: "Catégories et sujets récents (trier par date de création du sujet)"
       categories_and_top_topics: "Catégories et meilleurs sujets"
       categories_boxes: "Boîtes avec sous-catégories"
       categories_boxes_with_topics: "Boîtes avec sujets à la une"
@@ -1966,8 +2005,9 @@ fr:
       similar_topics: "Votre sujet est similaire à…"
       drafts_offline: "brouillons hors ligne"
       edit_conflict: "conflit de modification"
-      esc: "Échap"
-      esc_label: "Cliquer ou presser la touche Échap pour fermer"
+      esc: "échap"
+      esc_label: "Cliquez ou appuyez sur Échap pour fermer"
+      ok_proceed: "OK. Continuer"
       group_mentioned_limit:
         one: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe comprend plus de membres que le nombre limite de mentions de %{count} utilisateur configuré par l'administrateur. Personne ne sera notifié."
         other: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe comprend plus de membres que le nombre limite de mentions de %{count} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
@@ -1976,12 +2016,12 @@ fr:
         other: "En mentionnant %{group}, vous êtes sur le point de notifier <a href='%{group_link}'>%{count} personnes</a>. Voulez-vous continuer ?"
       cannot_see_mention:
         category: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car la catégorie ne lui est pas accessible. Vous devez l'ajouter à un groupe ayant accès à cette catégorie."
-        private: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car ce message direct ne lui est pas visible. Vous devez l'inviter à ce message direct."
-        muted_topic: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car ils ont mis ce sujet en sourdine."
-        not_allowed: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car ils n'ont pas été invités à ce sujet."
+        private: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car ce message direct ne lui est pas visible. Vous devez l'inviter à rejoindre ce message direct."
+        muted_topic: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car il ou elle a mis ce sujet en sourdine."
+        not_allowed: "Vous avez mentionné @%{username}, mais aucune notification ne lui sera envoyée, car il ou elle n'a pas été invité(e) à rejoindre ce sujet."
       here_mention:
-        one: "En mentionnant <b>@%{here}</b>, vous vous apprêtez à notifier %{count} personne – Voulez-vous continuer ?"
-        other: "En mentionnant <b>@%{here}</b>, vous vous apprêtez à notifier %{count} personnes – Voulez-vous continuer ?"
+        one: "En mentionnant <b>@%{here}</b>, vous êtes sur le point de notifier %{count} utilisateur. Voulez-vous continuer ?"
+        other: "En mentionnant <b>@%{here}</b>, vous êtes sur le point de notifier %{count} utilisateurs. Voulez-vous continuer ?"
       duplicate_link: "Il semblerait que votre lien vers <b>%{domain}</b> a déjà été publié dans le sujet par <b>@%{username}</b> dans <a href='%{post_url}'>une réponse de %{ago}</a>. Voulez-vous vraiment le publier à nouveau ?"
       reference_topic_title: "RE : %{title}"
       error:
@@ -2014,7 +2054,7 @@ fr:
       create_shared_draft: "Créer un brouillon partagé"
       edit_shared_draft: "Modifier le brouillon partagé"
       title: "Ou appuyez sur %{modifier}Entrée"
-      users_placeholder: "Ajouter des utilisatrices ou des groupes"
+      users_placeholder: "Ajouter des utilisateurs ou des groupes"
       title_placeholder: "Pouvez-vous résumer le sujet en une courte phrase ?"
       title_or_link_placeholder: "Saisissez un titre ou copiez un lien ici"
       edit_reason_placeholder: "pourquoi modifiez-vous le message ?"
@@ -2059,7 +2099,7 @@ fr:
       abandon: "fermer le panneau d'édition et supprimer le brouillon"
       enter_fullscreen: "utiliser l'éditeur plein écran"
       exit_fullscreen: "sortir de l'éditeur plein écran"
-      exit_fullscreen_prompt: "Appuyer sur <kbd>ESC</kbd> pour sortir du plein écran"
+      exit_fullscreen_prompt: "Appuyez sur <kbd>ÉCHAP</kbd> pour quitter le mode plein écran"
       show_toolbar: "afficher la barre d'outils de l'éditeur"
       hide_toolbar: "masquer la barre d'outils de l'éditeur"
       modal_ok: "OK"
@@ -2070,6 +2110,9 @@ fr:
         body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
       slow_mode:
         error: "Ce sujet est en mode ralenti. Vous avez déjà publié un message récemment ; vous pourrez en publier un autre d'ici %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "La personne à qui vous envoyez un message, <b>%{usernames}</b>, n'a pas été vue ici depuis très longtemps (%{time_ago}). Il se peut qu'elle ne reçoive pas votre message. Vous pouvez rechercher d'autres moyens de contacter %{usernames}."
+        multiple: "Les personnes suivantes à qui vous envoyez un message : <b>%{usernames}</b>, n'ont pas été vues ici depuis très longtemps (%{time_ago}). Il se peut qu'ils ne reçoivent pas votre message. Vous pouvez rechercher d'autres moyens de les contacter."
       admin_options_title: "Paramètres optionnels des responsables pour ce sujet"
       composer_actions:
         reply: Répondre
@@ -2121,6 +2164,7 @@ fr:
       post_approved: "Votre message a été approuvé"
       reviewable_items: "éléments en attente d'examen"
       watching_first_post_label: "Nouveau sujet"
+      user_moved_post: "%{username} a été déplacé(e)"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2135,8 +2179,8 @@ fr:
         other: "<span class='multi-user'>%{username}, %{username2} et %{count} autres</span> %{description}"
       liked_by_2_users: "%{username}, %{username2}"
       liked_by_multiple_users:
-        one: "%{username}, %{username2} et %{count} autre"
-        other: "%{username}, %{username2} et %{count} autres"
+        one: "%{username}, %{username2} et %{count} autre utilisateur"
+        other: "%{username}, %{username2} et %{count} autres utilisateurs"
       liked_consolidated_description:
         one: "a aimé %{count} de vos messages"
         other: "a aimé %{count} de vos messages"
@@ -2161,12 +2205,15 @@ fr:
       dismiss_confirmation:
         body:
           default:
-            one: "Vous avez %{count} notification importante. Voulez-vous continuer?"
-            other: "Vous avez %{count} notifications importantes. Voulez-vous continuer?"
+            one: "Vous avez %{count} notification importante. Voulez-vous continuer ?"
+            other: "Vous avez %{count} notifications importantes. Voulez-vous continuer ?"
+          bookmarks:
+            one: "Êtes-vous sûr(e) ? Vous avez %{count} rappel de signet non lu."
+            other: "Êtes-vous sûr·e ? Vous avez %{count} rappels de signets non lus."
           messages:
-            one: "Êtes-vous sûr·e ? Vous avez %{count} message personnel non lu."
-            other: "Êtes-vous sûr·e ? Vous avez %{count} messages personnels non lus."
-        dismiss: "Vu"
+            one: "Vous avez %{count} message direct non lu. Voulez-vous continuer ?"
+            other: "Vous avez %{count} messages directs non lus. Voulez-vous continuer ?"
+        dismiss: "Fermer"
         cancel: "Annuler"
       group_message_summary:
         one: "%{count} message dans la boîte de réception de %{group_name}"
@@ -2247,12 +2294,12 @@ fr:
       tags: "Étiquettes"
       in: "dans"
       in_this_topic: "dans ce sujet"
-      in_this_topic_tooltip: "basculer vers la recherche à travers tous les sujets"
+      in_this_topic_tooltip: "basculer vers la recherche dans tous les sujets"
       in_messages: "dans les messages"
-      in_messages_tooltip: "basculer vers la recherche de sujets réguliers"
+      in_messages_tooltip: "basculer vers la recherche dans les sujets réguliers"
       in_topics_posts: "dans tous les sujets et messages"
       enter_hint: "ou appuyez sur Entrée"
-      in_posts_by: "dans les messages par %{username}"
+      in_posts_by: "dans les messages de %{username}"
       browser_tip: "%{modifier} + f"
       browser_tip_description: "à nouveau pour utiliser la fonction de recherche de votre navigateur"
       recent: "Recherches récentes"
@@ -2271,8 +2318,8 @@ fr:
       tips:
         category_tag: "filtres par catégorie ou par étiquette"
         author: "filtres par auteur de message"
-        in: "filtres par métadonnées (ex : in:title, in:personal, in:pinned)"
-        status: "filtré par statut de sujet"
+        in: "filtres par métadonnées (p. ex., in:title, in:personal, in:pinned)"
+        status: "filtres par statut de sujet"
         full_search: "lance la recherche en pleine page"
         full_search_key: "%{modifier} + Entrée"
       advanced:
@@ -2319,10 +2366,10 @@ fr:
             label: Messages
           min:
             placeholder: minimum
-            aria_label: filtrer par nombre minimum de messages
+            aria_label: filtrer par nombre minimal de messages
           max:
             placeholder: maximum
-            aria_label: filtrer par nombre maximum de messages
+            aria_label: filtrer par nombre maximal de messages
           time:
             label: Date
             aria_label: Filtrer par date de publication
@@ -2332,10 +2379,10 @@ fr:
           label: Vues
         min_views:
           placeholder: minimum
-          aria_label: filtrer par nombre de vues minimum
+          aria_label: filtrer par nombre de vues minimal
         max_views:
           placeholder: maximum
-          aria_label: filtrer par nombre de vues maximum
+          aria_label: filtrer par nombre de vues maximal
         additional_options:
           label: "Filtrer par nombre de messages et vues par sujet"
     hamburger_menu: "menu"
@@ -2347,19 +2394,43 @@ fr:
     user_menu:
       generic_no_items: "Cette liste ne contient aucun élément."
       sr_menu_tabs: "Onglets du menu utilisateur"
-      view_all_notifications: "Afficher toutes les notifications"
+      view_all_notifications: "afficher toutes les notifications"
       view_all_bookmarks: "voir tous les signets"
       view_all_messages: "voir tous les messages personnels"
       tabs:
         all_notifications: "Toutes les notifications"
         replies: "Réponses"
+        replies_with_unread:
+          one: "Réponses - %{count} réponse non lue"
+          other: "Réponses - %{count} réponses non lues"
         mentions: "Mentions"
+        mentions_with_unread:
+          one: "Mentions - %{count} mention non lue"
+          other: "Mentions - %{count} mentions non lues"
         likes: "« J'aime » attribués"
+        likes_with_unread:
+          one: "J'aime - %{count} j'aime non lu"
+          other: "J'aime - %{count} j'aime non lus"
         watching: "Sujets suivis"
+        watching_with_unread:
+          one: "Sujets suivis - %{count} sujet suivi non lu"
+          other: "Sujets suivis - %{count} sujets suivis non lus"
         messages: "Messages directs"
+        messages_with_unread:
+          one: "Messages directs - %{count} message non lu"
+          other: "Messages directs - %{count} messages non lus"
         bookmarks: "Signets"
+        bookmarks_with_unread:
+          one: "Signets - %{count} signet non lu"
+          other: "Signets - %{count} signets non lus"
         review_queue: "Examiner la file d'attente"
+        review_queue_with_unread:
+          one: "File des messages en attente d'examen - %{count} élément à examiner"
+          other: "File des messages en attente d'examen - %{count} éléments à examiner"
         other_notifications: "Autres notifications"
+        other_notifications_with_unread:
+          one: "Autres notifications - %{count} notification non lue"
+          other: "Autres notifications - %{count} notifications non lues"
         profile: "Profil"
       reviewable:
         view_all: "Afficher tous les éléments à examiner"
@@ -2397,11 +2468,11 @@ fr:
           other: "Marquer les nouveaux sujets comme lus (%{count})"
         toggle: "activer/désactiver la sélection multiple de sujets"
         actions: "Actions sur la sélection"
-        change_category: "Définir la catégorie..."
+        change_category: "Définir la catégorie…"
         close_topics: "Fermer les sujets"
         archive_topics: "Archiver les sujets"
         move_messages_to_inbox: "Déplacer dans la boîte de réception"
-        notification_level: "Notifications..."
+        notification_level: "Notifications…"
         change_notification_level: "Modifier le niveau de notification"
         choose_new_category: "Choisissez la nouvelle catégorie pour ces sujets :"
         selected:
@@ -2648,7 +2719,7 @@ fr:
         open: "Ouvrir le sujet"
         close: "Fermer le sujet"
         multi_select: "Sélectionner des messages…"
-        slow_mode: "Activer le mode ralenti..."
+        slow_mode: "Activer le mode ralenti…"
         timed_update: "Planifier une action…"
         pin: "Épingler le sujet…"
         unpin: "Désépingler le sujet…"
@@ -2657,7 +2728,7 @@ fr:
         invisible: "Rendre le sujet invisible"
         visible: "Lister le sujet"
         reset_read: "Réinitialiser les données de lecture"
-        make_public: "Rendre le sujet public..."
+        make_public: "Rendre le sujet public…"
         make_private: "Transformer en message direct"
         reset_bump_date: "Réinitialiser la date d'actualisation"
       feature:
@@ -2676,7 +2747,7 @@ fr:
         instructions: "Partager ce sujet avec un lien :"
         copied: "Le lien vers ce sujet a été copié."
         restricted_groups:
-          one: "Visible uniquement par les membres du groupe: %{groupNames}"
+          one: "Visible uniquement par les membres du groupe : %{groupNames}"
           other: "Visible uniquement par les membres des groupes : %{groupNames}"
         invite_users: "Inviter"
       print:
@@ -2879,6 +2950,7 @@ fr:
       gap:
         one: "voir %{count} réponse masquée"
         other: "voir %{count} réponses masquées"
+      sr_reply_to: "Répondre au message #%{post_number} de @%{username}"
       notice:
         new_user: "C'est la première fois que %{user} publie un message. Assurons-lui un accueil chaleureux dans notre communauté !"
         returning_user: "Cela faisait un moment que nous n'avions pas vu %{user}. Son dernier message remonte à %{time}."
@@ -2896,7 +2968,7 @@ fr:
         one: "vous et %{count} autre personne avez aimé ce message"
         other: "vous et %{count} autres personnes avez aimé ce message"
       sr_post_like_count_button:
-        one: "%{count} personne a aimé ce post. Cliquez pour voir"
+        one: "%{count} personne a aimé ce message. Cliquez pour voir"
         other: "%{count} personnes ont aimé ce message. Cliquez pour voir"
       sr_post_read_count_button:
         one: "%{count} personne a lu ce message. Cliquez pour voir"
@@ -2914,8 +2986,8 @@ fr:
         edit: "Nous sommes désolés, une erreur est survenue lors de la modification de votre message. Veuillez réessayer."
         upload: "Nous sommes désolés, une erreur est survenue lors de l'envoi du fichier. Veuillez réessayer."
         file_too_large: "Nous sommes désolés, ce fichier est trop volumineux (la taille maximale autorisée est de %{max_size_kb} Ko). Nous vous suggérons de stocker votre fichier sur un service d'hébergement extérieur au forum et de coller ensuite un lien dans votre message."
-        file_size_zero: "Navré, un problème est survenu : le fichier reçu semble être vide. Nous vous invitons à réessayer l'envoi."
-        file_too_large_humanized: "Navré, ce fichier est trop lourd (la taille maximale est de %{max_size}). Pourquoi ne pas le copier sur un service de partage de fichier, puis coller le lien ?"
+        file_size_zero: "Un problème semble être survenu, la taille du fichier que vous tentez d'importer est de 0 octet. Veuillez réessayer."
+        file_too_large_humanized: "Nous sommes désolés, ce fichier est trop volumineux (la taille maximale est de %{max_size}). Nous vous suggérons de stocker votre fichier sur un service d'hébergement extérieur au forum et de coller ensuite un lien dans votre message."
         too_many_uploads: "Nous sommes désolés, vous ne pouvez envoyer qu'un seul fichier à la fois."
         too_many_dragged_and_dropped_files:
           one: "Nous sommes désolés, vous ne pouvez envoyer que %{count} fichier à la fois."
@@ -2960,7 +3032,7 @@ fr:
           just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
         permanently_delete: "Supprimer définitivement"
-        permanently_delete_confirmation: "Êtes-vous certain de vouloir supprimer définitivement ce message ? Vous ne pourrez plus le récupérer."
+        permanently_delete_confirmation: "Voulez-vous vraiment supprimer définitivement ce message ? Vous ne pourrez plus le récupérer."
         wiki: "Basculer en mode wiki"
         unwiki: "Retirer le mode wiki"
         convert_to_moderator: "Ajouter la couleur modérateur"
@@ -2968,8 +3040,8 @@ fr:
         rebake: "Reconstruire le HTML"
         publish_page: "Publication de pages"
         unhide: "Afficher"
-        change_owner: "Changer de propriétaire..."
-        grant_badge: "Attribuer un badge..."
+        change_owner: "Changer de propriétaire…"
+        grant_badge: "Attribuer un badge…"
         lock_post: "Verrouiller le message"
         lock_post_description: "empêcher l'utilisateur de modifier ce message"
         unlock_post: "Déverrouiller le message"
@@ -2983,8 +3055,8 @@ fr:
         delete_topic_confirm_modal_no: "Non, conserver ce sujet"
         delete_topic_error: "Une erreur s'est produite lors de la suppression de ce sujet"
         delete_topic: "supprimer le sujet"
-        add_post_notice: "Afficher une note pour les responsables..."
-        change_post_notice: "Modifier la note pour les responsables..."
+        add_post_notice: "Afficher une note pour les responsables…"
+        change_post_notice: "Modifier la note pour les responsables…"
         delete_post_notice: "Supprimer la note pour les responsables"
         remove_timer: "supprimer la planification"
         edit_timer: "modifier le minuteur"
@@ -3014,6 +3086,10 @@ fr:
         confirm:
           one: "Voulez-vous vraiment supprimer ce message ?"
           other: "Voulez-vous vraiment supprimer ces %{count} messages ?"
+      merge:
+        confirm:
+          one: "Voulez-vous vraiment fusionner ces %{count} messages ?"
+          other: "Voulez-vous vraiment fusionner ces %{count} messages ?"
       revisions:
         controls:
           first: "Première révision"
@@ -3049,7 +3125,7 @@ fr:
             button: "HTML"
       bookmarks:
         create: "Ajouter un signet"
-        create_for_topic: "Créer un signet associé à ce sujet."
+        create_for_topic: "Créer un signet associé à ce sujet"
         edit: "Modifier le signet"
         edit_for_topic: "Modifier le signet associé à ce sujet"
         created: "Créé"
@@ -3088,6 +3164,7 @@ fr:
       all: "Toutes les catégories"
       choose: "catégorie&hellip;"
       edit: "Modifier"
+      edit_title: "Modifier cette catégorie"
       edit_dialog_title: "Modifier : %{categoryName}"
       view: "Voir les sujets dans la catégorie"
       back: "Retour à la catégorie"
@@ -3103,10 +3180,10 @@ fr:
       manage_tag_groups_link: "Gérer les groupes d'étiquettes"
       allow_global_tags_label: "Permettre aussi d'autres étiquettes"
       required_tag_group:
-        description: "Exiger que les nouveaux sujets aient des étiquettes d'un groupe d’étiquettes&nbsp;:"
+        description: "Exiger que les nouveaux sujets aient des étiquettes d'un groupe d'étiquettes :"
         delete: "Supprimer"
         add: "Ajouter le groupe d'étiquettes requis"
-        placeholder: "sélectionner un groupe d'étiquettes"
+        placeholder: "sélectionner un groupe d'étiquettes…"
       topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: "Supprimer la catégorie"
       create: "Nouvelle catégorie"
@@ -3119,6 +3196,7 @@ fr:
       name: "Nom de la catégorie"
       description: "Description"
       logo: "Logo de la catégorie"
+      logo_dark: "Image du logo de la catégorie en mode sombre"
       background_image: "Image de fond de la catégorie"
       badge_colors: "Couleurs du badge"
       background_color: "Couleur du fond"
@@ -3383,8 +3461,8 @@ fr:
           one: "%{count} non lu"
           other: "%{count} non lus"
       unseen:
-        title: "Invisible"
-        lower_title: "invisible"
+        title: "Non lu(s)"
+        lower_title: "non lu(s)"
         help: "nouveaux sujets et sujets que vous suivez ou surveillez avec des messages non lus"
       new:
         lower_title_with_count:
@@ -3571,13 +3649,13 @@ fr:
     download_calendar:
       title: "Télécharger le calendrier"
       save_ics: "Télécharger le fichier .ics"
-      save_google: "Inscrire dans le calendrier Google"
+      save_google: "Ajouter au calendrier Google"
       remember: "Ne plus me le proposer"
       remember_explanation: "(vous pouvez changer ce réglage dans vos préférences utilisateur)"
       download: "Télécharger"
       default_calendar: "Calendrier par défaut"
       default_calendar_instruction: "Définir le calendrier à utiliser lorsqu'une date est enregistrée"
-      add_to_calendar: "Inscrire au calendrier"
+      add_to_calendar: "Ajouter au calendrier"
       google: "Calendrier Google"
       ics: "ICS"
     tagging:
@@ -3589,11 +3667,11 @@ fr:
       tags: "Étiquettes"
       choose_for_topic: "étiquettes optionnelles"
       choose_for_topic_required:
-        one: "sélectionnez au moins %{count} étiquette..."
-        other: "sélectionnez au moins %{count} étiquettes..."
+        one: "sélectionnez au moins %{count} étiquette…"
+        other: "sélectionnez au moins %{count} étiquettes…"
       choose_for_topic_required_group:
-        one: "sélectionner %{count} tag parmi '%{name}'..."
-        other: "sélectionner %{count} tags parmi '%{name}'..."
+        one: "sélectionnez %{count} étiquette de « %{name} »…"
+        other: "sélectionnez %{count} étiquettes de « %{name} »…"
       info: "Détails"
       default_info: "Cette étiquette n'est pas limitée à une catégorie et n'a aucun synonyme."
       staff_info: "Pour y définir des restrictions d'utilisation, placez cette étiquette dans un <a href=%{basePath}/tag_groups>groupe d'étiquettes</a>."
@@ -3690,7 +3768,7 @@ fr:
         cannot_save: "Impossible d'enregistrer le groupe d'étiquettes. Assurez-vous qu'au moins une étiquette est présente, que le nom du groupe d'étiquettes n'est pas vide et qu'un groupe est sélectionné pour l'autorisation des étiquettes."
         tags_placeholder: "Créez ou recherchez des étiquettes"
         parent_tag_placeholder: "Facultatif"
-        select_groups_placeholder: "Sélectionnez des groupes..."
+        select_groups_placeholder: "Sélectionnez des groupes…"
         disabled: "L'étiquetage des sujets est désactivé "
       topics:
         none:
@@ -3738,27 +3816,31 @@ fr:
         leader: "meneur"
       detailed_name: "%{level} : %{name}"
     pick_files_button:
-      unsupported_file_picked: "Vous avez sélectionné un fichier non pris en charge. Types de fichiers pris en charge&nbsp;: %{types}."
+      unsupported_file_picked: "Vous avez sélectionné un fichier non pris en charge. Types de fichiers pris en charge : %{types}."
     user_activity:
-      no_activity_title: "Aucune activité pour le moment."
-      no_activity_body: "Bienvenue dans notre communauté ! Vous êtes tout nouveau ici et n'avez pas encore contribué aux discussions. Dans un premier temps, visitez <a href='%{topUrl}'>Top</a> ou <a href='%{categoriesUrl}'>Catégories</a> et commencez simplement à lire ! Sélectionnez %{heartIcon} sur les publications que vous aimez ou sur lesquelles vous souhaitez en savoir plus. Au fur et à mesure de votre participation, votre activité sera listée ici."
-      no_replies_title: "Vous n'avez publié de réponse à aucun sujet pour le moment"
+      no_activity_title: "Aucune activité pour le moment"
+      no_activity_body: "Bienvenue dans notre communauté ! Vous venez de nous rejoindre et vous n'avez pas encore contribué aux discussions. Dans un premier temps, visitez <a href='%{topUrl}'>Top</a> ou <a href='%{categoriesUrl}'>Catégories</a> et commencez simplement à lire ! Sélectionnez %{heartIcon} sur les messages que vous aimez ou sur lesquelles vous souhaitez en savoir plus. Votre activité sera consignée ici au fil de votre participation."
+      no_replies_title: "Vous n'avez répondu à aucun sujet pour le moment"
+      no_replies_title_others: "%{username} n'a encore répondu à aucun sujet"
+      no_replies_body: "Lorsque vous <a href='%{searchUrl}'>découvrez</a> une conversation intéressante à laquelle vous souhaitez contribuer, appuyez sur le bouton <kbd>Répondre</kbd> directement sous n'importe quel message pour répondre au message. Ou, si vous préférez répondre au sujet général plutôt qu'à un message individuel ou à une personne, recherchez le bouton <kbd>Répondre</kbd> tout en bas du sujet, ou sous la chronologie du sujet."
       no_drafts_title: "Vous n'avez enregistré aucun brouillon"
-      no_drafts_body: "Vous n'êtes pas tout à fait prêt à publier ? Nous enregistrerons automatiquement un nouveau brouillon et le répertorierons ici chaque fois que vous commencerez à rédiger un sujet, une réponse ou un message personnel. Sélectionnez le bouton Annuler pour supprimer, ou enregistrez votre brouillon pour continuer plus tard."
+      no_drafts_body: "Vous n'êtes pas tout à fait prêt(e) à publier ? Nous enregistrerons automatiquement un nouveau brouillon et le répertorierons ici chaque fois que vous commencerez à rédiger un sujet, une réponse ou un message personnel. Sélectionnez le bouton Annuler pour supprimer ou enregistrez votre brouillon pour continuer plus tard."
       no_likes_title: "Vous n'avez encore aimé aucun sujet"
-      no_likes_body: "Une excellente façon d'intervenir et de commencer à contribuer est de commencer à lire les conversations qui ont déjà eu lieu et de sélectionner le %{heartIcon} sur les publications que vous aimez !"
-      no_topics_title: "Vous n'avez pas encore créé de sujet"
-      no_topics_title_others: "%{username} n'a pas encore commencé de sujets."
+      no_likes_title_others: "%{username} n'a encore aimé aucun sujet"
+      no_likes_body: "Pour commencer à intervenir et à contribuer, il est judicieux de lire les conversations qui ont déjà eu lieu et de sélectionner le %{heartIcon} sur les messages que vous aimez !"
+      no_topics_title: "Vous n'avez encore créé aucun sujet"
+      no_topics_body: "Il est toujours préférable de <a href='%{searchUrl}'>rechercher</a> des sujets de conversation existants avant d'en commencer de nouveaux, mais si vous pensez que le sujet que vous voulez créer n'existe pas encore, n'hésitez pas à démarrer un nouveau sujet. Recherchez le bouton <kbd>+ Nouveau sujet</kbd> en haut à droite de la liste des sujets, catégorie, ou étiquette pour créer un nouveau sujet dans ce domaine."
+      no_topics_title_others: "%{username} n'a encore commencé aucun sujet."
       no_read_topics_title: "Vous n'avez lu aucun sujet pour le moment"
       no_read_topics_body: "Une fois que vous aurez commencé à lire les discussions, vous verrez une liste ici. Pour commencer à lire, recherchez les sujets qui vous intéressent dans <a href='%{topUrl}'>Top</a> ou <a href='%{categoriesUrl}'>Catégories</a> ou recherchez par mot-clé %{searchIcon}"
     no_group_messages_title: "Aucun message de groupe trouvé"
     topic_entrance:
-      sr_jump_top_button: "Aller au premier message"
-      sr_jump_bottom_button: "Aller au dernier message"
+      sr_jump_top_button: "Accéder au premier message"
+      sr_jump_bottom_button: "Accéder au dernier message"
     fullscreen_table:
       expand_btn: "Développer le tableau"
     second_factor_auth:
-      redirect_after_success: "L'authentification avec deuxième facteur est réussie. Redirection vers la page précédente…"
+      redirect_after_success: "L'authentification à deux facteurs est réussie. Redirection vers la page précédente…"
     sidebar:
       unread_count:
         one: "%{count} non lu"
@@ -3766,6 +3848,7 @@ fr:
       new_count:
         one: "%{count} nouveau"
         other: "%{count} nouveaux"
+      toggle_section: "basculer la section"
       more: "Plus"
       all_categories: "Toutes les catégories"
       all_tags: "Toutes les étiquettes"
@@ -3778,21 +3861,23 @@ fr:
           links:
             inbox: "Boîte de réception"
             sent: "Envoyés"
-            new: "Nouveau"
-            new_with_count: "Nouveau (%{count})"
+            new: "Nouveaux"
+            new_with_count: "Nouveaux (%{count})"
             unread: "Non lus"
-            unread_with_count: "Non lu (%{count})"
+            unread_with_count: "Non lus (%{count})"
             archive: "Archivés"
         tags:
           none: "Vous n'avez ajouté aucune étiquette."
           click_to_get_started: "Cliquez ici pour commencer."
           header_link_text: "Étiquettes"
-          header_action_title: "Modifier les étiquettes de votre barre latérale"
+          header_action_title: "modifier les étiquettes de votre barre latérale"
+          configure_defaults: "Configurer les valeurs par défaut"
         categories:
           none: "Vous n'avez ajouté aucune catégorie."
           click_to_get_started: "Cliquez ici pour commencer."
           header_link_text: "Catégories"
-          header_action_title: "Modifier les catégories de votre barre latérale"
+          header_action_title: "modifier les catégories de votre barre latérale"
+          configure_defaults: "Configurer les valeurs par défaut"
         community:
           header_link_text: "Communauté"
           header_action_title: "créer un nouveau sujet"
@@ -3826,6 +3911,11 @@ fr:
             review:
               content: "À examiner"
               title: "à examiner"
+              pending_count: "%{count} en attente"
+    welcome_topic_banner:
+      title: "Créez votre sujet de bienvenue"
+      description: 'Votre sujet de bienvenue est la première chose que les nouveaux membres liront. Considérez-le comme votre « argumentaire » ou votre « énoncé de mission ». Faites savoir à tout le monde à qui est destinée cette communauté, ce qu''ils peuvent s''attendre à y trouver et ce que vous aimeriez qu''ils fassent en premier.'
+      button_title: "Commencer l'édition"
     until: "Jusqu'à :"
   admin_js:
     type_to_filter: "commencez votre saisie pour filtrer…"
@@ -3971,7 +4061,7 @@ fr:
             automatic_membership_user_count:
               one: "%{count} utilisateur a les nouveaux domaines de courriel et sera ajouté au groupe."
               other: "%{count} utilisateurs ont les nouveaux domaines de courriel et seront ajoutés au groupe."
-            automatic_membership_associated_groups: "Les utilisateurs qui sont membres d'un groupe d'un fournisseur d'identité listé ici seront automatiquement ajoutés à ce groupe lorsqu'ils s'authentifieront avec ce fournisseur."
+            automatic_membership_associated_groups: "Les utilisateurs qui sont membres d'un groupe d'un fournisseur d'identité repris ici seront automatiquement ajoutés à ce groupe lorsqu'ils s'authentifieront avec ce fournisseur."
             primary_group: "Définir comme groupe principal automatiquement"
         name_placeholder: "Nom du groupe (sans espaces, mêmes règles que pour les noms d'utilisateurs)"
         primary: "Groupe principal"
@@ -4019,7 +4109,7 @@ fr:
         no_description: (aucune description)
         all_api_keys: Toutes les clés pour l’API
         user_mode: Niveau de l’utilisateur
-        scope_mode: Périmètre d'application
+        scope_mode: Permissions
         impersonate_all_users: Incarner un utilisateur
         single_user: "Utilisateur unique"
         user_placeholder: Saisissez un nom d'utilisateur
@@ -4038,7 +4128,7 @@ fr:
           granular: Détaillé
           read_only: Lecture seule
           global: Global
-          global_description: La clé API n'a aucune restriction et tous les points de terminaison (Endpoint) sont accessibles.
+          global_description: La clé API n'a aucune restriction et tous les points de terminaison (endpoints) sont accessibles.
           resource: Ressource
           action: Action
           allowed_parameters: Paramètres autorisés
@@ -4080,6 +4170,11 @@ fr:
               list_user_badges: Lister les badges de l'utilisateur.
               assign_badge_to_user: Attribuer un badge à un utilisateur.
               revoke_badge_from_user: Révoquer le badge d'un utilisateur.
+            wordpress:
+              publishing: Nécessaire pour les fonctionnalités de publication de l'extension WP Discourse (obligatoire).
+              commenting: Nécessaire pour les fonctionnalités de commentaire de l'extension WP Discourse.
+              discourse_connect: Nécessaire pour les fonctionnalités DiscourseConnect de l'extension WP Discourse.
+              utilities: Nécessaire si vous utilisez les utilitaires de l'extension WP Discourse
       web_hooks:
         title: "Webhooks"
         none: "Il n'y a aucun Webhook actuellement."
@@ -4139,6 +4234,7 @@ fr:
           name: "Événement de notification"
           details: "Lorsqu'un utilisateur reçoit une notification dans son flux."
         user_promoted_event:
+          name: "Événement sponsorisé par l'utilisateur"
           details: "Lorsqu'un utilisateur est promu d'un niveau de confiance à un autre."
         user_badge_event:
           name: "Événement d'attribution de badge"
@@ -4378,6 +4474,8 @@ fr:
           import_web_advanced: "Avancé…"
           import_file_tip: "Fichier .tar.gz, .zip ou .dcstyle.json contenant le thème"
           is_private: "Le thème est dans un dépôt Git privé"
+          finish_install: "Terminer l'installation du thème"
+          last_attempt: "Le processus d'installation ne s'est pas terminé, dernière tentative :"
           remote_branch: "Nom de branche (optionnel)"
           public_key: "Accorder un accès au dépôt à la clé publique suivante :"
           public_key_note: "Une clé SSH sera générée et affichée ici après qu'une URL valide pointant vers un dépôt logiciel privé ait été saisie ci-dessus."
@@ -4388,6 +4486,8 @@ fr:
           install_git_repo: "Depuis un dépôt Git"
           install_create: "Créer un nouveau"
           duplicate_remote_theme: "Le composant de thème « %{name} » est déjà installé, voulez-vous vraiment en installer une autre copie ?"
+          force_install: "Le thème ne peut pas être installé, car le dépôt Git est inaccessible. Voulez-vous vraiment continuer à l'installer ?"
+          create_placeholder: "Créer un espace réservé"
           about_theme: "À propos"
           license: "Licence"
           version: "Version :"
@@ -4410,6 +4510,7 @@ fr:
           has_overwritten_history: "La version actuelle du thème n'existe plus car l'historique Git a été écrasé par une mise à jour forcée."
           add: "Ajouter"
           theme_settings: "Paramètres du thème"
+          overriden_settings_explanation: "Les paramètres annulés sont signalés par un point et sont surlignés par une couleur. Pour rétablir la valeur par défaut de ces paramètres, appuyez sur le bouton de réinitialisation situé à côté."
           no_settings: "Ce thème n'a pas de paramètres."
           theme_translations: "Traductions de thème"
           empty: "Aucun élément"
@@ -4448,6 +4549,7 @@ fr:
 
               Il est fortement recommandé de préfixer les noms des propriétés CSS pour éviter tout conflit avec Discourse ou ses extensions.
           head_tag:
+            text: "Tête"
             title: "HTML qui sera inséré avant la balise <head>"
           body_tag:
             text: "Corps"
@@ -4567,6 +4669,7 @@ fr:
         last_seen_user: "Dernier utilisateur vu :"
         no_result: "Aucun résultat trouvé pour le résumé."
         reply_key: "Clé de réponse"
+        post_link_with_smtp: "Détails du message et du SMTP"
         skipped_reason: "Ignorer la raison"
         incoming_emails:
           from_address: "De"
@@ -4596,6 +4699,7 @@ fr:
             address_placeholder: "nom@exemple.com"
             type_placeholder: "résumé, inscription…"
             reply_key_placeholder: "clé de réponse"
+            smtp_transaction_response_placeholder: "Identifiant SMTP"
       moderation_history:
         performed_by: "Réalisé par"
         no_results: "Il n'y a pas d'historique de modération disponible."
@@ -4971,11 +5075,11 @@ fr:
           confirmation:
             title: "Supprimer tous les messages de @%{username}"
             description: |
-              <p>Êtes-vous sûr de vouloir supprimer <b>%{post_count}</b> messages de @%{username}?
+              <p>Voulez-vous vraiment supprimer <b>%{post_count}</b> messages de @%{username} ?
 
-              <p><b>Cela ne peut pas être annulé !</b></p>
+              <p><b>Cette opération ne peut pas être annulée !</b></p>
 
-              <p>Pour continuer tapez : <code>%{text}</code></p>
+              <p>Pour continuer, saisissez : <code>%{text}</code></p>
             text: "supprimer les messages de @%{username}"
             delete: "Supprimer les messages de @%{username}"
             cancel: "Annuler"
@@ -5016,6 +5120,8 @@ fr:
         cant_delete_all_too_many_posts:
           one: "Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)"
           other: "Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)"
+        delete_confirm_title: "Voulez-vous VRAIMENT supprimer cet utilisateur ? Cette action est définitive !"
+        delete_confirm: "Il est généralement préférable d'anonymiser les utilisateurs plutôt que de les supprimer, afin d'éviter de supprimer du contenu dans les discussions existantes."
         delete_and_block: "Supprimer et <b>bloquer</b> cette adresse courriel et adresse IP."
         delete_dont_block: "Supprimer uniquement"
         deleting_user: "Suppression de l'utilisateur…"
@@ -5201,6 +5307,7 @@ fr:
           search: "Recherche"
           groups: "Groupes"
           dashboard: "Tableau de bord"
+          sidebar: "Barre latérale"
         secret_list:
           invalid_input: "Les champs de saisie ne peuvent pas être vide ou contenir le caractère de la barre verticale"
         default_categories:
@@ -5296,13 +5403,14 @@ fr:
           perform: "Attribuer ce badge à ces utilisateurs"
           upload_csv: Envoyez un fichier CSV contenant les adresses courriel ou les noms d'utilisateur
           aborted: Envoyez d'abord un fichier CSV contenant des adresses de courriel ou des noms d'utilisateur
-          success: Votre fichier CSV a été envoyé et %{count} utilisateurs obtiendront leur badge d'ici peu de temps.
+          success: Votre fichier CSV a été envoyé et %{count} utilisateurs obtiendront bientôt leurs badges.
           csv_has_unmatched_users: "Les entrées suivantes se trouvent dans le fichier CSV, mais elles n'ont pas pu être associées à des utilisateurs existants et ne recevront donc pas le badge :"
-          csv_has_unmatched_users_truncated_list: "Il y avait %{count} entrées dans le fichier CSV qui n'ont pas pu être associées avec des utilisateurs existants et qui ne recevront donc pas le badge. En raison du grand nombre d'entrées sans correspondance, seules les 100 premières sont affichées :"
+          csv_has_unmatched_users_truncated_list: "Il y avait %{count} entrées dans le fichier CSV qui n'ont pas pu être associées à des utilisateurs existants et qui ne recevront donc pas le badge. En raison du grand nombre d'entrées sans correspondance, seules les 100 premières sont affichées :"
           replace_owners: Retirer le badge des propriétaires précédents
+          grant_existing_holders: Accordez des badges supplémentaires aux détenteurs de badges existants
       emoji:
         title: "Émoji"
-        help: "Ajoutez de nouveaux émojis que tout le monde pourra utiliser. Vous pouvez glisser-déposer plusieurs fichiers en une seule fois pour créer des émojis qui hériteront du nom de leurs fichiers d'origine respectifs. Vous pouvez aussi utiliser le bouton \"Ajouter un nouvel émoji\" pour ouvrir une boite de dialogue de sélection de fichiers."
+        help: "Ajoutez de nouveaux émojis que tout le monde pourra utiliser. Vous pouvez glisser-déposer plusieurs fichiers en une seule fois pour créer des émojis qui hériteront du nom de leurs fichiers d'origine respectifs. Vous pouvez aussi utiliser le bouton « Ajouter un nouvel émoji » pour ouvrir une boîte de dialogue de sélection de fichiers."
         add: "Ajouter un nouvel émoji"
         choose_files: "Choisissez des fichiers"
         uploading: "Envoi en cours…"
@@ -5314,7 +5422,7 @@ fr:
       embedding:
         get_started: "Si vous souhaitez intégrer Discourse dans un autre site, commencez par ajouter son hôte."
         confirm_delete: "Voulez-vous vraiment supprimer cet hôte ?"
-        sample: "Collez le code HTML qui suit dans votre site pour y créer et y intégrer des sujets Discourse. Remplacez <b>REPLACE_ME</b> par l'URL canonique de la page dans laquelle vous souhaitez l'intégrer."
+        sample: "Collez le code HTML suivant sur votre site pour créer et intégrer des sujets Discourse. Remplacez <b>REPLACE_ME</b> par l'URL canonique de la page sur laquelle vous souhaitez l'intégrer."
         title: "Intégration externe"
         host: "Hôtes autorisés"
         class_name: "Nom de classe"
@@ -5365,10 +5473,12 @@ fr:
           replace: "Remplacer"
   wizard_js:
     wizard:
+      jump_in: "Commençons maintenant !"
+      finish: "Quitter la configuration"
       back: "Retour"
       next: "Suivant"
-      configure_more: "Configurer Plus..."
-      step-text: "Pas"
+      configure_more: "Configurer plus…"
+      step-text: "Étape"
       step: "%{current} sur %{total}"
       upload: "Envoi"
       uploading: "Envoi en cours…"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 08a5381f8d..c151011828 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -926,6 +926,7 @@ he:
         group_type: "סוג קבוצה"
         is_group_user: "חבר"
         is_group_owner: "בעלים"
+        search_results: "תוצאות החיפוש תופענה להלן."
       title:
         one: "קבוצה"
         two: "קבוצות"
@@ -962,6 +963,7 @@ he:
         no_filter_matches: "אין חברים שעונים לחיפוש הזה."
       topics: "נושאים"
       posts: "פוסטים"
+      aria_post_number: "%{title} - פוסט מס׳ %{postNumber}"
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
@@ -1196,6 +1198,7 @@ he:
         not_first_time: "לא הפעם הראשונה שלך?"
         skip_link: "דילוג על העצות האלו"
         read_later: "אקרא את זה אחר כך."
+      reset_seen_popups: "להציג את עצות קבלת הפנים שוב"
       theme_default_on_all_devices: "הגדרת ערכת עיצוב זו כבררת המחדל לכל המכשירים שלי"
       color_scheme_default_on_all_devices: "הגדרת ערכות צבעים כבררת מחדל לכל המכשירים שלי"
       color_scheme: "ערכת צבעים"
@@ -3177,6 +3180,7 @@ he:
         two: "הצגת %{count} תגובות שהוסתרו"
         many: "הצגת %{count} תגובות שהוסתרו"
         other: "הצגת %{count} תגובות שהוסתרו"
+      sr_reply_to: "תגובה לפוסט מס׳ %{post_number} על ידי ‎@%{username}"
       notice:
         new_user: "זהו הפרסום הראשון מאת %{user} - הבה נקבל את פניו/ה לקהילה שלנו!"
         returning_user: "עבר זמן מה מאז שראינו במחוזותינו את %{user} - הפרסום האחרון שלו/ה היה %{time}."
@@ -3424,6 +3428,7 @@ he:
       all: "כל הקטגוריות"
       choose: "קטגוריה&hellip;"
       edit: "עריכה"
+      edit_title: "עריכת הקטגוריה הזאת"
       edit_dialog_title: "עריכה: %{categoryName}"
       view: "הצגת נושאים בקטגוריה"
       back: "חזרה לקטגוריה"
@@ -4233,6 +4238,7 @@ he:
               pending_count: "%{count} ממתינים"
     welcome_topic_banner:
       title: "כאן ניתן ליצור את נושא קבלת הפנים שלך"
+      description: 'נושא קבלת הפנים שלך הוא הדבר הראשון שחברים חדשים יקראו. אפשר לחשוב על זה כמו על „נאום מעלית” או „הצהרת כוונות”. כדאי לתאר למי מיועדת הקהילה הזאת, מה אפשר לצפות למצוא כאן ומה מומלץ לעשות בהתחלה.'
       button_title: "להתחיל לערוך"
     until: "עד:"
   admin_js:
@@ -5764,7 +5770,7 @@ he:
       embedding:
         get_started: "כדי להטמיע את Discourse באתר אחר, יש להתחיל בהוספת השרת שלו."
         confirm_delete: "האם ברצונכם להסיר את הhost הזה? "
-        sample: "יש להדביק את קוד ה־HTML הבא באתר שלך כדי ליצור ולהטמיע נושאים של Discourse. עליך להחליף את <b>REPLACE_ME</b> בכתובת היחסית של העמוד בו תתבצע ההטמעה."
+        sample: "יש להדביק את קוד ה־HTML הבא באתר שלך כדי ליצור ולהטמיע נושאים של Discourse. יש להחליף את <b>REPLACE_ME</b> בכתובת היחסית של העמוד בו תתבצע ההטמעה."
         title: "שילוב (embedding)"
         host: "שרתים מורשים"
         class_name: "שם מחלקה"
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index c250306e6e..6153c0a313 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -5444,7 +5444,6 @@ hr:
       embedding:
         get_started: "Ako želite ugraditi Discourse na drugu web-stranicu, počnite dodavanjem njegovog hosta."
         confirm_delete: "Jeste li sigurni da želite izbrisati tog hosta?"
-        sample: "Zalijepite sljedeći HTML kod na svoju web-lokaciju kako biste stvorili i ugradili teme diskursa. Zamijenite <b>ZAMJENI_ME</b> kanonskim URL-om stranice na koju ga ugrađujete."
         title: "Ugrađivanje"
         host: "Dopušteni hostovi"
         class_name: "Naziv klase"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index ae9759c1c7..706bc921ac 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -5384,7 +5384,6 @@ it:
       embedding:
         get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungendo il nome dell'host."
         confirm_delete: "Sicuro di voler cancellare questo host?"
-        sample: "Incolla il seguente codice HTML nel tuo sito per creare e incorporare argomenti Discourse. Sostituire <b>REPLACE_ME</b> con l'URL canonico della pagina su cui stai eseguendo l'operazione."
         title: "Integrato"
         host: "Host Abilitati"
         class_name: "Nome Classe"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 267849169c..9af4023440 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -73,13 +73,13 @@ ja:
         x_hours:
           other: "%{count} 時間"
         about_x_hours:
-          other: "約%{count} 時間"
+          other: "約 %{count} 時間"
         x_days:
           other: "%{count} 日"
         x_months:
-          other: "%{count} ヶ月"
+          other: "%{count} か月"
         about_x_years:
-          other: "約%{count} 年"
+          other: "約 %{count} 年"
         over_x_years:
           other: "%{count} 年以上"
         almost_x_years:
@@ -107,7 +107,7 @@ ja:
       next_month: "翌月"
       placeholder: 日付
       from_placeholder: "開始日"
-      to_placeholder: "日付"
+      to_placeholder: "終了日"
     share:
       topic_html: 'トピック: <span class="topic-title">%{topicTitle}</span>'
       post: "%{username} の投稿 #%{postNumber}"
@@ -118,7 +118,7 @@ ja:
       url: "URL をコピーして共有"
     action_codes:
       public_topic: "トピックを公開しました: %{when}"
-      open_topic: "これをトピックに変換しました: %{when}"
+      open_topic: "はこれをトピックに変換しました: %{when}"
       private_topic: "このトピックを個人メッセージにしました: %{when}"
       split_topic: "このトピックを分割しました: %{when}"
       invited_user: "%{who} を招待しました: %{when}"
@@ -160,12 +160,12 @@ ja:
       other: "新しいサイトを簡単に立ち上げられるように、ブートストラップモードになっています。すべての新規ユーザーの信頼レベルは 1 となり、要約メールを毎日受け取るように設定されています。この設定は %{count} 名のユーザーが参加すると自動的に無効になります。"
     bootstrap_mode_disabled: "ブートストラップモードは 24 時間以内に無効になります。"
     bootstrap_invite_button_title: "招待を送信"
-    bootstrap_wizard_link_title: "セットアップウィザードを終了"
+    bootstrap_wizard_link_title: "セットアップウィザードの終了"
     themes:
       default_description: "デフォルト"
       broken_theme_alert: "テーマ/コンポーネントにエラーがあるため、サイトが動作しない可能性があります。"
       error_caused_by: "原因は '%{name}' です。<a target='blank' href='%{path}'>ここをクリック</a>して、更新、再構成、または無効にしてください。"
-      only_admins: "（このメッセージはサイト管理者にのみ表示されます）"
+      only_admins: "(このメッセージはサイト管理者にのみ表示されます)"
     broken_decorator_alert: "サイトのいずれかの投稿コンテンツデコレータでエラーが発生したため、投稿が正しく表示されない可能性があります。"
     s3:
       regions:
@@ -180,7 +180,7 @@ ja:
         cn_northwest_1: "中国 (寧夏)"
         eu_central_1: "EU (フランクフルト)"
         eu_north_1: "EU (ストックホルム)"
-        eu_south_1: "EU（ミラノ）"
+        eu_south_1: "EU (ミラノ)"
         eu_west_1: "EU (アイルランド)"
         eu_west_2: "EU (ロンドン)"
         eu_west_3: "EU (パリ)"
@@ -312,7 +312,7 @@ ja:
       fullscreen: "コードを全画面で表示"
     drafts:
       label: "下書き"
-      label_with_count: "下書き（%{count}）"
+      label_with_count: "下書き (%{count})"
       resume: "再開"
       remove: "削除"
       remove_confirmation: "この下書きを削除してもよろしいですか？"
@@ -562,7 +562,7 @@ ja:
       forever: "永遠"
       relative: "相対時間"
       none: "不要"
-      never: "削除しない"
+      never: "なし"
       last_custom: "最後のカスタム日時"
       custom: "カスタムの日付と時刻"
       select_timeframe: "時間枠を選択してください"
@@ -686,7 +686,8 @@ ja:
             title: "設定"
             allow_unknown_sender_topic_replies: "不明な送信者によるトピックの返信を許可します。"
             allow_unknown_sender_topic_replies_hint: "不明な送信者がグループトピックに返信できるようにします。これが有効になっていない場合、トピックに招待されていないメールアドレスからの返信があった場合は、新しいトピックを作成します。"
-            from_alias: "送信者のエイリアス"
+            from_alias: "送信元のエイリアス"
+            from_alias_hint: "グループ SMTP メールを送信する際に送信元アドレスとして使用するエイリアス。すべてのメールプロバイダーでサポートされているわけではなことにご注意ください。メールプロバイダーのドキュメントを参照してください。"
           mailboxes:
             synchronized: "同期メールボックス"
             none_found: "このメールアカウントにはメールボックスが見つかりませんでした。"
@@ -772,6 +773,7 @@ ja:
         group_type: "グループのタイプ"
         is_group_user: "メンバー"
         is_group_owner: "オーナー"
+        search_results: "検索結果は下に表示されます。"
       title:
         other: "グループ"
       activity: "アクティビティ"
@@ -805,6 +807,7 @@ ja:
         no_filter_matches: "その検索に一致するメンバーはいません。"
       topics: "トピック"
       posts: "投稿"
+      aria_post_number: "%{title} - 投稿 #%{postNumber}"
       mentions: "メンション"
       messages: "メッセージ"
       notification_level: "グループメッセージのデフォルト通知レベル"
@@ -914,6 +917,7 @@ ja:
     user_fields:
       none: "(オプションを選択)"
       required: '"%{name}" の値を入力してください'
+      same_as_password: '他のフィールドでパスワードを繰り返し入力してはいけません。'
     user:
       said: "%{username}:"
       profile: "プロフィール"
@@ -1000,6 +1004,8 @@ ja:
       dismiss: "閉じる"
       dismiss_notifications: "すべて閉じる"
       dismiss_notifications_tooltip: "すべての未読の通知を既読にします"
+      dismiss_bookmarks_tooltip: "未読のブックマークリマインダーをすべて既読にします"
+      dismiss_messages_tooltip: "個人メッセージの未読の通知をすべて既読にします"
       no_messages_title: "メッセージはありません"
       no_messages_body: >
         通常の会話の外で、誰かと直接個人的に話す必要がありますか？相手のアバターを選択して、%{icon} メッセージボタンを使うと、その人にメッセージを送信できます。<br><br> ヘルプが必要な場合は、<a href='%{aboutUrl}'>スタッフメンバーにメッセージを送信</a>してください。
@@ -1010,6 +1016,9 @@ ja:
       no_notifications_title: "まだ通知はありません"
       no_notifications_body: >
         あなたのトピックや投稿に対する返信があったとき、誰かがあなたを <b>@メンション</b>または引用したとき、あなたがウォッチ中のトピックに返信があったときなど、あなたに直接関連するアクティビティはこのパネルで通知されます。あなたがしばらくログインしていない場合は、メールにも通知が送信されます。<br><br>%{icon} を探して、どの特定のトピック、カテゴリ、およびタグについて通知するかを決めましょう。詳細については、<a href='%{preferencesUrl}'>通知の設定</a>をご覧ください。
+      no_other_notifications_title: "他の通知はまだありません"
+      no_other_notifications_body: >
+        誰かがあなたの投稿にリンクしたり、あなたの投稿を編集したりすると、このパネルにあなたに関連する可能性のある他の種類のアクティビティについて通知されます。
       no_notifications_page_title: "まだ通知はありません"
       no_notifications_page_body: >
         あなたのトピックや投稿に対する返信があったとき、誰かがあなたを <b>@メンション</b>または引用したとき、あなたがウォッチ中のトピックに返信があったときなど、あなたに直接関連するアクティビティが通知されます。あなたがしばらくログインしていない場合は、メールにも通知が送信されます。<br><br>%{icon} を探して、どの特定のトピック、カテゴリ、およびタグについて通知するかを決めましょう。詳細については、<a href='%{preferencesUrl}'>通知の設定</a>をご覧ください。
@@ -1020,6 +1029,7 @@ ja:
         not_first_time: "初めてのご利用ではありませんか？"
         skip_link: "これらのヒントをスキップ"
         read_later: "後で読む。"
+      reset_seen_popups: "オンボーディングのヒントを再表示"
       theme_default_on_all_devices: "これをすべてのデバイスのデフォルトのテーマにする"
       color_scheme_default_on_all_devices: "デフォルトの色スキームをすべてのデバイスに設定する"
       color_scheme: "色スキーム"
@@ -1039,7 +1049,16 @@ ja:
       enable_quoting: "選択したテキストを引用して返信する"
       enable_defer: "トピックを未読にマークして延期を有効にする"
       experimental_sidebar:
+        enable: "サイドバーを有効にする"
         options: "オプション"
+        categories_section: "カテゴリセクション"
+        categories_section_instruction: "選択されたカテゴリは、サイドバーのカテゴリセクションに表示されます。"
+        tags_section: "タグセクション"
+        tags_section_instruction: "選択されたタグは、サイドバーのタグセクションに表示されます。"
+        navigation_section: "ナビゲーション"
+        list_destination_instruction: "新規トピックまたは未読のトピックが含まれるサイドバーのトピックリストリンクをクリックすると、次に移動します:"
+        list_destination_default: "デフォルト"
+        list_destination_unread_new: "新規/未読"
       change: "変更"
       featured_topic: "注目のトピック"
       moderator: "%{user} はモデレーターです"
@@ -1136,8 +1155,10 @@ ja:
         tags: "タグ"
         all_tags: "すべてのタグ"
         warnings: "運営スタッフからの警告"
-        read_more_in_group: "もっと読みますか？%{groupLink} での他のメッセージを閲覧できます。"
+        read_more_in_group: "もっと読みますか？%{groupLink} で他のメッセージを閲覧できます。"
         read_more: "もっと読みますか？<a href='%{basePath}/u/%{username}/messages'>個人メッセージ</a>で他のメッセージを閲覧できます。"
+        read_more_group_pm_MF: "{ UNREAD, plural, =0 {} one {<a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># 未読</a> } other { <a href='{basePath}/u/{username}/messages/group/{groupName}/unread'># 未読</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{および } false { } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># 新規</a>のメッセージ} other { {BOTH, select, true{および } false { } other{}} <a href='{basePath}/u/{username}/messages/group/{groupName}/new'># 新規</a>のメッセージ} }があります。または{groupLink}で他のメッセージを閲覧できます。"
+        read_more_personal_pm_MF: "{ UNREAD, plural, =0 {} one {<a href='{basePath}/u/{username}/messages/unread'># 未読</a> } other { are <a href='{basePath}/u/{username}/messages/unread'># 未読</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{および} false {} other{}} <a href='{basePath}/u/{username}/messages/new'># 新規</a>のメッセージ} other { {BOTH, select, true{および} false {} other{}} <a href='{basePath}/u/{username}/messages/new'># 新規</a>のメッセージ} }が残っています。または、他の<a href='{basePath}/u/{username}/messages'>個人メッセージ</a>を閲覧できます。"
       preferences_nav:
         account: "アカウント"
         security: "セキュリティ"
@@ -1149,6 +1170,7 @@ ja:
         tags: "タグ"
         interface: "表示設定"
         apps: "アプリ連携"
+        sidebar: "サイドバー"
       change_password:
         success: "(メール送信済み)"
         in_progress: "(メール送信中)"
@@ -1203,6 +1225,8 @@ ja:
         edit: "編集"
         edit_title: "認証アプリの編集"
         edit_description: "認証アプリ名"
+        enable_security_key_description: |
+          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">ハードウェアセキュリティキー</a>、または互換性のあるモバイルデバイスを準備したら、下の登録ボタンを押します。
         totp:
           title: "トークンベースの認証アプリ"
           add: "認証アプリを追加"
@@ -1210,10 +1234,16 @@ ja:
           name_and_code_required_error: "認証アプリから名前とコードを入力する必要があります。"
         security_key:
           register: "登録"
+          title: "物理的なセキュリティキー"
+          add: "物理的なセキュリティキーを追加"
           default_name: "メインセキュリティキー"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "セキュリティキーの登録プロセスがタイムアウトしたかキャンセルされました。"
           already_added_error: "このセキュリティキーはすでに登録されています。再度登録する必要はありません。"
+          edit: "物理的なセキュリティキーを編集"
           save: "保存"
+          edit_description: "物理的なセキュリティキーの名前"
           name_required_error: "セキュリティキーの名前を入力する必要があります。"
       change_about:
         title: "自己紹介を変更"
@@ -1245,6 +1275,7 @@ ja:
         upload_title: "写真をアップロードする"
         image_is_not_a_square: "警告: 幅と高さが等しくないため、画像をトリミングしました。"
         logo_small: "サイトの小さなロゴ。デフォルトで使用されます。"
+        use_custom: "またはカスタムアバターをアップロード:"
       change_profile_background:
         title: "プロフィールヘッダー"
         instructions: "プロフィールヘッダーは中央揃えで、デフォルトの幅は 1110 px です。"
@@ -1288,7 +1319,7 @@ ja:
         not_connected: "(未接続)"
         confirm_modal_title: "%{provider} アカウントを接続"
         confirm_description:
-          disconnect: "既存の %{provider} アカウント「%{account_description}」は切断されます。"
+          disconnect: "既存の %{provider} アカウント '%{account_description}' は切断されます。"
           account_specific: "あなたの %{provider} アカウント '%{account_description}' が認証に使用されます。"
           generic: "あなたの %{provider} アカウントが認証に使用されます。"
       name:
@@ -1376,9 +1407,11 @@ ja:
         every_month: "毎月"
         every_six_months: "6 か月毎"
       email_level:
+        title: "引用されたとき、返信されたとき、自分の@ユーザー名がメンションされたとき、またはウォッチ中のカテゴリ、タグ、またはトピックに新しいアクティビティがあったときに、メールで通知する"
         always: "常時"
         only_when_away: "離れている時のみ"
         never: "通知しない"
+      email_messages_level: "個人メッセージが届いたときにメールで通知する"
       include_tl0_in_digests: "要約メールに新規ユーザーのコンテンツを含める"
       email_in_reply_to: "メールに投稿への返信の抜粋を含める"
       other_settings: "その他"
@@ -1456,12 +1489,13 @@ ja:
         invite:
           new_title: "招待の作成"
           edit_title: "招待の編集"
-          instructions: "このサイトへのアクセスと即時に許可するにはこのリンクを共有します:"
+          instructions: "このサイトへのアクセスを即時に許可するにはこのリンクを共有します:"
           copy_link: "リンクをコピー"
           expires_in_time: "%{time} で期限切れ"
           expired_at_time: "%{time} に期限切れ"
           show_advanced: "高度なオプションを表示"
           hide_advanced: "高度なオプションを非表示"
+          restrict: "制限する:"
           restrict_email: "メールに制限"
           restrict_domain: "ドメインに制限"
           email_or_domain_placeholder: "name@example.com または example.com"
@@ -1497,8 +1531,9 @@ ja:
         title: "要約"
         stats: "統計"
         time_read: "閲覧時間"
+        time_read_title: "%{duration} (全期間)"
         recent_time_read: "最近の閲覧時間"
-        recent_time_read_title: "%{duration} （過去60日間）"
+        recent_time_read_title: "%{duration} (過去 60 日間)"
         topic_count:
           other: "作成したトピック数"
         post_count:
@@ -1550,6 +1585,9 @@ ja:
         title: "フレア"
         none: "(なし)"
         instructions: "プロフィール写真の横に表示されるアイコン"
+      status:
+        title: "カスタムステータス"
+        not_set: "未設定"
       primary_group:
         title: "プライマリーグループ"
         none: "(なし)"
@@ -1562,6 +1600,18 @@ ja:
         the_topic: "トピック"
     user_status:
       save: "保存"
+      set_custom_status: "カスタムステータスを設定する"
+      what_are_you_doing: "何をしていますか？"
+      remove_status: "ステータスを削除する"
+    popup:
+      primary: "了解！"
+      secondary: "これらのヒントを表示しない"
+      first_notification:
+        title: "はじめての通知です！"
+        content: "通知は、コミュニティで起きていることの最新情報を提供するために使用されます。"
+      topic_timeline:
+        title: "トピックのタイムライン"
+        content: "トピックタイムラインを使って投稿を素早くスクロールします。"
     loading: "読み込み中..."
     errors:
       prev_page: "次の項目を読み込み中に発生しました:"
@@ -1594,6 +1644,8 @@ ja:
       enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したり「いいね！」を付けるなどの操作は現在できません。"
       login_disabled: "閲覧専用モードのため、ログインできません。"
       logout_disabled: "閲覧専用モードのため、ログアウトできません。"
+    staff_writes_only_mode:
+      enabled: "このサイトはスタッフ専用モードになっています。このまま閲覧できますが、返信や「いいね」、その他の操作はスタッフメンバーのみに制限されています。"
     too_few_topics_and_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">ディスカッションを開始しましょう！</a> 現在、{currentTopics, plural, one {<strong>#</strong> 件のトピック} other {<strong>#</strong> 件のトピック}}と{currentPosts, plural, one {<strong>#</strong> 件の投稿} other {<strong>#</strong> 件の投稿}}があります。訪問者が読んで返信できる項目がもっと必要です。少なくとも {requiredTopics, plural, one {<strong>#</strong> 件のトピック} other {<strong>#</strong> 件のトピック}}と{requiredPosts, plural, one {<strong>#</strong> 件の投稿} other {<strong>#</strong> 件の投稿}}を作成することをお勧めします。このメッセージはスタッフのみに表示されます。
     too_few_topics_notice_MF: >-
@@ -1620,9 +1672,11 @@ ja:
       other: 返信
     signup_cta:
       sign_up: "アカウントを登録"
+      hide_session: "後で確認"
       hide_forever: "いいえ、結構です"
       hidden_for_session: "了解です。明日お尋ねします。'ログイン' からでもアカウントを作成できます。"
       intro: "こんにちは！ ディスカッションを楽しんでいるようですね。ですが、アカウント登録はまだのようです。"
+      value_prop: "同じ投稿をスクロールするのにうんざりしていませんか？アカウントを作成すると、中断した場所にいつでも戻ることができます。アカウントを使うと、新しい返信の通知を受け取ったり、「いいね！」を使って感謝の気持ちを伝えたりすることも可能です。このコミュニティを一緒に盛り上げていきましょう。:heart:"
     summary:
       enabled_description: "このトピックの要約を閲覧しています。コミュニティが最も面白いとした投稿のまとめです。"
       description:
@@ -1647,7 +1701,8 @@ ja:
       remove_allowed_user: "このメッセージから %{name} を削除してもよろしいですか？"
       remove_allowed_group: "このメッセージから %{name} を削除してもよろしいですか？"
       leave: "退出"
-      remove_user: "ユーザーを削除"
+      remove_group: "グループを削除する"
+      remove_user: "ユーザーを削除する"
     email: "メール"
     username: "ユーザー名"
     last_seen: "アクセス"
@@ -1703,6 +1758,7 @@ ja:
       second_factor_backup_title: "二要素バックアップ"
       second_factor_backup_description: "バックアップコードの 1 つを入力してください。"
       second_factor: "認証アプリを使用してログインする"
+      security_key_description: "物理的なセキュリティキーまたは互換性のあるモバイルデバイスの準備ができたら、「セキュリティキーで認証」ボタンを押します。"
       security_key_alternative: "別の方法を試してください"
       security_key_authenticate: "セキュリティキーで認証"
       security_key_not_allowed_error: "セキュリティキーの認証プロセスがタイムアウトしたかキャンセルされました。"
@@ -1738,8 +1794,12 @@ ja:
       not_approved: "あなたのアカウントはまだ承認されていません。ログインできるようになったら、メールで通知します。"
       google_oauth2:
         name: "Google"
+        title: "Google でサインイン"
+        sr_title: "Google でサインイン"
       twitter:
         name: "Twitter"
+        title: "Twitter でサインイン"
+        sr_title: "Twitter でサインイン"
       instagram:
         name: "Instagram"
         title: "Instagram でログイン"
@@ -1747,6 +1807,7 @@ ja:
       facebook:
         name: "Facebook"
         title: "Facebook でログイン"
+        sr_title: "Facebook でログイン"
       github:
         name: "GitHub"
         title: "GitHub でログイン"
@@ -1783,9 +1844,11 @@ ja:
       categories_only: "カテゴリのみ"
       categories_with_featured_topics: "注目のトピックのカテゴリ"
       categories_and_latest_topics: "カテゴリと最新トピック"
+      categories_and_latest_topics_created_date: "カテゴリと最新のトピック (トピック作成日順)"
       categories_and_top_topics: "カテゴリと人気トピック"
       categories_boxes: "サブカテゴリのあるボックス"
       categories_boxes_with_topics: "注目のトピックのあるボックス"
+      subcategories_with_featured_topics: "注目のトピックを含むサブカテゴリ"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1801,7 +1864,7 @@ ja:
       plus_subcategories:
         other: "+ %{count} 個のサブカテゴリ"
     select_kit:
-      delete_item: "%{name} 件削除"
+      delete_item: "%{name} を削除"
       filter_by: "フィルタ: %{name}"
       select_to_filter: "フィルタする値を選択する"
       default_header_text: 選択...
@@ -1863,6 +1926,9 @@ ja:
       similar_topics: "これに似たトピックは..."
       drafts_offline: "オフラインの下書き"
       edit_conflict: "競合を編集する"
+      esc: "esc"
+      esc_label: "クリックまたは Esc を押して閉じる"
+      ok_proceed: "OK、続行する"
       group_mentioned_limit:
         other: "<b>警告！</b> <a href='%{group_link}'>%{group}</a> をメンションしましたが、このグループのメンバー数は、管理者がメンション数制限として設定した %{count} 人を超えています。そのため誰にも通知されません。"
       group_mentioned:
@@ -1870,7 +1936,8 @@ ja:
       cannot_see_mention:
         category: "@%{username} をメンションしましたが、このカテゴリへのアクセス権がないため通知されません。このカテゴリにアクセスできるグループに追加してください。"
         private: "@%{username} をメンションしましたが、この個人メッセージを見ることができないため通知されません。この個人メッセージに招待してください。"
-        muted_topic: "@%{username} をメンションしましたが、本ユーザがこのトピックをミュートしたため、通知されません。"
+        muted_topic: "@%{username} をメンションしましたが、このユーザーがこのトピックをミュートしているため、通知されません。"
+        not_allowed: "@%{username} をメンションしましたが、このユーザーはトピックに招待されていないため、通知されません。"
       here_mention:
         other: "<b>@%{here}</b> をメンションして %{count} 人のユーザーに通知しようとしています。よろしいですか？"
       duplicate_link: "<b>%{domain}</b> へのリンクは、すでに <b>@%{username}</b> が <a href='%{post_url}'>%{ago}</a> 前に投稿しています。もう一度投稿してもよろしいですか？"
@@ -1901,6 +1968,7 @@ ja:
       create_shared_draft: "共有の下書きを作成"
       edit_shared_draft: "共有の下書きを編集"
       title: "または %{modifier}Enter キーを押します"
+      users_placeholder: "ユーザーまたはグループを追加"
       title_placeholder: "トピックのタイトルを入力してください"
       title_or_link_placeholder: "タイトルを入力するか、リンクを貼り付けてください"
       edit_reason_placeholder: "編集する理由は？"
@@ -1945,6 +2013,7 @@ ja:
       abandon: "コンポーザーを閉じて下書きを破棄"
       enter_fullscreen: "コンポーザーの全画面表示を開始"
       exit_fullscreen: "コンポーザーの全画面表示を終了"
+      exit_fullscreen_prompt: "<kbd>ESC</kbd> を押して全画面表示を終了"
       show_toolbar: "コンポーザーツールバーを表示"
       hide_toolbar: "コンポーザーツールバーを非表示"
       modal_ok: "OK"
@@ -1955,6 +2024,9 @@ ja:
         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: 返信
@@ -1988,6 +2060,7 @@ ja:
       ignore: "無視する"
       image_alt_text:
         aria_label: 画像の代替テキスト
+      delete_image_button: 画像を削除
     notifications:
       tooltip:
         regular:
@@ -2002,6 +2075,7 @@ ja:
       post_approved: "あなたの投稿が承認されました"
       reviewable_items: "レビューが必要な項目"
       watching_first_post_label: "新規トピック"
+      user_moved_post: "%{username} が移動しました"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2013,9 +2087,9 @@ ja:
       liked_2: "<span class='double-user'>%{username}、%{username2}</span> %{description}"
       liked_many:
         other: "<span class='multi-user'>%{username}、%{username2}、他 %{count} 人</span> %{description}"
-      liked_by_2_users: "%{username}, %{username2}"
+      liked_by_2_users: "%{username}、%{username2}"
       liked_by_multiple_users:
-        other: "%{username}, %{username2} 、他 %{count} 人"
+        other: "%{username}、%{username2}、他 %{count} 人"
       liked_consolidated_description:
         other: "はあなたの %{count} 件の投稿に「いいね！」しました"
       liked_consolidated: "<span>%{username}</span> %{description}"
@@ -2023,6 +2097,7 @@ ja:
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
       invited_to_topic: "<span>%{username}</span> %{description}"
       invitee_accepted: "<span>%{username}</span> があなたの招待を承諾しました"
+      invitee_accepted_your_invitation: "があなたの招待を承諾しました"
       moved_post: "<span>%{username}</span> が %{description} を移動しました"
       linked: "<span>%{username}</span> %{description}"
       granted_badge: "「%{description}」をゲット！"
@@ -2038,6 +2113,10 @@ ja:
         body:
           default:
             other: "本当によろしいですか？重要な通知が %{count} 件あります。"
+          bookmarks:
+            other: "本当によろしいですか？未読のブックマークリマインダーが %{count} 件あります。"
+          messages:
+            other: "本当によろしいですか？未読の個人メッセージが %{count} 件あります。"
         dismiss: "閉じる"
         cancel: "キャンセル"
       group_message_summary:
@@ -2118,21 +2197,38 @@ ja:
       in: "検索対象"
       in_this_topic: "このトピック"
       in_this_topic_tooltip: "全トピックの検索に切り替えます"
+      in_messages: "メッセージ内"
+      in_messages_tooltip: "通常のトピックの検索に切り替えます"
       in_topics_posts: "すべてのトピックと投稿"
       enter_hint: "または Enter キーを押します"
+      in_posts_by: "%{username} の投稿内"
+      browser_tip: "%{modifier} + f"
+      browser_tip_description: "もう一度ネイティブブラウザ検索を使用します"
       recent: "最近の検索"
+      clear_recent: "最近の検索をクリア"
       type:
+        default: "トピック/投稿"
         users: "ユーザー"
         categories: "カテゴリ"
+        categories_and_tags: "カテゴリ/タグ"
       context:
         user: "@%{username} の投稿を検索"
         category: "#%{category} カテゴリを検索"
         tag: "#%{tag} タグを検索"
         topic: "このトピックを検索"
         private_messages: "メッセージを検索"
+      tips:
+        category_tag: "カテゴリまたはタグでフィルタ"
+        author: "投稿者でフィルタ"
+        in: "メタデータでフィルタ (例: in:title、in:personal、in:pinned)"
+        status: "トピックのステータスでフィルタ"
+        full_search: "全ページ検索を開始します"
+        full_search_key: "%{modifier} + Enter"
       advanced:
+        title: 高度なフィルタ
         posted_by:
           label: 投稿者
+          aria_label: 投稿者でフィルタ
         in_category:
           label: カテゴリ
         in_group:
@@ -2141,6 +2237,7 @@ ja:
           label: バッジ
         with_tags:
           label: タグ
+          aria_label: タグを使ってフィルタ
         filters:
           label: トピック/投稿のみを返す...
           title: タイトルが一致するもの
@@ -2171,30 +2268,73 @@ ja:
             label: 投稿
           min:
             placeholder: 最小
+            aria_label: 最小投稿数でフィルタ
           max:
             placeholder: 最大
+            aria_label: 最大投稿数でフィルタ
           time:
             label: 投稿時期
+            aria_label: 投稿日でフィルタ
             before: 以前
             after: 以降
         views:
           label: 表示回数
         min_views:
           placeholder: 最小
+          aria_label: 最小閲覧数でフィルタ
         max_views:
           placeholder: 最大
+          aria_label: 最大閲覧数でフィルタ
+        additional_options:
+          label: "投稿数とトピックの閲覧数でフィルタ"
+    hamburger_menu: "メニュー"
     new_item: "新規"
     go_back: "戻る"
     not_logged_in_user: "現在のアクティビティと設定に関するユーザーの概要ページ"
     current_user: "ユーザーページに移動"
     view_all: "すべての%{tab}を表示"
     user_menu:
+      generic_no_items: "このリストには項目がありません。"
+      sr_menu_tabs: "ユーザーメニューのタブ"
+      view_all_notifications: "すべての通知を表示"
+      view_all_bookmarks: "すべてのブックマークを表示"
+      view_all_messages: "すべての個人メッセージを表示"
       tabs:
+        all_notifications: "すべての通知"
         replies: "返信"
+        replies_with_unread:
+          other: "返信 - %{count} 件の未読の返信"
         mentions: "メンション"
+        mentions_with_unread:
+          other: "メンション - %{count} 件の未読のメンション"
         likes: "「いいね！」された数"
+        likes_with_unread:
+          other: "いいね - %{count} 件の未読の「いいね！」"
+        watching: "ウォッチトピック"
+        watching_with_unread:
+          other: "ウォッチトピック - %{count} 件の未読のウォッチトピック"
+        messages: "個人メッセージ"
+        messages_with_unread:
+          other: "個人メッセージ - %{count} 件の未読のメッセージ"
         bookmarks: "ブックマーク"
-        profile: "プロフィール"
+        bookmarks_with_unread:
+          other: "ブックマーク - %{count} 件の未読のブックマーク"
+        review_queue: "レビューキュー"
+        review_queue_with_unread:
+          other: "レビューキュー - %{count} 個の項目がレビュー待ちです"
+        other_notifications: "その他の通知"
+        other_notifications_with_unread:
+          other: "その他の通知 - %{count} 件の未読の通知"
+        profile: "プロファイル"
+      reviewable:
+        view_all: "すべてのレビュー項目を表示"
+        queue: "キュー"
+        deleted_user: "(削除されたユーザー)"
+        deleted_post: "(削除された投稿)"
+        post_number_with_topic_title: "投稿 #%{post_number} - %{title}"
+        new_post_in_topic: "「%{title}」の新しい投稿"
+        user_requires_approval: "%{username} は承認が必要です"
+        default_item: "レビュー待ち項目 #%{reviewable_id}"
     topics:
       new_messages_marker: "最後の訪問"
       bulk:
@@ -2202,6 +2342,7 @@ ja:
         clear_all: "すべてクリア"
         unlist_topics: "トピックを非表示"
         relist_topics: "トピックを表示"
+        reset_bump_dates: "バンプ日をリセットする"
         defer: "取り下げる"
         delete: "トピックを削除"
         dismiss: "閉じる"
@@ -2218,9 +2359,11 @@ ja:
           other: "新規を閉じる (%{count})"
         toggle: "トピックの一括選択を切り替える"
         actions: "一括操作"
+        change_category: "カテゴリを設定..."
         close_topics: "トピックをクローズ"
         archive_topics: "トピックをアーカイブ"
         move_messages_to_inbox: "受信トレイに移動"
+        notification_level: "通知..."
         change_notification_level: "通知レベルを変更"
         choose_new_category: "このトピックの新しいカテゴリを選択:"
         selected:
@@ -2237,6 +2380,7 @@ ja:
           other: "進捗状況: <strong>%{count}</strong> 件のトピック"
       none:
         unread: "未読のトピックはありません。"
+        unseen: "未読のトピックはありません。"
         new: "新しいトピックはありません。"
         read: "まだトピックを一つも読んでいません。"
         posted: "まだトピックを一つも投稿していません。"
@@ -2253,6 +2397,7 @@ ja:
         read: "既読のトピックは以上です。"
         new: "新規トピックは以上です。"
         unread: "未読のトピックは以上です。"
+        unseen: "その他の未読のトピックはありません。"
         category: "%{category} のトピックは以上です。"
         tag: "%{tag} のトピックは以上です。"
         top: "人気のトピックは以上です。"
@@ -2454,12 +2599,16 @@ ja:
         open: "トピックをオープン"
         close: "トピックをクローズ"
         multi_select: "投稿を選択..."
+        slow_mode: "低速モードを設定..."
         timed_update: "トピックにタイマーをセット..."
         pin: "トピックを固定..."
         unpin: "トピックを固定解除..."
         unarchive: "トピックをアーカイブ解除"
         archive: "トピックをアーカイブ"
+        invisible: "トピックを非表示"
+        visible: "トピックを表示"
         reset_read: "閲覧データをリセット"
+        make_public: "公開トピックにする..."
         make_private: "個人メッセージにする"
         reset_bump_date: "バンプ日をリセット"
       feature:
@@ -2472,10 +2621,13 @@ ja:
         title: "返信"
         help: "このトピックへの返信を作成する"
       share:
+        title: "トピックを共有"
         extended_title: "リンクの共有"
         help: "このトピックのリンクを共有する"
         instructions: "このトピックへのリンクを共有します:"
         copied: "トピックのリンクをコピーしました。"
+        restricted_groups:
+          other: "グループのメンバーにのみ表示する: %{groupNames}"
         invite_users: "招待"
       print:
         title: "印刷"
@@ -2635,8 +2787,11 @@ ja:
           other: "<b>%{count}</b> 件の投稿を選択しました。"
       deleted_by_author_simple: "(作成者が削除したトピック)"
     post:
+      confirm_delete: "この投稿を削除してもよろしいですか？"
       quote_reply: "引用"
+      quote_reply_shortcut: "または q を押す"
       quote_edit: "編集"
+      quote_edit_shortcut: "または e を押す"
       quote_share: "共有"
       edit_reason: "理由: "
       post_number: "投稿 %{number}"
@@ -2651,10 +2806,17 @@ ja:
       show_hidden: "無視したコンテンツを表示します。"
       deleted_by_author_simple: "(作成者が削除した投稿)"
       collapse: "折りたたむ"
+      sr_collapse_replies: "埋め込まれた返信を折りたたむ"
+      sr_date: "投稿日"
+      sr_expand_replies:
+        other: "この投稿には %{count} 件の返信があります。クリックして展開"
       expand_collapse: "展開/折りたたむ"
+      sr_below_embedded_posts_description: "投稿 #%{post_number} の返信"
+      sr_embedded_reply_description: "投稿 #%{post_number} に対する @%{username} からの返信"
       locked: "スタッフメンバーは、この投稿を編集できないようにロックしました"
       gap:
         other: "%{count} 件の非表示の返信を表示する"
+      sr_reply_to: "投稿 #%{post_number} への @%{username} の返信"
       notice:
         new_user: "%{user} が投稿するのはこれが初めてです。コミュニティで歓迎しましょう！"
         returning_user: "%{user} を見かけてからしばらく経ちました。最後の投稿は %{time} でした。"
@@ -2668,6 +2830,10 @@ ja:
       has_likes_title_only_you: "この投稿に「いいね！」しました"
       has_likes_title_you:
         other: "あなたと他 %{count} 人がこの投稿に「いいね！」しました"
+      sr_post_like_count_button:
+        other: "%{count} 人がこの投稿に「いいね！」しました。クリックして表示"
+      sr_post_read_count_button:
+        other: "%{count} 人がこの投稿を読みました。クリックして表示"
       filtered_replies_hint:
         other: "この投稿との %{count} 件の返信を表示します"
       filtered_replies_viewing:
@@ -2679,6 +2845,8 @@ ja:
         edit: "投稿を編集中にエラーが発生しました。もう一度お試しください。"
         upload: "ファイルのアップロード中にエラーが発生しました。もう一度お試しください。"
         file_too_large: "ファイルが大きすぎます (最大サイズは %{max_size_kb} kb です)。クラウド共有サービスにアップロードしてから、そのリンクを貼り付けてはどうですか？"
+        file_size_zero: "問題が発生したようです。アップロードしようとしているファイルは 0 バイトです。もう一度お試しください。"
+        file_too_large_humanized: "ファイルが大きすぎます (最大サイズは %{max_size} です)。クラウド共有サービスにアップロードしてから、そのリンクを貼り付けてはどうですか？"
         too_many_uploads: "複数のファイルを同時にアップロードすることはできません。"
         too_many_dragged_and_dropped_files:
           other: "一度にアップロードできるファイルは %{count} 個までです。"
@@ -2720,6 +2888,7 @@ ja:
           just_the_post: "いいえ、この投稿のみ"
         admin: "投稿の管理者操作"
         permanently_delete: "永久に削除"
+        permanently_delete_confirmation: "この投稿を永久に削除してよろしいですか？復元できなくなります。"
         wiki: "ウィキにする"
         unwiki: "ウィキから削除"
         convert_to_moderator: "スタッフの色を追加"
@@ -2727,6 +2896,8 @@ ja:
         rebake: "HTML を再作成"
         publish_page: "ページの公開"
         unhide: "表示"
+        change_owner: "オーナーシップを変更..."
+        grant_badge: "バッジを付与..."
         lock_post: "投稿をロック"
         lock_post_description: "投稿者がこの投稿を編集できないようにします"
         unlock_post: "投稿のロックを解除"
@@ -2739,6 +2910,8 @@ ja:
         delete_topic_confirm_modal_no: "いいえ。このトピックを維持する"
         delete_topic_error: "このトピックを削除中にエラーが発生しました"
         delete_topic: "トピックを削除"
+        add_post_notice: "スタッフ通知を追加..."
+        change_post_notice: "スタッフ通知を変更..."
         delete_post_notice: "スタッフ通知を削除"
         remove_timer: "タイマーを削除"
         edit_timer: "タイマーを編集"
@@ -2752,6 +2925,8 @@ ja:
             other: "および他 %{count} 人がこれに「いいね！」と言いました"
           read_capped:
             other: "および他 %{count} 人がこれを読みました"
+          sr_post_likers_list_description: "この投稿に「いいね！」したユーザー"
+          sr_post_readers_list_description: "この投稿を読んだユーザー"
         by_you:
           off_topic: "関係のない話題として通報しました"
           spam: "迷惑として通報しました"
@@ -2761,6 +2936,9 @@ ja:
       delete:
         confirm:
           other: "%{count} 件の投稿を削除してもよろしいですか？"
+      merge:
+        confirm:
+          other: "これらの %{count} 件の投稿をマージしてよろしいですか？"
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -2796,7 +2974,9 @@ ja:
             button: "HTML"
       bookmarks:
         create: "ブックマークを作成"
+        create_for_topic: "トピックのブックマークを作成する"
         edit: "ブックマークを編集"
+        edit_for_topic: "トピックのブックマークを編集する"
         created: "作成"
         updated: "更新"
         name: "名前"
@@ -2810,6 +2990,9 @@ ja:
           edit_bookmark:
             name: "ブックマークを編集"
             description: "ブックマーク名を編集するか、リマインダーの日時を変更します"
+          clear_bookmark_reminder:
+            name: "リマインダーをクリアする"
+            description: "リマインダーの日時をクリアする"
           pin_bookmark:
             name: "ブックマークを固定"
             description: "ブックマークを固定します。固定すると、ブックマークリストの一番上に表示されるようになります。"
@@ -2822,11 +3005,15 @@ ja:
         viewing_summary: "このトピックの要約を表示中"
         post_number: "%{username}、投稿 #%{post_number}"
         show_all: "すべて表示"
+      share:
+        title: "投稿 #%{post_number} の共有"
+        instructions: "この投稿へのリンクを共有します:"
     category:
       none: "(カテゴリなし)"
       all: "すべてのカテゴリ"
       choose: "カテゴリ&hellip;"
       edit: "編集"
+      edit_title: "このカテゴリの編集"
       edit_dialog_title: "編集: %{categoryName}"
       view: "カテゴリのトピックを表示"
       back: "カテゴリに戻る"
@@ -2842,7 +3029,10 @@ ja:
       manage_tag_groups_link: "タググループの管理"
       allow_global_tags_label: "他のタグも許可"
       required_tag_group:
+        description: "新しいトピックでタググループのタグの使用を必須とする:"
         delete: "削除"
+        add: "必須タググループを追加する"
+        placeholder: "タググループを選択..."
       topic_featured_link_allowed: "このカテゴリに注目のリンクを許可する"
       delete: "カテゴリを削除"
       create: "新規カテゴリ"
@@ -2855,6 +3045,7 @@ ja:
       name: "カテゴリ名"
       description: "説明"
       logo: "カテゴリのロゴの画像"
+      logo_dark: "ダークモードのカテゴリロゴの画像"
       background_image: "カテゴリの背景画像"
       badge_colors: "バッジの色"
       background_color: "背景色"
@@ -2902,6 +3093,7 @@ ja:
       default_list_filter: "デフォルトのリストのフィルタ:"
       allow_badges_label: "このカテゴリでバッジの付与を許可する"
       edit_permissions: "権限を編集"
+      reviewable_by_group: "このカテゴリのコンテンツはスタッフのほか、次のユーザーもレビューできます:"
       review_group_name: "グループ名"
       require_topic_approval: "すべての新しいトピックにモデレーターの承認を必要とする"
       require_reply_approval: "すべての新しい返信にモデレーターの承認を必要とする"
@@ -2911,10 +3103,12 @@ ja:
       position_disabled: "カテゴリはアクティビティ順で表示されます。リスト内のカテゴリの順番を管理するには、 "
       position_disabled_click: '「カテゴリの位置の固定」の設定を有効にしてください。'
       minimum_required_tags: "トピックに必要なタグの最小数:"
+      default_slow_mode: 'このカテゴリの新しいトピックに「低速モード」を有効にします。'
       parent: "親カテゴリ"
       num_auto_bump_daily: "毎日自動的にバンプするオープントピックの数:"
       navigate_to_first_post_after_read: "トピックが読まれた後最初の投稿に移動する"
       notifications:
+        title: "このカテゴリの通知レベルを変更する"
         watching:
           title: "ウォッチ中"
           description: "このカテゴリのすべてのトピックを自動的にウォッチします。各トピックに新しい投稿があるたびに通知され、新しい返信の数が表示されます。"
@@ -3056,13 +3250,18 @@ ja:
         other {}}{count, plural, other {返信が # 件}}あります
     original_post: "元の投稿"
     views: "表示"
+    sr_views: "閲覧数で並べ替え"
     views_lowercase:
       other: "表示"
     replies: "返信"
+    sr_replies: "返信数で並べ替え"
     views_long:
       other: "このトピックは %{number} 回表示されました"
     activity: "アクティビティ"
+    sr_activity: "アクティビティで並べ替え"
     likes: "いいね！"
+    sr_likes: "「いいね！」数で並べ替え"
+    sr_op_likes: "元の投稿の「いいね！」数で並べ替え"
     likes_lowercase:
       other: "いいね！"
     users: "ユーザー"
@@ -3070,6 +3269,7 @@ ja:
       other: "ユーザー"
     category_title: "カテゴリ"
     history_capped_revisions: "履歴、直近の 100 回のレビジョン"
+    history: "履歴"
     changed_by: "%{author}"
     raw_email:
       title: "受信メール"
@@ -3097,6 +3297,10 @@ ja:
         help: "未読の投稿のあるウォッチ中または追跡中のトピック"
         lower_title_with_count:
           other: "未読 %{count}"
+      unseen:
+        title: "未読"
+        lower_title: "未読"
+        help: "新しいトピックと、未読の投稿のあるウォッチ中または追跡中のトピック"
       new:
         lower_title_with_count:
           other: "新規 %{count}"
@@ -3138,6 +3342,8 @@ ja:
         this_week: "今週"
         today: "今日"
         other_periods: "人気を参照:"
+    browser_update: '残念ながら、<a href="https://www.discourse.org/faq/#browser">あなたのブラウザはサポートされていません</a>。リッチコンテンツを表示するには<a href="https://browsehappy.com">サポートされているブラウザに切り替え</a>てから、ログインして返信してください。'
+    safari_13_warning: このサイトは、まもなく iOS と Safari バージョン 13 以下のサポートを終了します。簡易版の読み取り専用バージョンは、引き続き利用可能です。(<a href="https://meta.discourse.org/t/224747">詳細</a>)
     permission_types:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
@@ -3145,6 +3351,7 @@ ja:
     preloader_text: "読み込み中"
     lightbox:
       download: "ダウンロード"
+      open: "元の画像"
       previous: "前へ (左矢印キー)"
       next: "次へ (右矢印キー)"
       counter: "%curr% / %total%"
@@ -3159,6 +3366,7 @@ ja:
       shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
       shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "ショートカットキー"
+      short_title: "ショートカット"
       jump_to:
         title: "ページ移動"
         home: "%{shortcut} ホーム"
@@ -3226,6 +3434,7 @@ ja:
         edit: "%{shortcut} 投稿を編集"
         delete: "%{shortcut} 投稿を削除"
         mark_muted: "%{shortcut} トピックをミュート"
+        mark_regular: "%{shortcut} 通常 (デフォルト) のトピック"
         mark_tracking: "%{shortcut} トピックを追跡"
         mark_watching: "%{shortcut} トピックをウォッチ"
         print: "%{shortcut} トピックを印刷"
@@ -3235,6 +3444,7 @@ ja:
         title: "検索メニュー"
         prev_next: "%{shortcut} 選択を上下に移動"
         insert_url: "%{shortcut} 開いたコンポーザーに選択を挿入する"
+        full_page_search: "%{shortcut} 前ページ検索を開始"
     badges:
       earned_n_times:
         other: "このバッジを %{count} 回獲得しました"
@@ -3271,14 +3481,15 @@ ja:
       save_ics: ".ics ファイルをダウンロード"
       save_google: "Google カレンダーに追加"
       remember: "今後表示しない"
-      remember_explanation: "（この設定はユーザー設定で変更できます）"
+      remember_explanation: "(この設定はユーザー設定で変更できます)"
       download: "ダウンロード"
-      default_calendar: "デフォルトカレンダー"
+      default_calendar: "デフォルトのカレンダー"
       default_calendar_instruction: "日付を保存する際に、どのカレンダーを使用するかを決定します"
       add_to_calendar: "カレンダーに追加"
       google: "Google カレンダー"
       ics: "ICS"
     tagging:
+      all_tags: "すべてのタグ"
       other_tags: "他のタグ"
       selector_all_tags: "すべてのタグ"
       selector_no_tags: "タグなし"
@@ -3287,16 +3498,20 @@ ja:
       choose_for_topic: "オプションのタグ"
       choose_for_topic_required:
         other: "少なくとも %{count} 個のタグを選択してください..."
+      choose_for_topic_required_group:
+        other: "'%{name}' から %{count} 個のタグを選択..."
       info: "情報"
       default_info: "このタグはどのカテゴリにも制限されておらず、同義語もありません。"
       staff_info: "制限を追加するには、このタグを<a href=%{basePath}/tag_groups>タググループ</a>に追加します。"
       category_restricted: "このタグは、アクセス権限のないカテゴリに制限されています。"
       synonyms: "同義語"
       synonyms_description: "次のタグが使用されている場合、<b>%{base_tag_name}</b> に置き換えられます。"
+      save: "タグの名前と説明を保存する"
       tag_groups_info:
         other: "このタグは次のグループに属しています: %{tag_groups}。"
       category_restrictions:
         other: "次のカテゴリでのみ使用できます:"
+      edit_synonyms: "同義語を編集"
       add_synonyms_label: "同義語の追加:"
       add_synonyms: "追加"
       add_synonyms_explanation:
@@ -3310,6 +3525,7 @@ ja:
       delete_confirm_no_topics: "このタグを削除してもよろしいですか？"
       delete_confirm_synonyms:
         other: "その %{count} 個の同義語も削除されます。"
+      edit_tag: "タグ名と説明を編集する"
       description: "説明"
       sort_by: "並べ替え:"
       sort_by_count: "件数"
@@ -3350,6 +3566,7 @@ ja:
           title: "ミュート"
           description: "このタグのついた新しいトピックについては何も通知されず、未読タブにも表示されません。"
       groups:
+        back_btn: "すべてのタグに戻る"
         title: "タグのグループ"
         about_heading: "タググループの選択または新しいタググループの作成"
         about_heading_empty: "まず新しいタググループを作成します"
@@ -3377,6 +3594,7 @@ ja:
       topics:
         none:
           unread: "未読のトピックはありません。"
+          unseen: "未読のトピックはありません。"
           new: "新規トピックはありません。"
           read: "まだトピックを一つも読んでいません。"
           posted: "まだトピックを一つも投稿していません。"
@@ -3420,18 +3638,45 @@ ja:
       detailed_name: "%{level}: %{name}"
     pick_files_button:
       unsupported_file_picked: "サポートされていないファイルを選択しました。サポートされているファイルタイプ – %{types}。"
+    user_activity:
+      no_activity_title: "まだアクティビティがありません"
+      no_activity_body: "コミュニティへようこそ！初めてアクセスしたため、ディスカッションへの貢献がまだありません。最初のステップとして、<a href='%{topUrl}'>トップ</a>または<a href='%{categoriesUrl}'>カテゴリ</a>にアクセスし、コンテンツを読み始めましょう！気に入った投稿や詳しく知りたい投稿には %{heartIcon} を選択してください。参加すると、あなたのアクティビティがここに表示されます。"
+      no_replies_title: "まだトピックに返信していません。"
+      no_replies_title_others: "%{username} はまだトピックに返信していません"
+      no_replies_body: "貢献したい興味深い会話を<a href='%{searchUrl}'>見つけたら</a>、投稿のすぐ下にある<kbd>返信</kbd>ボタンを押せば、その投稿に返信することができます。また、個々の投稿やユーザーではなく、全般トピックに返信したい場合は、トピックの一番下かトピックのタイムラインの下にある<kbd>返信</kbd>ボタンを使用してください。"
+      no_drafts_title: "下書きを開始していません"
+      no_drafts_body: "まだ投稿の準備ができていませんか？トピック、返信、または個人メッセージを作成し始めると、新しい下書きが自動的に保存され、ここに表示されます。キャンセルボタンを選択して破棄するか、後で再開できるように下書きを保存します。"
+      no_likes_title: "「いいね！」したトピックはまだありません"
+      no_likes_title_others: "%{username} はまだどのトピックにも「いいね！」していません"
+      no_likes_body: "貢献を始めるには、すでに行われた会話を読み、気に入った投稿に %{heartIcon} を付けるのが、最も簡単な方法です！"
+      no_topics_title: "開始したトピックはまだありません"
+      no_topics_body: "会話で新しいトピックを開始する前に、既存のトピックを<a href='%{searchUrl}'>検索</a>するのが常に追従されますが、希望するトピックがまだ存在しないことを確信している場合は、自分のトピックを新規作成してください。トピックリスト、カテゴリ、またはタグのすぐ上にある <kbd>+ 新しいトピック</kbd>を使って、その分野に新しいトピックを作成しましょう。"
+      no_topics_title_others: "%{username} はまだトピックを開始していません"
+      no_read_topics_title: "既読のトピックはまだありません"
+      no_read_topics_body: "ディスカッションを読み始めると、ここにリストが表示されます。読み始めるには、<a href='%{topUrl}'>トップ</a>または<a href='%{categoriesUrl}'>カテゴリ</a>で興味のあるトピックを探すか、キーワードで検索 %{searchIcon} してください。"
+    no_group_messages_title: "グループメッセージが見つかりません"
+    topic_entrance:
+      sr_jump_top_button: "最初の投稿に移動"
+      sr_jump_bottom_button: "最後の投稿に移動"
+    fullscreen_table:
+      expand_btn: "表を展開"
+    second_factor_auth:
+      redirect_after_success: "二要素認証に成功しました。前のページにリダイレクトします..."
     sidebar:
       unread_count:
         other: "未読 %{count}"
       new_count:
         other: "新規 %{count}"
+      toggle_section: "セクションの切り替え"
       more: "もっと"
       all_categories: "すべてのカテゴリ"
+      all_tags: "すべてのタグ"
       sections:
         about:
           header_link_text: "サイト情報"
         messages:
           header_link_text: "メッセージ"
+          header_action_title: "個人メッセージを作成"
           links:
             inbox: "受信トレイ"
             sent: "送信済み"
@@ -3441,11 +3686,20 @@ ja:
             unread_with_count: "未読 (%{count})"
             archive: "アーカイブ"
         tags:
+          none: "追加したタグはまだありません"
+          click_to_get_started: "ここをクリックして開始してください。"
           header_link_text: "タグ"
+          header_action_title: "サイドバーのタグを編集"
+          configure_defaults: "デフォルトの構成"
         categories:
+          none: "追加したカテゴリはありません"
+          click_to_get_started: "ここをクリックして開始してください。"
           header_link_text: "カテゴリ"
+          header_action_title: "サイドバーのカテゴリを編集"
+          configure_defaults: "デフォルトの構成"
         community:
           header_link_text: "コミュニティ"
+          header_action_title: "新しいトピックを作成"
           links:
             about:
               content: "サイト情報"
@@ -3453,22 +3707,34 @@ ja:
               content: "管理者"
             badges:
               content: "バッジ"
+            everything:
+              content: "すべて"
+              title: "すべてのトピック"
             faq:
               content: "FAQ"
             tracked:
               content: "追跡中"
+              title: "すべての追跡トピック"
             groups:
               content: "グループ"
               title: "すべてのグループ"
             users:
               content: "ユーザー"
+              title: "すべてのユーザー"
             my_posts:
               content: "自分の投稿"
+              title: "自分の投稿"
               draft_count:
                 other: "%{count} 下書き"
             review:
               content: "レビュー"
               title: "レビュー"
+              pending_count: "保留中 %{count}"
+    welcome_topic_banner:
+      title: "ウェルカムトピックを作成しましょう"
+      description: 'ウェルカムトピックは、新しいメンバーが最初に読むものです。「エレベーターピッチ」や「ミッションステートメント」と考えると良いでしょう。このコミュニティの対象者、ここで期待できること、最初にしてほしいことを伝えましょう。'
+      button_title: "編集を開始"
+    until: "終了日:"
   admin_js:
     type_to_filter: "フィルタの種類..."
     admin:
@@ -3601,6 +3867,7 @@ ja:
               description: "管理者はすべてのグループを閲覧できます。"
             members_visibility_levels:
               title: "誰がこのグループメンバーを閲覧できますか？"
+              description: "管理者は、すべてのグループのメンバーを見ることができます。フレアは全ユーザーに表示されます。"
             publish_read_state: "グループメッセージにグループの既読状態を公開する"
           membership:
             automatic: 自動
@@ -3610,6 +3877,7 @@ ja:
             automatic_membership_email_domains: "メールのドメインがこのリストにあるものと完全に一致する場合、そのメールのユーザーは自動的にこのグループに追加されます。"
             automatic_membership_user_count:
               other: "%{count} 人のユーザーが新しいメールドメインを持っており、グループに追加されます。"
+            automatic_membership_associated_groups: "ここに表示されているサービスのグループメンバーであるユーザーは、サービスにログインすると、自動的にこのグループに追加されます。"
             primary_group: "自動的にプライマリーグループとして設定する"
         name_placeholder: "グループ名、スペースなし、ユーザー名のルールと同じ"
         primary: "プライマリーグループ"
@@ -3656,6 +3924,7 @@ ja:
         no_description: (説明なし)
         all_api_keys: すべての API キー
         user_mode: ユーザーレベル
+        scope_mode: 範囲
         impersonate_all_users: ユーザーを代理して操作
         single_user: "単一ユーザー"
         user_placeholder: ユーザー名を入力
@@ -3671,6 +3940,10 @@ ja:
             スコープを使用する場合、API キーを特定のエンドポイントのセットに制限できます。
             また、どのパラメーターが許可されるかを定義することもできます。複数の値はカンマ区切りで指定してください。
           title: スコープ
+          granular: 詳細
+          read_only: 読み取り専用
+          global: グローバル
+          global_description: API キーには制限がなく、すべてのエンドポイントにアクセスできます。
           resource: リソース
           action: 操作
           allowed_parameters: 許可されたパラメーター
@@ -3678,12 +3951,20 @@ ja:
           any_parameter: (任意のパラメーター)
           allowed_urls: 許可された URL
           descriptions:
+            global:
+              read: API キーを読み取り専用エンドポイントに制限します。
             topics:
               read: トピックまたはその中の特定の投稿を読み取ります。RSS もサポートされています。
               write: 新しいトピックまたは既存のトピックに投稿を作成します。
+              update: トピックを更新します。タイトル、カテゴリ、タグなどを変更します。
               read_lists: 人気、新規、最新などのトピックリストを読み取ります。RSS もサポートされています。
             posts:
               edit: 任意の投稿または特定の投稿を編集します。
+            categories:
+              list: カテゴリのリストを取得します。
+              show: ID で 1 つのカテゴリを取得します。
+            uploads:
+              create: 新しいファイルをアップロードするか、外部ストレージへの単一またはマルチパートの直接アップロードを開始します。
             users:
               bookmarks: ユーザーブックマークを一覧表示します。ICS 形式を使用している場合は、ブックマークのリマインダーが返されます。
               sync_sso: DiscourseConnect を使用してユーザーを同期します。
@@ -3696,6 +3977,19 @@ ja:
               list: ユーザーのリストを取得します。
             email:
               receive_emails: このスコープを mail-receiver と組み合わせて、受信メールを処理します。
+            badges:
+              create: 新しいバッジを作成します。
+              show: バッジに関する情報を取得します。
+              update: バッジを更新します。
+              delete: バッジを削除します。
+              list_user_badges: ユーザーのバッチを表示します。
+              assign_badge_to_user: バッジをユーザーに割り当てます。
+              revoke_badge_from_user: ユーザーのバッジを取り消します。
+            wordpress:
+              publishing: WP Discourse プラグインの公開機能 (必須) に必要です。
+              commenting: WP Discourse プラグインのコメント機能に必要です。
+              discourse_connect: WP Discourse プラグインの DiscourseConnect 機能に必要です。
+              utilities: WP Discourse プラグインのユーティリティを使用する場合に必要です。
       web_hooks:
         title: "Webhook"
         none: "現在、Webhook はありません。"
@@ -3754,6 +4048,9 @@ ja:
         notification_event:
           name: "通知イベント"
           details: "ユーザーがフィードに通知を受け取った場合。"
+        user_promoted_event:
+          name: "ユーザー昇格イベント"
+          details: "ユーザーがある信頼レベルから別の信頼レベルに昇格したとき。"
         user_badge_event:
           name: "バッジ付与イベント"
           details: "ユーザーがバッジを受け取った場合。"
@@ -3890,6 +4187,7 @@ ja:
         delete_confirm: '"%{theme_name}" を削除してもよろしいですか？'
         color: "色"
         opacity: "透明度"
+        copy: "複製"
         copy_to_clipboard: "クリップボードにコピー"
         copied_to_clipboard: "クリップボードにコピーしました"
         copy_to_clipboard_error: "データをクリップボードにコピーする際にエラーが発生しました"
@@ -3905,6 +4203,7 @@ ja:
           theme: "テーマ"
           component: "コンポーネント"
           components: "コンポーネント"
+          filter_placeholder: "入力してフィルタ..."
           theme_name: "テーマ名"
           component_name: "コンポーネント名"
           themes_intro: "まず既存のテーマを選択するか、新しいテーマをインストールしてください"
@@ -3988,6 +4287,8 @@ ja:
           import_web_advanced: "高度…"
           import_file_tip: "テーマを含む .tar.gz、.zip、または .dcstyle.json ファイル"
           is_private: "テーマはプライベート git リポジトリにあります"
+          finish_install: "テーマのインストールを終了"
+          last_attempt: "インストールプロセスが終了しませんでした。最終試行:"
           remote_branch: "ブランチ名 (オプション)"
           public_key: "次の公開鍵アクセスをリポジトリに許可する:"
           public_key_note: "有効なプライベートリポジトリ URL を入力すると、SSH キーが生成されて、ここに表示されます。"
@@ -3998,6 +4299,8 @@ ja:
           install_git_repo: "git リポジトリから"
           install_create: "新規作成"
           duplicate_remote_theme: "テーマのコンポーネント “%{name}” はすでにインストールされています。別のコピーをインストールしてもよろしいですか？"
+          force_install: "Git リポジトリにアクセスできないため、テーマをインストールできません。インストールを続行してもよろしいですか？"
+          create_placeholder: "プレースホルダーを作成"
           about_theme: "テーマについて"
           license: "ライセンス"
           version: "バージョン:"
@@ -4020,6 +4323,7 @@ ja:
           has_overwritten_history: "現在のテーマのバージョンは、Git 履歴が強制プッシュで上書きされたため、存在しなくなりました。"
           add: "追加"
           theme_settings: "テーマの設定"
+          overriden_settings_explanation: "オーバーライドされた設定はドットでマークされ、ハイライト表示されます。これらの設定をデフォルトの値にリセットするには、その横にあるリセットボタンを押します。"
           no_settings: "このテーマには設定がありません。"
           theme_translations: "テーマの翻訳"
           empty: "項目なし"
@@ -4056,8 +4360,12 @@ ja:
               %{example}
 
               プラグインやコアとの競合を避けるには、プロパティ名に接頭辞を付けることを強くお勧めします。
+          head_tag:
+            text: "Head"
+            title: "head タグの前に挿入される HTML"
           body_tag:
             text: "本文"
+            title: "body タグの前に挿入される HTML"
           yaml:
             text: "YAML"
             title: "YAML 形式でテーマ設定を定義してください"
@@ -4155,6 +4463,7 @@ ja:
         time: "時間"
         user: "ユーザー"
         email_type: "メールタイプ"
+        details_title: "メールの詳細を表示"
         to_address: "宛先アドレス"
         test_email_address: "テストするメールアドレス"
         send_test: "テストメールを送る"
@@ -4172,6 +4481,7 @@ ja:
         last_seen_user: "最終アクセスユーザー:"
         no_result: "要約の結果は見つかりませんでした。"
         reply_key: "返信キー"
+        post_link_with_smtp: "投稿と SMTP の詳細"
         skipped_reason: "スキップの理由"
         incoming_emails:
           from_address: "送信者"
@@ -4201,6 +4511,7 @@ ja:
             address_placeholder: "name@example.com"
             type_placeholder: "ダイジェスト、アカウント登録..."
             reply_key_placeholder: "返信キー"
+            smtp_transaction_response_placeholder: "SMTP ID"
       moderation_history:
         performed_by: "実行者:"
         no_results: "介入履歴はありません。"
@@ -4382,6 +4693,7 @@ ja:
         clear_filter: "クリア"
         show_words:
           other: "%{count} 語を表示"
+        case_sensitive: "(大文字と小文字を区別)"
         download: ダウンロード
         clear_all: すべてクリア
         clear_all_confirm: "%{action}操作のすべてのウォッチ語をクリアしてもよろしいですか？"
@@ -4419,6 +4731,8 @@ ja:
           exists: "すでに存在します"
           upload: "ファイルから追加"
           upload_successful: "アップロードが成功し、言葉が追加されました。"
+          case_sensitivity_label: "大文字と小文字を区別"
+          case_sensitivity_description: "大文字と小文字が一致する語のみ"
         test:
           button_label: "テスト"
           modal_title: "%{action}: ウォッチ語をテスト"
@@ -4499,6 +4813,7 @@ ja:
         cant_suspend: "このユーザーを凍結できません。"
         delete_posts_failed: "投稿を削除中に問題が発生しました。"
         post_edits: "投稿の編集"
+        view_edits: "編集を表示"
         penalty_post_actions: "関連する投稿についてどうしますか？"
         penalty_post_delete: "投稿を削除する"
         penalty_post_delete_replies: "投稿と返信を削除する"
@@ -4518,6 +4833,7 @@ ja:
         suspended: "凍結？"
         staged: "ステージング？"
         show_admin_profile: "管理者"
+        manage_user: "ユーザーの管理"
         show_public_profile: "公開プロフィールを表示"
         impersonate: "代理操作"
         action_logs: "操作ログ"
@@ -4526,6 +4842,7 @@ ja:
         logged_out: "すべてのデバイスからログアウトしました"
         revoke_admin: "管理者権限を取り消す"
         grant_admin: "管理者権限を付与"
+        grant_admin_success: "新しい管理者が確認されました。"
         grant_admin_confirm: "新しい管理者を確認するためのメールを送信しました。開封して記載されている指示に従ってください。"
         revoke_moderation: "モデレーター権限を取り消す"
         grant_moderation: "モデレーター権限を付与"
@@ -4567,6 +4884,15 @@ ja:
             title: "投稿の削除状況"
             description: "投稿を削除中..."
           confirmation:
+            title: "@%{username} のすべての投稿を削除"
+            description: |
+              <p>@%{username} の <b>%{post_count} 件</b>の投稿を削除してもよろしいですか？
+
+              <p><b>この操作は取り消せません！</b></p>
+
+              <p>続行するには次を入力します: <code>%{text}</code></p>
+            text: "@%{username} の投稿を削除する"
+            delete: "@%{username} の投稿を削除する"
             cancel: "キャンセル"
         merge:
           button: "マージ"
@@ -4602,6 +4928,8 @@ ja:
           other: "すべての投稿を削除できません。%{count} 日以上経過した投稿があります。(delete_user_max_post_age の設定)"
         cant_delete_all_too_many_posts:
           other: "すべての投稿を削除することはできませんでした。ユーザーは %{count} 件以上投稿しています。(delete_all_posts_max)"
+        delete_confirm_title: "このユーザーを削除してもよろしいですか？永久に削除されます！"
+        delete_confirm: "一般に、ユーザーを削除するのではなく、匿名化して既存のディスカッションからコンテンツを削除しないようにするのが推奨されます。"
         delete_and_block: "このメールと IP アドレスを削除して<b>ブロック</b>する"
         delete_dont_block: "削除のみ"
         deleting_user: "ユーザーを削除中…"
@@ -4786,6 +5114,7 @@ ja:
           search: "検索"
           groups: "グループ"
           dashboard: "ダッシュボード"
+          sidebar: "サイドバー"
         secret_list:
           invalid_input: "入力フィールドを空にしたり、縦棒文字を含めることはできません。"
         default_categories:
@@ -4887,7 +5216,9 @@ ja:
           grant_existing_holders: 既存のバッジ保有者に追加のバッジを付与する
       emoji:
         title: "絵文字"
+        help: "誰でも使用できる新しい絵文字を追加します。名前を入力せずに、複数のファイルを一度にドラッグアンドドロップすると、ファイル名を使って絵文字を作成できます。同時に追加されるすべてのファイルに、選択されたグループが使用されます。「新しい絵文字を追加」をクリックして、ファイルピッカーを開くこともできます。"
         add: "新しい絵文字を追加"
+        choose_files: "ファイルを選択"
         uploading: "アップロード中..."
         name: "名前"
         group: "グループ"
@@ -4897,6 +5228,7 @@ ja:
       embedding:
         get_started: "ほかのウェブサイトに Discourse を埋め込む場合は、まずホストを追加してください。"
         confirm_delete: "このホストを削除してもよろしいですか？"
+        sample: "次の HTML コードをサイトに貼り付けて、Discourse のトピックを作成して埋め込みます。<b>REPLACE_ME</b> を埋め込み先の正規 URL に置き換えてください。"
         title: "埋め込み"
         host: "許可されたホスト"
         class_name: "クラス名"
@@ -4947,9 +5279,12 @@ ja:
           replace: "置換"
   wizard_js:
     wizard:
+      jump_in: "始めましょう！"
+      finish: "セットアップを終了"
       back: "戻る"
       next: "次へ"
-      step-text: "間隔"
+      configure_more: "さらに構成..."
+      step-text: "手順"
       step: "%{current} / %{total}"
       upload: "アップロード"
       uploading: "アップロード中..."
@@ -4964,5 +5299,8 @@ ja:
           moderator: "モデレーター"
           regular: "レギュラーユーザー"
       previews:
+        topic_title: "ディスカッショントピックの見出し"
         share_button: "共有"
         reply_button: "返信"
+        topic_preview: "トピックのプレビュー"
+        homepage_preview: "ホームページのプレビュー"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 8f0e5a3c4a..1c7306782b 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -758,6 +758,8 @@ pl_PL:
         reset_to_default: "Przywróć ustawienia domyślne"
       group:
         all: "wszystkie grupy"
+      sort:
+        label: "Sortuj według %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Zmień ustawienia grupy"
@@ -922,6 +924,7 @@ pl_PL:
         group_type: "Rodzaj grupy"
         is_group_user: "Członek"
         is_group_owner: "Właściciel"
+        search_results: "Wyniki wyszukiwania pojawią się poniżej."
       title:
         one: "Grupa"
         few: "Grupy"
@@ -958,6 +961,7 @@ pl_PL:
         no_filter_matches: "Żaden użytkownik nie pasuje do wyszukiwania."
       topics: "Tematy"
       posts: "Postów"
+      aria_post_number: "%{title} - post #%{postNumber}"
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
@@ -1207,6 +1211,7 @@ pl_PL:
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       experimental_sidebar:
+        enable: "Włącz pasek boczny"
         options: "Opcje"
         categories_section: "Sekcja kategorii"
         categories_section_instruction: "Wybrane kategorie będą wyświetlane w sekcji kategorii paska bocznego."
@@ -1214,6 +1219,7 @@ pl_PL:
         tags_section_instruction: "Wybrane tagi będą wyświetlane w sekcji tagów paska bocznego."
         navigation_section: "Nawigacja"
         list_destination_default: "Domyślny"
+        list_destination_unread_new: "Nowe/Nieprzeczytane"
       change: "zmień"
       featured_topic: "Wyróżniony temat"
       moderator: "%{user} jest moderatorem"
@@ -1398,12 +1404,16 @@ pl_PL:
           name_and_code_required_error: "Musisz podać nazwę i kod z aplikacji uwierzytelniającej."
         security_key:
           register: "Zarejestruj"
+          title: "Fizyczne klucze bezpieczeństwa"
+          add: "Dodaj fizyczny klucz bezpieczeństwa"
           default_name: "Główny klucz bezpieczeństwa"
           iphone_default_name: "iPhone"
           android_default_name: "Android"
           not_allowed_error: "Upłynął limit czasu procesu rejestracji klucza bezpieczeństwa lub został on anulowany."
           already_added_error: "Ten klucz bezpieczeństwa został już zarejestrowany. Nie musisz go ponownie rejestrować."
+          edit: "Edytuj fizyczny klucz bezpieczeństwa"
           save: "Zapisz"
+          edit_description: "Nazwa fizycznego klucza bezpieczeństwa"
           name_required_error: "Musisz podać nazwę swojego klucza bezpieczeństwa."
       change_about:
         title: "Zmień O mnie"
@@ -1775,6 +1785,9 @@ pl_PL:
         title: "Ikona"
         none: "(brak)"
         instructions: "ikona wyświetlana obok Twojego zdjęcia profilowego"
+      status:
+        title: "Własny status"
+        not_set: "Nie ustawiony"
       primary_group:
         title: "Główna grupa"
         none: "(brak)"
@@ -1790,6 +1803,10 @@ pl_PL:
       set_custom_status: "Ustaw własny status"
       what_are_you_doing: "Co robisz?"
       remove_status: "Usuń status"
+    popup:
+      primary: "Zrozumiano!"
+      first_notification:
+        title: "Twoje pierwsze powiadomienie!"
     loading: "Wczytuję…"
     errors:
       prev_page: "podczas próby wczytania"
@@ -1882,6 +1899,7 @@ pl_PL:
       remove_allowed_user: "Czy naprawdę chcesz usunąć %{name} z tej dyskusji?"
       remove_allowed_group: "Czy naprawdę chcesz usunąć %{name} z tej wiadomości?"
       leave: "Opuść"
+      remove_group: "Usuń grupę"
       remove_user: "Usuń użytkownika"
     email: "Email"
     username: "Nazwa konta"
@@ -2123,6 +2141,8 @@ pl_PL:
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
       edit_conflict: "edytuj konflikt"
+      esc: "esc"
+      ok_proceed: "Ok, kontynuuj."
       group_mentioned_limit:
         one: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
         few: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
@@ -2238,6 +2258,8 @@ pl_PL:
         body: "Aktualnie ta wiadomość będzie wysłana tylko do ciebie!"
       slow_mode:
         error: "Ten temat jest w trybie powolnym. Opublikowałeś już niedawno post; możesz napisać kolejny za %{timeLeft}."
+      user_not_seen_in_a_while:
+        multiple: "Następujące osoby, do których piszesz: <b>%{usernames}</b>, nie były tu widziane od bardzo dawna - %{time_ago}. Mogą one nie otrzymać Twojej wiadomości. Możesz poszukać innych metod kontaktu z nimi."
       admin_options_title: "Opcjonalne ustawienia zespołu dla tego tematu"
       composer_actions:
         reply: Odpowiedź
@@ -2536,16 +2558,27 @@ pl_PL:
       view_all_bookmarks: "zobacz wszystkie zakładki"
       view_all_messages: "wyświetl wszystkie wiadomości osobiste"
       tabs:
+        all_notifications: "Wszystkie powiadomienia"
         replies: "Odpowiedzi"
         mentions: "Wzmianki"
         likes: "Otrzymane polubienia"
+        watching: "Obserwowane tematy"
+        messages: "Wiadomości osobiste"
         bookmarks: "Zakładki"
+        other_notifications: "Inne powiadomienia"
+        other_notifications_with_unread:
+          one: "Inne powiadomienia - %{count} nieprzeczytane powiadomienie"
+          few: "Inne powiadomienia - %{count} nieprzeczytane powiadomienia"
+          many: "Inne powiadomienia - %{count} nieprzeczytanych powiadomień"
+          other: "Inne powiadomienia - %{count} nieprzeczytanych powiadomień"
         profile: "Profil"
       reviewable:
         queue: "Kolejka"
         deleted_user: "(usunięty użytkownik)"
+        deleted_post: "(usunięty post)"
         post_number_with_topic_title: "post #%{post_number} - %{title}"
         new_post_in_topic: "nowy post w %{title}"
+        user_requires_approval: "%{username} wymaga zatwierdzenia"
         default_item: "pozycja do sprawdzenia #%{reviewable_id}"
     topics:
       new_messages_marker: "ostatnia wizyta"
@@ -3279,6 +3312,12 @@ pl_PL:
           few: "Czy na pewno chcesz usunąć te %{count} posty?"
           many: "Czy na pewno chcesz usunąć te %{count} postów?"
           other: "Czy na pewno chcesz usunąć te %{count} postów?"
+      merge:
+        confirm:
+          one: "Czy na pewno chcesz połączyć te posty?"
+          few: "Czy na pewno chcesz połączyć te %{count} posty?"
+          many: "Czy na pewno chcesz połączyć te %{count} postów?"
+          other: "Czy na pewno chcesz połączyć te %{count} postów?"
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -3726,6 +3765,7 @@ pl_PL:
         today: "Dzisiaj"
         other_periods: "Zobacz najczęściej dyskutowane:"
     browser_update: 'Niestety, <a href="https://www.discourse.org/faq/#browser">twoja przeglądarka nie jest obsługiwana</a>. Proszę <a href="https://browsehappy.com">przełączyć się na obsługiwaną przeglądarkę</a>, aby móc oglądać bogatą zawartość, zalogować się i odpowiedzieć.'
+    safari_13_warning: Ta strona wkrótce przestanie obsługiwać systemy iOS i Safari w wersji 13 i niższej. Nadal będzie dostępna uproszczona wersja tylko do odczytu. (<a href="https://meta.discourse.org/t/224747">więcej informacji</a>)
     permission_types:
       full: "tworzyć / odpowiadać / przeglądać"
       create_post: "odpowiadać / przeglądać"
@@ -3883,6 +3923,7 @@ pl_PL:
       google: "Kalendarz Google"
       ics: "ICS"
     tagging:
+      all_tags: "Wszystkie tagi"
       other_tags: "Inne tagi"
       selector_all_tags: "wszystkie tagi"
       selector_no_tags: "brak tagów"
@@ -4062,6 +4103,7 @@ pl_PL:
       no_activity_title: "Brak aktywności"
       no_activity_body: "Witaj w naszej społeczności! Jesteś tu zupełnie nowy(-a) i nie uczestniczyłeś(-aś) jeszcze w żadnych dyskusjach. Jako pierwszy krok, odwiedź <a href='%{topUrl}'>Popularne</a> lub <a href='%{categoriesUrl}'>Kategorie</a> i po prostu zacznij czytać! Kliknij w %{heartIcon} przy postach, które lubisz lub chcesz dowiedzieć się więcej. Gdy bierzesz udział w dyskusji, Twoja aktywność zostanie wymieniona tutaj."
       no_replies_title: "Nie odpowiedziałeś jeszcze na żadne tematy"
+      no_replies_title_others: "%{username} nie odpowiedział jeszcze na żaden temat"
       no_drafts_title: "Nie rozpocząłeś żadnych szkiców"
       no_drafts_body: "Nie jesteś gotowy do opublikowania? Automatycznie zapiszemy nową wersję roboczą i wyświetlimy ją tutaj za każdym razem, gdy zaczniesz pisać temat, odpowiedź lub wiadomość osobistą. Wybierz przycisk anulowania, aby odrzucić lub zapisać wersję roboczą, aby kontynuować później."
       no_likes_title: "Nie polubiłeś jeszcze żadnych tematów"
@@ -4093,6 +4135,7 @@ pl_PL:
       toggle_section: "przełącz sekcję"
       more: "Więcej"
       all_categories: "Wszystkie kategorie"
+      all_tags: "Wszystkie tagi"
       sections:
         about:
           header_link_text: "O stronie"
@@ -4112,11 +4155,13 @@ pl_PL:
           click_to_get_started: "Kliknij tutaj, aby rozpocząć."
           header_link_text: "Etykiety"
           header_action_title: "edytuj tagi paska bocznego"
+          configure_defaults: "Skonfiguruj ustawienia domyślne"
         categories:
           none: "Nie dodałeś żadnych kategorii."
           click_to_get_started: "Kliknij tutaj, aby rozpocząć."
           header_link_text: "Kategorie"
           header_action_title: "edytuj kategorie paska bocznego"
+          configure_defaults: "Skonfiguruj ustawienia domyślne"
         community:
           header_link_text: "Społeczność"
           header_action_title: "utwórz nowy temat"
@@ -5269,6 +5314,7 @@ pl_PL:
         suspended: "Zawieszony?"
         staged: "Etapowy?"
         show_admin_profile: "Administrator"
+        manage_user: "Zarządzaj użytkownikiem"
         show_public_profile: "Pokaż profil publiczny"
         impersonate: "Podszywaj się"
         action_logs: "Logi akcji"
@@ -5676,7 +5722,6 @@ pl_PL:
       embedding:
         get_started: "Jeśli chcesz osadzić Discourse na innej stronie, rozpocznij podając jej host."
         confirm_delete: "Czy na pewno chcesz usunąć ten host?"
-        sample: "Wklej następujący kod HTML do swojej strony, aby utworzyć i osadzić tematy discourse. Zastąp <b>REPLACE_ME</b> kanonicznym adresem URL strony, na której go osadzasz."
         title: "Osadzanie"
         host: "Dozwolone hosty"
         class_name: "Nazwa klasy"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 90aa8d319f..1351fb79b4 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -195,6 +195,7 @@ pt_BR:
       broken_theme_alert: "Seu site pode não funcionar porque o tema/componente tem erros."
       error_caused_by: "Causado por '%{name}'. <a target='blank' href='%{path}'>Clique aqui</a> para atualizar, reconfigurar ou desabilitar."
       only_admins: "(esta mensagem é mostrada somente aos administradores do site)"
+    broken_decorator_alert: "As postagens podem não ser exibidas corretamente porque um dos decoradores de conteúdo de postagem em seu site gerou um erro."
     s3:
       regions:
         ap_northeast_1: "Ásia Pacífico (Tóquio)"
@@ -657,6 +658,8 @@ pt_BR:
         reset_to_default: "Restaurar para padrão"
       group:
         all: "todos os grupos"
+      sort:
+        label: "Classificar por %{criteria}"
     group_histories:
       actions:
         change_group_setting: "Alterar configurações do grupo"
@@ -821,6 +824,7 @@ pt_BR:
         group_type: "Tipo de grupo"
         is_group_user: "Membro"
         is_group_owner: "Proprietário(a)"
+        search_results: "Os resultados da pesquisa serão exibidos abaixo."
       title:
         one: "Grupo"
         other: "Grupos"
@@ -855,6 +859,7 @@ pt_BR:
         no_filter_matches: "Nenhum membro corresponde a essa pesquisa."
       topics: "Tópicos"
       posts: "Postagens"
+      aria_post_number: "%{title} - postagem #%{postNumber}"
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação padrão para mensagens de grupo"
@@ -969,6 +974,7 @@ pt_BR:
     user_fields:
       none: "(selecione uma opção)"
       required: 'Digite um valor para "%{name}"'
+      same_as_password: 'Sua senha não deve ser repetida em outros campos.'
     user:
       said: "%{username}:"
       profile: "Perfil"
@@ -1055,6 +1061,8 @@ pt_BR:
       dismiss: "Descartar"
       dismiss_notifications: "Descartar tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidas"
+      dismiss_bookmarks_tooltip: "Marcar todos os lembretes de favoritos não lidos como lidos"
+      dismiss_messages_tooltip: "Marcar todas as notificações de mensagens pessoais não lidas como lidas"
       no_messages_title: "Você não tem mensagens"
       no_messages_body: >
         Precisa ter uma conversa pessoal direta, fora do fluxo de conversa normal? Envie uma mensagem ao selecionar o seu avatar e usar o botão de mensagem %{icon}.<br><br> Se precisar de ajuda, envie uma <a href='%{aboutUrl}'>mensagem a um membro da equipe</a>.
@@ -1065,6 +1073,9 @@ pt_BR:
       no_notifications_title: "Você ainda não tem nenhuma notificação"
       no_notifications_body: >
         Neste painel, você receberá notificações sobre atividades relevantes, inclusive respostas aos seus tópicos e postagens, quando você for citado(a) ou mencionado(a) (<b>@mentions</b>) por alguém e quando os tópicos que você estiver acompanhando receberem respostas. As notificações também serão enviadas por e-mail quando você passar algum tempo sem entrar com a conta. <br><br> Procure por %{icon} para decidir sobre quais tópicos, categorias e etiquetas específicas você quer receber notificações. Para obter mais informações, verifique suas <a href='%{preferencesUrl}'>preferências de notificações</a>.
+      no_other_notifications_title: "Você ainda não tem nenhuma notificação"
+      no_other_notifications_body: >
+        Você receberá notificação neste painel sobre outros tipos de atividade que podem ser relevantes para você - por exemplo, quando alguém vincular ou editar uma de suas postagens.
       no_notifications_page_title: "Você ainda não tem nenhuma notificação"
       no_notifications_page_body: >
         Você receberá notificações sobre atividades relevantes, inclusive respostas aos seus tópicos e postagens, quando você for citado(a) ou mencionado(a) (<b>@mentions</b>) por alguém e quando os tópicos que você estiver acompanhando receberem respostas. As notificações também serão enviadas por e-mail quando você passar algum tempo sem entrar com a conta. <br><br> Procure por %{icon} para decidir sobre quais tópicos, categorias e etiquetas específicas você quer receber notificações. Para obter mais informações, verifique suas <a href='%{preferencesUrl}'>preferências de notificações</a>.
@@ -1075,6 +1086,7 @@ pt_BR:
         not_first_time: "Não é a sua primeira vez?"
         skip_link: "Pular estas dicas"
         read_later: "Vou ler mais tarde."
+      reset_seen_popups: "Exibir dicas de integração novamente"
       theme_default_on_all_devices: "Definir este tema como padrão em todos os meus dispositivos"
       color_scheme_default_on_all_devices: "Definir esquemas de cores padrão em todos os meus dispositivos"
       color_scheme: "Esquema de cores"
@@ -1094,11 +1106,16 @@ pt_BR:
       enable_quoting: "Ativar resposta citando o texto destacado"
       enable_defer: "Ativar adiamento para marcar tópicos como não lidos"
       experimental_sidebar:
+        enable: "Habilitar barra lateral"
         options: "Opções"
         categories_section: "Seção de Categorias"
         categories_section_instruction: "As categorias selecionadas serão exibidas na seção de categorias do painel lateral."
         tags_section: "Seção de Etiquetas"
         tags_section_instruction: "As etiquetas selecionadas serão exibidas na seção de etiquetas da barra lateral."
+        navigation_section: "Navegação"
+        list_destination_instruction: "Quando eu clicar em um link de lista de tópicos na barra lateral com tópicos novos ou não lidos, leve-me para"
+        list_destination_default: "Padrão"
+        list_destination_unread_new: "Novo/Não lido"
       change: "alterar"
       featured_topic: "Tópico em destaque"
       moderator: "%{user} é moderador(a)"
@@ -1269,6 +1286,8 @@ pt_BR:
         edit: "Editar"
         edit_title: "Editar autenticador"
         edit_description: "Nome do autenticador"
+        enable_security_key_description: |
+          Quando sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança de hardware</a> ou dispositivo móvel compatível estiver preparado, pressione o botão Registrar abaixo.
         totp:
           title: "Autenticadores baseados em token"
           add: "Adicionar autenticador"
@@ -1276,10 +1295,16 @@ pt_BR:
           name_and_code_required_error: "Você deve informar um nome e o código do seu aplicativo autenticador."
         security_key:
           register: "Registrar"
+          title: "Chaves de Segurança Físicas"
+          add: "Adicionar Chave de Segurança Física"
           default_name: "Chave de segurança principal"
+          iphone_default_name: "iPhone"
+          android_default_name: "Android"
           not_allowed_error: "O processo de registro da chave de segurança atingiu o tempo limite ou foi cancelado."
           already_added_error: "Você já registrou esta chave de segurança.\nVocê não precisa registrá-la novamente."
+          edit: "Editar chaves de segurança física"
           save: "Salvar"
+          edit_description: "Nome de chaves de segurança física"
           name_required_error: "Você deve informar um nome para sua chave de segurança."
       change_about:
         title: "Alterar Sobre mim"
@@ -1631,6 +1656,9 @@ pt_BR:
         title: "Estilo"
         none: "(nenhum)"
         instructions: "ícone exibido perto da imagem do seu perfil"
+      status:
+        title: "Status personalizado"
+        not_set: "Não configurado"
       primary_group:
         title: "Grupo primário"
         none: "(nenhum)"
@@ -1646,6 +1674,15 @@ pt_BR:
       set_custom_status: "Definir status customizados"
       what_are_you_doing: "O que você está fazendo?"
       remove_status: "Remover status"
+    popup:
+      primary: "Entendi!"
+      secondary: "não me mostre essas dicas"
+      first_notification:
+        title: "Sua primeira notificação!"
+        content: "As notificações são usadas para que você se atualize sobre o que está acontecendo na comunidade."
+      topic_timeline:
+        title: "Linha do tempo do tópico"
+        content: "Percorra rapidamente uma postagem usando a linha do tempo do tópico."
     loading: "Carregando..."
     errors:
       prev_page: "ao tentar carregar"
@@ -1678,6 +1715,8 @@ pt_BR:
       enabled: "Este site está em modo somente leitura. Continue a navegar, mas as respostas, curtidas e outras ações estão desativadas por enquanto."
       login_disabled: "Não é possível entrar enquanto o site estiver em modo somente leitura. Esse recurso está desativado."
       logout_disabled: "Não é possível sair enquanto o site estiver em modo somente leitura. Esse recurso está desativado."
+    staff_writes_only_mode:
+      enabled: "Este site está no modo apenas para funcionários. Continue navegando, mas as respostas, curtidas e outras ações são limitadas apenas aos membros da equipe."
     too_few_topics_and_posts_notice_MF: >-
       Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}} e {currentPosts, plural, one {<strong>#</strong> uma postagem} other {<strong>#</strong> postagens}}. Os visitantes precisam de mais conteúdo para ler e responder. Recomendamos pelo menos {requiredTopics, plural, one {<strong>#</strong> tópico} other {<strong>#</strong> tópicos}} e {requiredPosts, plural, one {<strong>#</strong> postagem} other {<strong>#</strong> postagens}}. Somente a equipe pode ver esta mensagem.
     too_few_topics_notice_MF: >-
@@ -1709,6 +1748,7 @@ pt_BR:
       hide_forever: "não, obrigado(a)"
       hidden_for_session: "Ok, vamos perguntar amanhã. Você sempre pode usar \"Entrar\" para criar uma conta também."
       intro: "Olá! Parece que você está gostando da discussão, mas ainda não cadastou uma conta."
+      value_prop: "Cansou de ver as mesmas postagens? Ao criar uma conta, você sempre volta de onde parou. Com uma conta, você também pode receber notificações de novas respostas, salvar favoritos e usar curtidas para agradecer aos outros. Todos nós podemos trabalhar juntos para tornar esta comunidade excelente. :heart:"
     summary:
       enabled_description: "Você está vendo um resumo deste tópico: as postagens mais interessantes segundo a comunidade."
       description:
@@ -1734,6 +1774,7 @@ pt_BR:
       remove_allowed_user: "Tem certeza de que quer remover %{name} desta mensagem?"
       remove_allowed_group: "Tem certeza de que quer remover %{name} desta mensagem?"
       leave: "Sair"
+      remove_group: "Remover grupo"
       remove_user: "Remover usuário"
     email: "E-mail"
     username: "Nome do(a) usuário(a)"
@@ -1790,6 +1831,7 @@ pt_BR:
       second_factor_backup_title: "Backup de dois fatores"
       second_factor_backup_description: "Insira um dos seus códigos de backup:"
       second_factor: "Fazer login usando um aplicativo de autenticação"
+      security_key_description: "Quando você tiver sua chave física de segurança ou dispositivo móvel compatível preparado, pressione o botão Autenticar com Chave de Segurança abaixo."
       security_key_alternative: "Tentar de outra maneira"
       security_key_authenticate: "Autenticar com chave de segurança"
       security_key_not_allowed_error: "O processo de autenticação com chave de segurança atingiu o limite de tempo ou foi cancelado."
@@ -1875,9 +1917,11 @@ pt_BR:
       categories_only: "Apenas categorias"
       categories_with_featured_topics: "Categorias com tópicos em destaque"
       categories_and_latest_topics: "Categorias e últimos tópicos"
+      categories_and_latest_topics_created_date: "Categorias e Tópicos Mais Recentes (ordenar por data de criação do tópico)"
       categories_and_top_topics: "Categorias e melhores tópicos"
       categories_boxes: "Caixas de seleção com subcategorias"
       categories_boxes_with_topics: "Caixas de seleção com tópicos em destaque"
+      subcategories_with_featured_topics: "Subcategorias com Tópicos em Destaque"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1962,6 +2006,8 @@ pt_BR:
       drafts_offline: "rascunhos off-line"
       edit_conflict: "editar conflito"
       esc: "esc"
+      esc_label: "Clique ou pressione Esc para dispensar"
+      ok_proceed: "Ok, prossiga"
       group_mentioned_limit:
         one: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuário(a). Ninguém será notificado(a)."
         other: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuários(as). Ninguém será notificado(a)."
@@ -2053,6 +2099,7 @@ pt_BR:
       abandon: "fechar compositor e descartar rascunho"
       enter_fullscreen: "entrar no compositor em tela cheia"
       exit_fullscreen: "sair do compositor em tela cheia"
+      exit_fullscreen_prompt: "Pressione <kbd>ESC</kbd> para sair da tela cheia"
       show_toolbar: "exibir barra de ferramentas do compositor"
       hide_toolbar: "ocultar barra de ferramentas do compositor"
       modal_ok: "Ok"
@@ -2063,6 +2110,9 @@ pt_BR:
         body: "Por enquanto, esta mensagem está sendo enviada apenas para você mesmo(a)!"
       slow_mode:
         error: "Este tópico está no modo lento. Você já postou recentemente. É possível postar outra vez em %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "A pessoa para quem você está enviando mensagens, <b>%{usernames}</b>, não é vista aqui há muito tempo – %{time_ago}. Eles podem não receber sua mensagem. Você pode procurar métodos alternativos de contato %{usernames}."
+        multiple: "As seguintes pessoas para quem você está enviando mensagens: <b>%{usernames}</b>, não são vistas aqui há muito tempo – %{time_ago}. Elas podem não receber sua mensagem. Você pode procurar métodos alternativos de contatá-las."
       admin_options_title: "Configurações opcionais da equipe para este tópico"
       composer_actions:
         reply: Responder
@@ -2114,6 +2164,7 @@ pt_BR:
       post_approved: "Sua postagem foi aprovada"
       reviewable_items: "itens que exigem revisão"
       watching_first_post_label: "Novo tópico"
+      user_moved_post: "%{username} se moveu"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -2156,6 +2207,12 @@ pt_BR:
           default:
             one: "Tem certeza? Você tem %{count} notificação importante."
             other: "Tem certeza? Você tem %{count} notificações importantes."
+          bookmarks:
+            one: "Tem certeza? Você tem %{count} lembrete de favoritos não lido."
+            other: "Tem certeza? Você tem %{count} lembretes de favoritos não lidos."
+          messages:
+            one: "Tem certeza? Você tem %{count} mensagem pessoal não lida."
+            other: "Tem certeza? Você tem %{count} mensagens pessoais não lidas."
         dismiss: "Descartar"
         cancel: "Cancelar"
       group_message_summary:
@@ -2336,19 +2393,54 @@ pt_BR:
     view_all: "exibir tudo %{tab}"
     user_menu:
       generic_no_items: "Não há itens nesta lista."
+      sr_menu_tabs: "Abas do menu de usuário"
       view_all_notifications: "ver todas as notificações"
       view_all_bookmarks: "ver todos os favoritos"
       view_all_messages: "ver todas as mensagens pessoais"
       tabs:
         all_notifications: "Todas as notificações"
         replies: "Respostas"
+        replies_with_unread:
+          one: "Respostas - %{count} resposta não lida"
+          other: "Respostas - %{count} respostas não lidas"
         mentions: "Menções"
+        mentions_with_unread:
+          one: "Menções - %{count} menção não lida"
+          other: "Menções - %{count} menções não lidas"
         likes: "Curtidas"
+        likes_with_unread:
+          one: "Curtidas - %{count} curtida não lida"
+          other: "Curtidas - %{count} curtidas não lidas"
+        watching: "Tópicos assistidos"
+        watching_with_unread:
+          one: "Tópicos assistidos - %{count} tópico assistido não lido"
+          other: "Tópicos assistidos - %{count} tópicos assistidos não lidos"
         messages: "Mensagens pessoais"
+        messages_with_unread:
+          one: "Mensagens pessoais - %{count} mensagem não lida"
+          other: "Mensagens pessoais - %{count} mensagens não lidas"
         bookmarks: "Favoritos"
+        bookmarks_with_unread:
+          one: "Marcadores - %{count} marcador não lido"
+          other: "Marcadores - %{count} marcadores não lidos"
         review_queue: "Fila de revisão"
+        review_queue_with_unread:
+          one: "Fila de revisão - %{count} item precisa de revisão"
+          other: "Fila de revisão - %{count} itens precisam de revisão"
         other_notifications: "Outras notificações"
+        other_notifications_with_unread:
+          one: "Outras notificações - %{count} notificação não lida"
+          other: "Outras notificações - %{count} notificações não lidas"
         profile: "Perfil"
+      reviewable:
+        view_all: "ver todos os itens de revisão"
+        queue: "Fila"
+        deleted_user: "(usuário excluído)"
+        deleted_post: "(postagem excluída)"
+        post_number_with_topic_title: "postagem #%{post_number} - %{title}"
+        new_post_in_topic: "nova postagem em %{title}"
+        user_requires_approval: "%{username} requer aprovação"
+        default_item: "item revisável #%{reviewable_id}"
     topics:
       new_messages_marker: "último acesso"
       bulk:
@@ -2356,6 +2448,7 @@ pt_BR:
         clear_all: "Limpar tudo"
         unlist_topics: "Remover tópicos da lista"
         relist_topics: "Reinserir tópicos na lista"
+        reset_bump_dates: "Redefinir datas de promoção"
         defer: "Adiar"
         delete: "Excluir tópicos"
         dismiss: "Descartar"
@@ -2632,6 +2725,8 @@ pt_BR:
         unpin: "Desafixar tópico..."
         unarchive: "Desarquivar tópico"
         archive: "Arquivar tópico"
+        invisible: "Tópico removido da lista"
+        visible: "Tópico na lista"
         reset_read: "Redefinir data de leitura"
         make_public: "Tornar tópico público..."
         make_private: "Crie uma mensagem pessoal"
@@ -2646,6 +2741,7 @@ pt_BR:
         title: "Responder"
         help: "começar a escrever uma resposta para este tópico"
       share:
+        title: "Compartilhar tópico"
         extended_title: "Compartilhar um link"
         help: "compartilhar um link deste tópico"
         instructions: "Compartilhar um link para este tópico:"
@@ -2823,6 +2919,7 @@ pt_BR:
           other: "<b>%{count}</b> respostas selecionadas."
       deleted_by_author_simple: "(tópico excluído pelo(a) autor(a))"
     post:
+      confirm_delete: "Tem certeza de que deseja excluir esta postagem?"
       quote_reply: "Citação"
       quote_reply_shortcut: "Ou pressione Q"
       quote_edit: "Editar"
@@ -2841,11 +2938,19 @@ pt_BR:
       show_hidden: "Ver o conteúdo ignorado."
       deleted_by_author_simple: "(postagem excluída pelo(a) autor(a))"
       collapse: "recolher"
+      sr_collapse_replies: "Recolher respostas incorporadas"
+      sr_date: "Data da postagem"
+      sr_expand_replies:
+        one: "Esta postagem tem %{count} resposta. Clique para expandir"
+        other: "Esta postagem tem %{count} respostas. Clique para expandir"
       expand_collapse: "expandir/recolher"
+      sr_below_embedded_posts_description: "poste #%{post_number} respostas"
+      sr_embedded_reply_description: "resposta por @%{username} à postagem #%{post_number}"
       locked: "um membro da equipe bloqueou esta publicação para edição"
       gap:
         one: "ver %{count} resposta oculta"
         other: "ver %{count} respostas ocultas"
+      sr_reply_to: "Resposta à postagem %{post_number} por %{username}"
       notice:
         new_user: "Esta é a primeira vez que o %{user} postou. Vamos dar boas-vindas à nossa comunidade"
         returning_user: "Faz tempo que não vemos %{user}. Sua última postagem foi em %{time}."
@@ -2862,6 +2967,12 @@ pt_BR:
       has_likes_title_you:
         one: "você e mais %{count} pessoa curtiram esta postagem"
         other: "você e mais %{count} outras pessoas curtiram esta postagem"
+      sr_post_like_count_button:
+        one: "%{count} pessoa curtiu esta postagem. Clique para visualizar"
+        other: "%{count} pessoas curtiram esta postagem. Clique para visualizar"
+      sr_post_read_count_button:
+        one: "%{count} pessoa leu esta postagem. Clique para visualizar"
+        other: "%{count} pessoas leram esta postagem. Clique para visualizar"
       filtered_replies_hint:
         one: "Exibir esta postagem e a resposta"
         other: "Exibir esta postagem e as %{count} respostas"
@@ -2875,6 +2986,7 @@ pt_BR:
         edit: "Desculpe, houve um erro ao editar sua postagem. Tente outra vez."
         upload: "Desculpe, houve um erro ao enviar o arquivo. Tente outra vez."
         file_too_large: "Desculpe, este arquivo é muito grande (o tamanho máximo é de %{max_size_kb} KB). Que tal enviar o arquivo grande para um serviço de nuvem e compartilhar o link?"
+        file_size_zero: "Desculpe, parece que algo deu errado, o arquivo que você está tentando enviar tem 0 bytes. Tente novamente."
         file_too_large_humanized: "Desculpe, este arquivo é muito grande (o tamanho máximo é de %{max_size}). Que tal enviar o arquivo grande para um serviço de nuvem e compartilhar o link?"
         too_many_uploads: "Desculpe, você pode enviar apenas um arquivo por vez."
         too_many_dragged_and_dropped_files:
@@ -2962,6 +3074,8 @@ pt_BR:
           read_capped:
             one: "e %{count} outro(a) leu isto"
             other: "e %{count} outros(as) leram isto"
+          sr_post_likers_list_description: "usuários curtiram esta postagem"
+          sr_post_readers_list_description: "usuários que leram esta postagem"
         by_you:
           off_topic: "Você sinalizou isto como desvio de tópico"
           spam: "Você sinalizou isto como spam"
@@ -2972,6 +3086,10 @@ pt_BR:
         confirm:
           one: "Tem certeza de que deseja excluir esta postagem?"
           other: "Tem certeza de que deseja excluir estas %{count} postagens?"
+      merge:
+        confirm:
+          one: "Tem certeza de que deseja mesclar estas postagens?"
+          other: "Tem certeza de que deseja mesclar estas %{count} postagens?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -3023,6 +3141,9 @@ pt_BR:
           edit_bookmark:
             name: "Editar favorito"
             description: "Editar o nome do favorito ou alterar a data e hora do lembrete"
+          clear_bookmark_reminder:
+            name: "Limpar lembrete"
+            description: "Limpar a data e hora do lembrete"
           pin_bookmark:
             name: "Fixar favoritos"
             description: "Fixe o favorito. Isso fará que seja exibido no topo da sua lista de favoritos."
@@ -3043,6 +3164,7 @@ pt_BR:
       all: "Todas as categorias"
       choose: "categoria&hellip;"
       edit: "Editar"
+      edit_title: "Editar esta categoria"
       edit_dialog_title: "Editar: %{categoryName}"
       view: "Visualizar tópicos na categoria"
       back: "Voltar para a categoria"
@@ -3058,7 +3180,10 @@ pt_BR:
       manage_tag_groups_link: "Gerenciar grupos de etiquetas"
       allow_global_tags_label: "Permitir também outras etiquetas"
       required_tag_group:
+        description: "Exigir que novos tópicos tenham etiquetas de grupos de etiquetas:"
         delete: "Excluir"
+        add: "Adicionar grupo de tags necessário"
+        placeholder: "selecionar grupo de tags..."
       topic_featured_link_allowed: "Permitir links em destaque nesta categoria"
       delete: "Excluir categoria"
       create: "Nova categoria"
@@ -3071,6 +3196,7 @@ pt_BR:
       name: "Nome da categoria"
       description: "Descrição"
       logo: "Imagem do logotipo da categoria"
+      logo_dark: "Imagem do logotipo da categoria Modo Escuro"
       background_image: "Imagem de fundo da categoria"
       badge_colors: "Cores do emblema"
       background_color: "Cor de fundo"
@@ -3118,6 +3244,7 @@ pt_BR:
       default_list_filter: "Filtro de lista padrão:"
       allow_badges_label: "Permitir a concessão de emblemas nesta categoria"
       edit_permissions: "Editar permissões"
+      reviewable_by_group: "Além da equipe, o conteúdo desta categoria também pode ser revisado por:"
       review_group_name: "nome do grupo"
       require_topic_approval: "Requer aprovação dos moderadores(as) de todos os novos tópicos"
       require_reply_approval: "Requer aprovação dos moderadores(as) de todas as novas respostas"
@@ -3279,15 +3406,20 @@ pt_BR:
         other {}}
     original_post: "Postagem original"
     views: "Visualizações"
+    sr_views: "Classificar por visualizações"
     views_lowercase:
       one: "visualização"
       other: "visualizações"
     replies: "Respostas"
+    sr_replies: "Classificar por respostas"
     views_long:
       one: "este tópico foi visto %{count} vez"
       other: "este tópico foi visto %{number} vezes"
     activity: "Atividade"
+    sr_activity: "Classificar por atividade"
     likes: "Curtidas"
+    sr_likes: "Classificar por curtidas"
+    sr_op_likes: "Classificar por curtidas da postagem original"
     likes_lowercase:
       one: "curtida"
       other: "curtidas"
@@ -3376,6 +3508,8 @@ pt_BR:
         this_week: "Semana"
         today: "Hoje"
         other_periods: "ver melhores:"
+    browser_update: 'Infelizmente, <a href="https://www.discourse.org/faq/#browser">seu navegador não é compatível</a>. <a href="https://browsehappy.com">Use um navegador compatível</a> para visualizar um conteúdo interessante, entrar com a conta e responder.'
+    safari_13_warning: Este site em breve removerá o suporte para iOS e Safari versões 13 e anteriores. Uma versão simplificada somente para leitura permanecerá disponível. (<a href="https://meta.discourse.org/t/224747">mais informações</a>)
     permission_types:
       full: "Criar/Responder/Ver"
       create_post: "Responder/Ver"
@@ -3466,6 +3600,7 @@ pt_BR:
         edit: "%{shortcut} Editar postagem"
         delete: "%{shortcut} Excluir postagem"
         mark_muted: "%{shortcut} Silenciar tópico"
+        mark_regular: "%{shortcut} Tópico normal (padrão)"
         mark_tracking: "%{shortcut} Monitorar tópico"
         mark_watching: "%{shortcut} Acompanhar tópico"
         print: "%{shortcut} Imprimir tópico"
@@ -3534,6 +3669,9 @@ pt_BR:
       choose_for_topic_required:
         one: "selecione pelo menos %{count} etiqueta..."
         other: "selecione pelo menos %{count} etiquetas..."
+      choose_for_topic_required_group:
+        one: "selecione %{count} etiqueta de '%{name}'..."
+        other: "selecione %{count} etiquetas de '%{name}'..."
       info: "Informações"
       default_info: "Esta etiqueta não está restrita a nenhuma categorias e não possui sinônimos."
       staff_info: "Para adicionar restrições, coloque esta etiqueta em um <a href=%{basePath}/tag_groups>grupo de etiquetas</a>."
@@ -3607,6 +3745,7 @@ pt_BR:
           title: "Silenciado(a)"
           description: "Você não receberá nenhuma notificação sobre novos tópicos com esta etiqueta, e eles não serão exibidos na aba de não lidos."
       groups:
+        back_btn: "Voltar para todas as etiquetas"
         title: "Grupos de etiquetas"
         about_heading: "Selecione um grupo de etiquetas ou crie uma nova"
         about_heading_empty: "Crie um novo grupo de etiquetas para começar"
@@ -3680,17 +3819,28 @@ pt_BR:
       unsupported_file_picked: "Você escolheu um arquivo incompatível. Tipos de arquivos compatíveis: %{types}."
     user_activity:
       no_activity_title: "Nenhuma atividade ainda."
+      no_activity_body: "Boas-vindas à nossa comunidade! É a sua primeira vez aqui, e você ainda não contribuiu para nenhuma discussão. Para começar, acesse <a href='%{topUrl}'>Melhores</a> ou <a href='%{categoriesUrl}'>Categorias</a> e comece a ler! Selecione %{heartIcon} nas postagens de que você curtir ou quiser saber mais a respeito. Se ainda não tiver feito isso, ajude os outros a conhecê-lo(a) ao adicionar uma imagem e biografia nas suas preferências de usuário</a>."
       no_replies_title: "Você ainda não respondeu a nenhum tópico."
+      no_replies_title_others: "%{username} ainda não respondeu a nenhum tópico"
+      no_replies_body: "Quando você <a href='%{searchUrl}'>descobrir</a> uma conversa interessante com a qual deseja contribuir, pressione o botão <kbd>Responder</kbd> diretamente abaixo de qualquer postagem para começar a responder a essa postagem específica. Ou, se você preferir responder ao tópico geral em vez de qualquer postagem ou pessoa individual, procure o botão <kbd>Responder</kbd> na parte inferior do tópico ou abaixo da linha do tempo do tópico."
       no_drafts_title: "Você ainda não iniciou nenhum rascunho"
       no_drafts_body: "Ainda não está pronto(a) para postar? Salvaremos automaticamente um novo rascunho e o listaremos aqui sempre que você começar a escrever um tópico, resposta ou mensagem pessoal. Selecione o botão de cancelamento para descartar ou salvar seu rascunho para continuar mais tarde."
       no_likes_title: "Você ainda não curtiu nenhum tópico"
+      no_likes_title_others: "%{username} ainda não respondeu a nenhum tópico"
       no_likes_body: "Uma ótima maneira de participar e começar a contribuir é iniciar a leitura das conversas que já aconteceram e selecionar %{heartIcon} nas postagens de que você gostou!"
       no_topics_title: "Você ainda não iniciou nenhum tópico"
+      no_topics_body: "É sempre melhor <a href='%{searchUrl}'>pesquisar</a> por tópicos de conversa existentes antes de iniciar um novo, mas, se você tiver certeza de que o tópico que deseja ainda não está disponível, vá em frente e crie um novo tópico próprio. Procure o botão <kbd>+ Novo Tópico</kbd> no canto superior direito da lista de tópicos, categoria ou etiqueta para começar a criar um novo tópico nessa área."
+      no_topics_title_others: "%{username} ainda não respondeu a nenhum tópico"
       no_read_topics_title: "Você ainda não leu nenhum tópico"
       no_read_topics_body: "Quando começar a ler as discussões, uma lista será exibida aqui. Para começar a ler, procure tópicos do seu interesse em <a href='%{topUrl}'>Melhores</a> ou <a href='%{categoriesUrl}'>Categorias</a>, ou pesquise por palavra-chave %{searchIcon}"
     no_group_messages_title: "Nenhuma mensagem de grupo encontrada"
+    topic_entrance:
+      sr_jump_top_button: "Pular para a primeira postagem"
+      sr_jump_bottom_button: "Pular para a última postagem"
     fullscreen_table:
       expand_btn: "Expandir tabela"
+    second_factor_auth:
+      redirect_after_success: "A autenticação de segundo fator foi bem-sucedida. Redirecionando para a página anterior…"
     sidebar:
       unread_count:
         one: "%{count} não lido"
@@ -3698,6 +3848,7 @@ pt_BR:
       new_count:
         one: "%{count} nova"
         other: "%{count} novas"
+      toggle_section: "alternar seção"
       more: "Mais"
       all_categories: "Todas as categorias"
       all_tags: "Todas as etiquetas"
@@ -3706,6 +3857,7 @@ pt_BR:
           header_link_text: "Sobre"
         messages:
           header_link_text: "Mensagens"
+          header_action_title: "criar uma mensagem pessoal"
           links:
             inbox: "Caixa de entrada"
             sent: "Enviadas"
@@ -3719,12 +3871,16 @@ pt_BR:
           click_to_get_started: "Clique aqui para começar."
           header_link_text: "Etiquetas"
           header_action_title: "editar as suas etiquetas da barra lateral"
+          configure_defaults: "Configurar padrões"
         categories:
           none: "Você não adicionou nenhuma categoria."
           click_to_get_started: "Clique aqui para começar."
           header_link_text: "Categorias"
+          header_action_title: "editar suas categorias de barra lateral"
+          configure_defaults: "Configurar padrões"
         community:
           header_link_text: "Comunidade"
+          header_action_title: "criar um novo tópico"
           links:
             about:
               content: "Sobre"
@@ -3749,11 +3905,16 @@ pt_BR:
             my_posts:
               content: "Minhas postagens"
               title: "Minhas publicações"
+              draft_count:
+                one: "%{count} rascunho"
+                other: "%{count} rascunhos"
             review:
               content: "Revisar"
               title: "revisar"
+              pending_count: "%{count} pendente"
     welcome_topic_banner:
       title: "Crie seu tópico de Boas-Vindas"
+      description: 'Seu tópico de boas-vindas é a primeira coisa que os novos membros vão ler. Pense nisso como seu “argumento de elevador” ou “declaração de missão”. Informe a todos sobre quem é o público desta comunidade, o que eles podem esperar encontrar aqui e o que você gostaria que eles fizessem primeiro.'
       button_title: "Começar a Editar"
     until: "Até:"
   admin_js:
@@ -3980,9 +4141,13 @@ pt_BR:
             topics:
               read: Leia um tópico ou uma postagem específica nele. RSS também é compatível.
               write: Crie um novo tópico ou poste em algum que já existe.
+              update: Atualize um tópico. Altere o título, categoria, etiquetas, etc.
               read_lists: Leia listas de tópico como melhores, novidades, mais recentes. RSS também é compatível.
             posts:
               edit: Edite qualquer postagem ou especifique uma.
+            categories:
+              list: Obtenha uma lista de categorias.
+              show: Obtenha uma categoria simples por id.
             uploads:
               create: Envie um novo arquivo ou inicie envios diretos únicos ou com partes múltiplas para o armazenamento externo.
             users:
@@ -4005,6 +4170,11 @@ pt_BR:
               list_user_badges: Liste emblemas de usuário(a).
               assign_badge_to_user: Atribua um emblema a um(a) usuário(a).
               revoke_badge_from_user: Revogue um emblema de um(a) usuário(a).
+            wordpress:
+              publishing: Necessário para os recursos de publicação do plugin WP Discourse (obrigatório).
+              commenting: Necessário para os recursos de publicação do plugin WP Discourse.
+              discourse_connect: Necessário para os recursos DiscourseConnect do plugin WP Discourse.
+              utilities: Necessário se você usar Utilitários do plugin WP Discourse.
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks no momento."
@@ -4063,6 +4233,9 @@ pt_BR:
         notification_event:
           name: "Evento de notificação"
           details: "Quando um(a) usuário(a) recebe uma notificação no feed dele."
+        user_promoted_event:
+          name: "Evento promovido pelo usuário"
+          details: "Quando um usuário é promovido de um nível de confiança para outro."
         user_badge_event:
           name: "Evento de concessão de emblema"
           details: "Quando um(a) usuário(a) recebe um emblema."
@@ -4302,6 +4475,7 @@ pt_BR:
           import_file_tip: "Arquivo .tar.gz, .zip ou .dcstyle.json com o tema"
           is_private: "O tema está em um repositório git privado"
           finish_install: "Concluir a instalação do tema"
+          last_attempt: "O processo de instalação não foi concluído, última tentativa:"
           remote_branch: "Nome da unidade (opcional)"
           public_key: "Conceder o seguinte acesso da chave pública ao repo:"
           public_key_note: "Após digitar uma URL do repositório privada válida, uma chave SSH será gerada e exibida aqui."
@@ -4312,6 +4486,8 @@ pt_BR:
           install_git_repo: "De um repositório git"
           install_create: "Criar novo(a)"
           duplicate_remote_theme: "O componente do tema \"%{name}\" já está instalado, tem certeza de que deseja instalar outra cópia?"
+          force_install: "O tema não pode ser instalado porque o repositório Git está inacessível. Tem certeza de que deseja continuar a instalação?"
+          create_placeholder: "Criar espaço reservado"
           about_theme: "Sobre"
           license: "Licença"
           version: "Versão:"
@@ -4334,6 +4510,7 @@ pt_BR:
           has_overwritten_history: "A versão atual do tema não existe mais porque o histórico de Git foi sobrescrito por um envio de push forçado."
           add: "Adicionar"
           theme_settings: "Configurações do tema"
+          overriden_settings_explanation: "As configurações substituídas são marcadas com um ponto e têm uma cor destacada. Para redefinir essas configurações para o valor padrão, pressione o botão de reinicialização próximo a elas."
           no_settings: "Este tema não tem configurações."
           theme_translations: "Traduções do tema"
           empty: "Nenhum item"
@@ -4492,6 +4669,7 @@ pt_BR:
         last_seen_user: "Último(a) usuário(a) visto(a):"
         no_result: "Nenhum resultado encontrado."
         reply_key: "Tecla de resposta"
+        post_link_with_smtp: "Detalhes de postagem e SMTP"
         skipped_reason: "Pular motivo"
         incoming_emails:
           from_address: "De"
@@ -4743,6 +4921,7 @@ pt_BR:
           upload: "Adicionar do arquivo"
           upload_successful: "Envio bem-sucedido. As palavras foram adicionadas."
           case_sensitivity_label: "É sensível a maiúsculas"
+          case_sensitivity_description: "Apenas palavras com maiúsculas e minúsculas de caracteres correspondentes"
         test:
           button_label: "Testar"
           modal_title: "%{action}: testar palavras acompanhadas"
@@ -5128,6 +5307,7 @@ pt_BR:
           search: "Pesquisar"
           groups: "Grupos"
           dashboard: "Painel de controle"
+          sidebar: "Barra Lateral"
         secret_list:
           invalid_input: "Os campos de entrada não podem estar vazios ou conter o caractere de barra vertical."
         default_categories:
@@ -5242,7 +5422,7 @@ pt_BR:
       embedding:
         get_started: "Se você deseja incorporar Discourse em outro site, começe adicionando seu host."
         confirm_delete: "Você tem certeza que deseja excluir este host?"
-        sample: "Cole o seguinte código HTML no seu site para criar e incorporar tópicos do Discourse. Substitua <b>REPLACE_ME</b> pela URL canônica da página na qual você está incorporando."
+        sample: "Cole o seguinte código HTML no seu site para criar e incorporar tópicos do discourse. Substitua <b>REPLACE_ME</b> pela URL canônica da página na qual você está incorporando."
         title: "Incorporar"
         host: "Hosts permitidos"
         class_name: "Nome da classe"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index c9ff527dfc..9b79d81278 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1137,10 +1137,16 @@ ro:
         copy_to_clipboard: "Copiază în clipboard"
         copy_to_clipboard_error: "Eroare la copierea datelor în clipboard"
         copied_to_clipboard: "Copiat în clipboard"
+        codes:
+          description: "Fiecare dintre aceste coduri de rezervă poate fi folosit o singură dată. Păstrează-le într-un loc sigur, dar accesibil."
       second_factor:
+        title: "Autentificare în doi pași (2FA)"
+        enable: "Gestionează autentificarea în doi pași (2FA)"
         name: "Nume"
+        disable_description: "Introdu codul de autentificare din aplicația 2FA"
         short_description: |
           Protejează-ți contul cu coduri de securitate de unică folosință.
+        oauth_enabled_warning: "Atenție! Autentificarea cu rețelele sociale va fi dezactivată atunci când activezi autentificarea în doi pași (2FA)."
         disable: "Dezactivează"
         save: "Salvează"
         edit: "Editează"
@@ -1562,6 +1568,8 @@ ro:
       title: "Autentificare"
       username: "Utilizator"
       password: "Parolă"
+      second_factor_title: "Autentificare în doi pași (2FA)"
+      second_factor_description: "Introdu codul de autentificare din aplicația 2FA"
       second_factor_backup: "Autentifică-te folosind un cod de rezervă"
       second_factor: "Autentifică-te folosind aplicația Autentificator"
       email_placeholder: "E-mail / Utilizator"
@@ -1582,7 +1590,7 @@ ro:
       not_allowed_from_ip_address: "Nu te poți conecta cu această adresă IP."
       admin_not_allowed_from_ip_address: "Nu te poți conecta ca administrator cu această adresă IP."
       resend_activation_email: "Click aici pentru a retrimite emailul de activare."
-      omniauth_disallow_totp: "Contul tău are autentificarea cu doi factori activată. Te rog să te autentifici cu parola."
+      omniauth_disallow_totp: "Contul tău are autentificarea în doi pași (2FA) activată. Te rog să te autentifici cu parola"
       resend_title: "Retrimite emailul de activare"
       change_email: "Schimbă adresa de email"
       provide_new_email: "Furnizează o nouă adresă de email și îți vom retrimite linkul de confirmare."
@@ -3509,6 +3517,7 @@ ro:
             post_locked: "postare blocată"
             post_unlocked: "postare deblocată"
             check_personal_message: "verifică mesaj personal"
+            disabled_second_factor: "Dezactivează autentificarea în doi pași (2FA)"
             topic_published: "discuția a fost publicată"
         screened_emails:
           title: "Email-uri filtrate"
@@ -3643,6 +3652,7 @@ ro:
         private_topics_count: Subiecte private
         posts_read_count: Postări citite
         post_count: Postări create
+        second_factor_enabled: Autentificare în doi pași (2FA) este activată
         topics_entered: Subiecte văzute
         flags_given_count: Marcaje de avertizare acordate
         flags_received_count: Marcaje de avertizare primite
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 4af0e1aabf..c17ec0b55a 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -24,8 +24,8 @@ ru:
             mb: МБ
             tb: ТБ
       short:
-        thousands: "%{number} тыс."
-        millions: "%{number} млн."
+        thousands: "%{number} тыс."
+        millions: "%{number} млн."
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (местное)"
@@ -58,11 +58,11 @@ ru:
           other: "%{count}с"
         less_than_x_minutes:
           one: "< %{count}мин"
-          few: "~ 1m"
-          many: "> 1m"
+          few: "< %{count}м"
+          many: "< %{count}м"
           other: "< %{count}мин"
         x_minutes:
-          one: "%{count}мин"
+          one: "%{count}м"
           few: "%{count}мин"
           many: "%{count}мин"
           other: "%{count}мин"
@@ -77,7 +77,7 @@ ru:
           many: "%{count}д"
           other: "%{count}д"
         x_months:
-          one: "%{count} мес"
+          one: "%{count}мес"
           few: "%{count}мес"
           many: "%{count}мес"
           other: "%{count}мес"
@@ -87,15 +87,15 @@ ru:
           many: "%{count}лет"
           other: "%{count}лет"
         over_x_years:
-          one: "> %{count} года"
-          few: "> %{count} лет"
-          many: "> %{count} лет"
-          other: "> %{count} лет"
+          one: "> %{count}года"
+          few: "> %{count}лет"
+          many: "> %{count}лет"
+          other: "> %{count}лет"
         almost_x_years:
-          one: "%{count} год"
-          few: "%{count} года"
-          many: "%{count} лет"
-          other: "%{count} лет"
+          one: "%{count}год"
+          few: "%{count}года"
+          many: "%{count}лет"
+          other: "%{count}лет"
         date_month: "D MMM"
         date_year: "MMM YYYY"
       medium:
@@ -202,7 +202,7 @@ ru:
       url: "Копировать и поделиться ссылкой"
     action_codes:
       public_topic: "Сделал тему публичной %{when}"
-      open_topic: "Преобразовал это в тему %{when}"
+      open_topic: "converted this to a topic %{when}"
       private_topic: "Сделал тему личным сообщением %{when}"
       split_topic: "Разделил эту тему %{when}"
       invited_user: "Пригласил %{who} %{when}"
@@ -274,7 +274,7 @@ ru:
         sa_east_1: "Южная Америка (Сан-Паулу)"
         us_east_1: "Восток США (Северная Вирджиния)"
         us_east_2: "Восток США (Огайо)"
-        us_gov_east_1: "AWS GovCloud (США-Восток)"
+        us_gov_east_1: "AWS GovCloud (США-восток)"
         us_gov_west_1: "AWS GovCloud (США-Запад)"
         us_west_1: "Запад США (Северная Калифорния)"
         us_west_2: "Запад США (Орегон)"
@@ -486,7 +486,7 @@ ru:
       date_filter: "Создано между"
       in_reply_to: "Посмотреть обсуждение"
       explain:
-        why: "Объяснить, почему этот элемент оказался в очереди"
+        why: "Объяснить, почему этот элемент оказался на премодерации"
         title: "Оценка содержимого"
         formula: "Формула"
         subtotal: "Промежуточный итог"
@@ -545,7 +545,7 @@ ru:
         bio: "О себе"
         website: "Веб-сайт"
         username: "Псевдоним"
-        email: "Email"
+        email: "Эл. почта"
         name: "Имя"
         fields: "Поля"
         reject_reason: "Причина"
@@ -802,7 +802,7 @@ ru:
           posting: Сообщения
           notification: Уведомления
         email:
-          title: "Email"
+          title: "Эл. почта"
           status: "Синхронизированные %{old_emails} / %{total_emails}   электронные письма через IMAP."
           enable_smtp: "Включить SMTP"
           enable_imap: "Включить IMAP"
@@ -926,6 +926,7 @@ ru:
         group_type: "Тип группы"
         is_group_user: "Участник"
         is_group_owner: "Владелец"
+        search_results: "Результаты поиска появятся ниже."
       title:
         one: "Группа"
         few: "Группы"
@@ -962,11 +963,12 @@ ru:
         no_filter_matches: "Соответствующих запросу участников не обнаружено."
       topics: "Темы"
       posts: "Сообщения"
+      aria_post_number: "%{title} - сообщение #%{postNumber}"
       mentions: "Упоминания"
       messages: "Сообщения"
       notification_level: "Уровень уведомлений по умолчанию для сообщений группы"
       alias_levels:
-        mentionable: "Кто может @упоминать эту группу?"
+        mentionable: "Кто может @mention (упоминать) эту группу?"
         messageable: "Кто может отправить соощение в эту группу?"
         nobody: "Никто"
         only_admins: "Только администраторы"
@@ -1023,7 +1025,7 @@ ru:
     categories:
       all: "Все разделы"
       all_subcategories: "Все"
-      no_subcategory: "Вне подразделов"
+      no_subcategory: "Нет подраздела"
       category: "Раздел"
       category_list: "Показать список разделов"
       reorder:
@@ -1198,6 +1200,7 @@ ru:
         not_first_time: "Не в первый раз?"
         skip_link: "Пропустить эти советы"
         read_later: "Прочитаю позже"
+      reset_seen_popups: "Показывать советы"
       theme_default_on_all_devices: "Сделать эту тему темой по умолчанию на всех моих устройствах"
       color_scheme_default_on_all_devices: "Установить цветовую схему по умолчанию на всех моих устройствах"
       color_scheme: "Цветовая схема"
@@ -1228,7 +1231,7 @@ ru:
         list_destination_default: "Домашнюю страницу"
         list_destination_unread_new: "Новые/Непрочитанные темы"
       change: "изменить"
-      featured_topic: "Избранная тема:"
+      featured_topic: "Избранная тема"
       moderator: "%{user} — модератор"
       admin: "%{user} — админ"
       moderator_tooltip: "Модератор"
@@ -1274,7 +1277,7 @@ ru:
       delete_account: "Удалить мою учётную запись"
       delete_account_confirm: "Вы действительно хотите удалить свою учётную запись? Отменить удаление будет невозможно!"
       deleted_yourself: "Ваша учётная запись была успешно удалена."
-      delete_yourself_not_allowed: "Пожалуйста, свяжитесь с администрацией сайта, если хотите удалить свой аккаунт."
+      delete_yourself_not_allowed: "Пожалуйста, свяжитесь с администрацией сайта, если хотите удалить свою учётную запись."
       unread_message_count: "Сообщения"
       admin_delete: "Удалить"
       users: "Пользователи"
@@ -1294,7 +1297,7 @@ ru:
       api_last_used_at: "Последнее использование:"
       theme: "Тема"
       save_to_change_theme: 'Тема будет обновлена после нажатия на кнопку ''%{save_text}''.'
-      home: "Домашняя страница по умолчанию"
+      home: "Домашняя страница"
       staged: "Сымитированный"
       staff_counters:
         flags_given: "Полезные жалобы"
@@ -1393,7 +1396,7 @@ ru:
         disable_description: "Пожалуйста, введите код аутентификации из вашего приложения"
         show_key_description: "Введите вручную"
         short_description: |
-          Защитите свой аккаунт одноразовыми кодами безопасности.
+          Защитите свою учётную запись одноразовыми кодами безопасности.
         extended_description: |
           Двухфакторная аутентификация повышает безопасность вашей учётной записи, требуя одноразовый токен в дополнение к вашему паролю. Токены могут быть сгенерированы на устройствах <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">iOS</a>.
         oauth_enabled_warning: "Обратите внимание, что социальные логины будут отключены после включения двухфакторной аутентификации в вашей учётной записи."
@@ -1434,12 +1437,12 @@ ru:
         taken: "Этот псевдоним уже занят."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
       add_email:
-        title: "Добавить E-mail"
+        title: "Добавить эл. почту"
         add: "Добавить"
       change_email:
-        title: "Изменить E-mail"
-        taken: "Этот E-mail недоступен."
-        error: "Произошла ошибка. Возможно, этот E-mail уже используется?"
+        title: "Изменить эл. почту"
+        taken: "Эта эл. почта недоступна."
+        error: "Произошла ошибка. Возможно, эта эл. почта уже используется?"
         success: "На указанную почту отправлено письмо с инструкциями."
         success_via_admin: "На новый электронный адрес отправлено письмо. Для его подтверждения пользователь должен следовать указанным в нём инструкциям."
         success_staff: "Мы отправили письмо с инструкциями на ваш текущий адрес электронной почты."
@@ -1466,24 +1469,24 @@ ru:
         title: "Избранная тема"
         instructions: "Ссылка на эту тему будет отображаться в карточке пользователя и в вашем профиле."
       email:
-        title: "E-mail"
+        title: "Эл. почта"
         primary: "Основной адрес электронной почты"
         secondary: "Дополнительный адрес электронной почты"
         primary_label: "основной"
         unconfirmed_label: "неподтверждённый"
-        resend_label: "Отправить заново подтверждение по E-mail"
+        resend_label: "Отправить заново подтверждение по эл. почте"
         resending_label: "отправка..."
-        resent_label: "E-mail отправлен"
-        update_email: "Изменить E-mail"
-        set_primary: "Указать как основной E-mail"
-        destroy: "Удалить E-mail"
-        add_email: "Добавить дополнительный E-mail"
+        resent_label: "Письмо по эл. почте отправлено"
+        update_email: "Изменить эл. почту"
+        set_primary: "Указать как основную эл. почту"
+        destroy: "Удалить эл. почту"
+        add_email: "Добавить дополнительную эл. почту"
         auth_override_instructions: "Электронная почта может быть обновлена поставщиком аутентификации."
         no_secondary: "Нет дополнительных адресов электронной почты"
         instructions: "Не будет отображаться."
         admin_note: "Примечание: Администратор меняет адрес электронной почты другого пользователя, не являющегося администратором, что указывает на то, что пользователь потерял доступ к своему первоначальному электронному адресу. На новый адрес пользователя будет отправлено электронное письмо для сброса пароля. Адрес электронной почты не изменится, пока пользователь не завершит процесс сброса пароля."
         ok: "Мы вышлем вам письмо для подтверждения"
-        required: "Пожалуйста, введите E-mail"
+        required: "Пожалуйста, введите эл. почту"
         invalid: "Введите действующий адрес электронной почты"
         authenticated: "Ваш адрес электронной почты подтверждён через %{provider}"
         invite_auth_email_invalid: "Ваш пригласительный адрес не совпадает с адресом электронной почты, подтверждённым через %{provider}"
@@ -1500,14 +1503,14 @@ ru:
         revoke: "Отозвать"
         cancel: "Отменить"
         not_connected: "(не подключённый)"
-        confirm_modal_title: "Подключить аккаунт %{provider}"
+        confirm_modal_title: "Подключить учётную запись %{provider}"
         confirm_description:
-          disconnect: "Ваш существующий %{provider}-аккаунт '%{account_description}' будет отключён."
-          account_specific: "Ваш аккаунт %{provider} '%{account_description}' будет использоваться для аутентификации."
-          generic: "Ваш аккаунт %{provider} будет использоваться для аутентификации."
+          disconnect: "Ваша существующая учётная запись %{provider} «%{account_description}» будет отключена."
+          account_specific: "Ваша учётная запись %{provider} «%{account_description}» будет использоваться для аутентификации."
+          generic: "Ваша учётная запись %{provider} будет использоваться для аутентификации."
       name:
         title: "Имя"
-        instructions: "Ваше полное имя (опционально)"
+        instructions: "Ваше полное имя (необязательно)"
         instructions_required: "Ваше полное имя"
         required: "Пожалуйста, введите имя"
         too_short: "Ваше имя слишком короткое"
@@ -1539,7 +1542,7 @@ ru:
         title: "Недавно использованные устройства"
         details: "Детали"
         log_out_all: "Выйти из всех устройств"
-        not_you: "Не вы?"
+        not_you: "Это были не вы?"
         show_all: "Показать все (%{count})"
         show_few: "Показать меньше"
         was_this_you: "Это были вы?"
@@ -1551,12 +1554,12 @@ ru:
         browser_active: '%{browser} | <span class="active">active now</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Последнее сообщение"
-      last_seen: "Был"
-      created: "Вступил"
+      last_seen: "Был(-а)"
+      created: "Вступил(-а)"
       log_out: "Выйти"
       location: "Местонахождение"
       website: "Веб-сайт"
-      email_settings: "E-mail"
+      email_settings: "Эл. почта"
       hide_profile_and_presence: "Скрыть мой общедоступный профиль и присутствие"
       enable_physical_keyboard: "Включить поддержку физической клавиатуры на iPad"
       text_size:
@@ -1722,9 +1725,9 @@ ru:
         recent_time_read_title: "%{duration} (за последние 60 дней)"
         topic_count:
           one: "тема создана"
-          few: "темы созданы"
-          many: "тем созданы"
-          other: "тем созданы"
+          few: "темы создано"
+          many: "тем создано"
+          other: "тем создано"
         post_count:
           one: "сообщение написано"
           few: "сообщения написано"
@@ -1752,9 +1755,9 @@ ru:
           other: "тем просмотрено"
         posts_read:
           one: "сообщение прочитано"
-          few: "сообщения прочитаны"
-          many: "сообщений прочитаны"
-          other: "сообщений прочитаны"
+          few: "сообщения прочитано"
+          many: "сообщений прочитано"
+          other: "сообщений прочитано"
         bookmark_count:
           one: "закладка"
           few: "закладки"
@@ -1888,7 +1891,7 @@ ru:
       hide_session: "Может быть позже"
       hide_forever: "Нет, спасибо"
       hidden_for_session: "Хорошо, напомним завтра. Кстати, зарегистрироваться можно также и с помощью кнопки \"Войти\"."
-      intro: "Здравствуйте! Похоже, вам нравится обсуждение, но вы ещё не зарегистрировали аккаунт."
+      intro: "Здравствуйте! Похоже, вам нравится обсуждение, но вы ещё не зарегистрировали учётную запись."
       value_prop: "Устали листать одни и те же темы? Когда вы создаете учётную запись, вы всегда будете возвращаться туда, где остановились. С учётной записью вы также можете получать уведомления о новых ответах, сохранять закладки и использовать симпатии, чтобы благодарить других участников. Мы все можем работать вместе, чтобы сделать это сообщество необычным и интересным. :heart:"
     summary:
       enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества."
@@ -1919,30 +1922,30 @@ ru:
       leave: "Покинуть"
       remove_group: "Удалить группу"
       remove_user: "Удалить пользователя"
-    email: "Email"
+    email: "Эл. почта"
     username: "Псевдоним"
-    last_seen: "Был"
+    last_seen: "Был(-а)"
     created: "Создан"
     created_lowercase: "создано"
     trust_level: "Уровень доверия"
-    search_hint: "Псевдоним, e-mail или IP-адрес"
+    search_hint: "Псевдоним, эл. почта или IP-адрес"
     create_account:
       header_title: "Добро пожаловать!"
       subheader_title: "Давайте создадим вашу учётную запись"
       disclaimer: "Регистрируясь, вы соглашаетесь с <a href='%{privacy_link}' target='blank'>политикой конфиденциальности</a> и <a href='%{tos_link}' target='blank'> условиями предоставления услуг</a>."
       title: "Создать учётную запись"
-      failed: "Произошла ошибка. Возможно, этот Email уже используется. Попробуйте восстановить пароль"
+      failed: "Произошла ошибка. Возможно, эта эл. почта уже используется. Попробуйте восстановить пароль"
       associate: "Уже есть учётная запись? <a href='%{associate_link}'>Войдите в систему</a> для привязки вашей учётной записи %{provider}."
     forgot_password:
       title: "Сброс пароля"
-      action: "Я забыл свой пароль"
+      action: "Я забыл(-а) свой пароль"
       invite: "Введите ваш псевдоним или адрес электронной почты, и мы отправим вам ссылку для сброса пароля."
       invite_no_username: "Введите ваш адрес электронной почты, и мы отправим вам ссылку для сброса пароля."
       reset: "Сброс пароля"
       complete_username: "Если учётная запись совпадает с псевдонимом <b>%{username}</b>, вы скоро получите письмо с инструкциями о том, как сбросить пароль."
       complete_email: "Если учётная запись совпадает с <b>%{email}</b>, вы должны получить письмо с инструкциями о том, как сбросить ваш пароль."
       complete_username_found: "Мы нашли учётную запись, которая соответствует псевдониму <b>%{username}</b>. Вы должны получить письмо с инструкциями о том, как сбросить пароль."
-      complete_email_found: "Мы нашли аккаунт, который соответствует <b>%{email}</b>. Вы должны получить письмо с инструкциями о том, как сбросить пароль."
+      complete_email_found: "Мы нашли учётную запись, которая соответствует <b>%{email}</b>. Вы должны получить письмо с инструкциями о том, как сбросить пароль."
       complete_username_not_found: "Не найдено учётной записи с псевдонимом <b>%{username}</b>"
       complete_email_not_found: "Не найдено учётной записи с адресом электронной почты <b>%{email}</b>"
       help: "Электронное письмо не доходит? Для начала проверьте папку «Спам» вашего почтового ящика. <p>Не уверены в том, какой адрес использовали? Введите его и мы подскажем, есть ли он в нашей базе.</p><p>Если вы более не имеете доступа к связанному с вашей учётной записью адресу электронной почты, то, пожалуйста, свяжитесь с <a href='%{basePath}/about'>администрацией.</a></p>"
@@ -1954,11 +1957,11 @@ ru:
       login_link: "Пропустить пароль; выслать мне ссылку для входа"
       emoji: "lock emoji"
       complete_username: "Если учётная запись совпадает с именем пользователя <b>%{username}</b>, вы должны в ближайшее время получить электронное письмо со ссылкой для входа в систему."
-      complete_email: "Если данные аккаунта совпадают с <b>%{email}</b>, вы должны в ближайшее время получить электронное письмо со ссылкой для входа в систему."
+      complete_email: "Если данные учётной записи совпадают с <b>%{email}</b>, вы должны в ближайшее время получить электронное письмо со ссылкой для входа в систему."
       complete_username_found: "Мы нашли учётную запись, которая соответствует имени пользователя <b>%{username}</b>, в ближайшее время вы получите электронное письмо со ссылкой для входа."
       complete_email_found: "Мы нашли учётную запись, которая соответствует <b>%{email}</b>, в ближайшее время вы получите электронное письмо со ссылкой для входа."
       complete_username_not_found: "Ни одна учётная запись не соответствует имени пользователя <b>%{username}</b>"
-      complete_email_not_found: "Нет совпадений аккаунта по адресу <b>%{email}</b>"
+      complete_email_not_found: "Нет совпадений учётных записей по адресу <b>%{email}</b>"
       confirm_title: Перейти на %{site_name}
       logging_in_as: Войти как %{email}
       confirm_button: Завершить вход
@@ -1985,8 +1988,8 @@ ru:
       error: "Неизвестная ошибка"
       cookies_error: "Похоже, что в вашем браузере выключены куки. Скорее всего вы не сможете войти на сайт, пока не включите куки."
       rate_limit: "Сделайте перерыв перед очередной попыткой входа."
-      blank_username: "Введите ваш e-mail или псевдоним."
-      blank_username_or_password: "Введите ваш e-mail (или псевдоним) и пароль."
+      blank_username: "Введите вашу эл. почту или псевдоним."
+      blank_username_or_password: "Введите вашу эл. почту или псевдоним и пароль."
       reset_password: "Сброс пароля"
       logging_in: "Вход..."
       or: "или"
@@ -2033,7 +2036,7 @@ ru:
         title: "Войти через Discord"
         sr_title: "Войти через Discord"
       second_factor_toggle:
-        totp: "Вместо этого используйте приложение для проверки подлинности"
+        totp: "Использовать аутентификацию через приложение"
         backup_code: "Использовать резервный код"
         security_key: "Использовать ключ безопасности"
     invites:
@@ -2042,9 +2045,9 @@ ru:
       welcome_to: "Добро пожаловать на %{site_name}!"
       invited_by: "Вы были приглашены пользователем"
       social_login_available: "Вы также сможете входить через социальные сети, используя этот адрес электронной почты."
-      your_email: "Электронный адрес вашего аккаунта: <b>%{email}</b>."
+      your_email: "Электронный адрес вашей учётной записи: <b>%{email}</b>."
       accept_invite: "Принять приглашение"
-      success: "Ваш аккаунт создан и теперь вы можете войти."
+      success: "Ваша учётная запись создана и теперь вы можете войти."
       name_label: "Имя"
       password_label: "Пароль"
     password_reset:
@@ -2121,7 +2124,7 @@ ru:
       from: От
       to: Кому
     emoji_picker:
-      filter_placeholder: Поиск эмодзи
+      filter_placeholder: Поиск смайла
       smileys_&_emotion: Смайлики и эмоции
       people_&_body: Люди и части тел
       animals_&_nature: Животные и природа
@@ -2906,7 +2909,7 @@ ru:
       notifications:
         title: Изменить частоту уведомлений об этой теме
         reasons:
-          mailing_list_mode: "Вы включили режим почтовой рассылки, поэтому Вы будете получать уведомления об ответах в этой теме через e-mail."
+          mailing_list_mode: "Вы включили режим почтовой рассылки, поэтому Вы будете получать уведомления об ответах в этой теме через эл. почту."
           "3_10": "Вы будете получать уведомления, поскольку наблюдаете за тегом этой темы."
           "3_10_stale": "Вы будете получать уведомления, поскольку ранее пометили эту тему наблюдающим тегом."
           "3_6": "Вы будете получать уведомления, поскольку наблюдаете за этим разделом."
@@ -2921,7 +2924,7 @@ ru:
           "2_2": "Вы увидите количество новых ответов, поскольку следите за этой темой."
           "2": 'Вы увидите количество новых ответов, потому что <a href="%{basePath}/u/%{username}/preferences/notifications">прочитали эту тему</a>.'
           "1_2": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
-          "1": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
+          "1": "Вы будете получать уведомления, если кто-то упомянет ваш @name (псевдоним) или ответит вам."
           "0_7": "Не получать уведомлений из этого раздела."
           "0_2": "Не получать уведомлений по этой теме."
           "0": "Не получать уведомлений по этой теме."
@@ -2933,7 +2936,7 @@ ru:
           description: "Уведомлять по каждому новому сообщению в этой теме и показывать счётчик новых непрочитанных ответов."
         tracking_pm:
           title: "Следить"
-          description: "Количество непрочитанных сообщений появится рядом с этим сообщением. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение."
+          description: "Количество непрочитанных сообщений появится рядом с этим сообщением. Вам придёт уведомление, только если кто-нибудь упомянет ваш @name (псевдоним) или ответит на ваше сообщение."
         tracking:
           title: "Следить"
           description: "Количество непрочитанных сообщений появится рядом с названием этой темы. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение."
@@ -3037,7 +3040,7 @@ ru:
       invite_private:
         title: "Пригласить в беседу"
         email_or_username: "Укажите адрес электронной почты или псевдоним того, кого вы хотите пригласить:"
-        email_or_username_placeholder: "Email или псевдоним"
+        email_or_username_placeholder: "Эл. почта или псевдоним"
         action: "Пригласить"
         success: "Мы пригласили этого пользователя принять участие в беседе."
         success_group: "Мы пригласили эту группу принять участие в беседе."
@@ -3049,10 +3052,10 @@ ru:
         title: "Пригласить"
         username_placeholder: "Псевдоним"
         action: "Отправить приглашение"
-        help: "Пригласить других в эту тему с помощью Еmail или уведомлений"
+        help: "Пригласить других в эту тему с помощью эл. почты или уведомлений"
         to_forum: "Мы отправим короткое электронное сообщение, позволяющее вашему другу быстро присоединиться к обсуждению, просто перейдя по ссылке."
         discourse_connect_enabled: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему."
-        to_topic_blank: "Введите псевдоним или Email пользователя, которого вы хотите пригласить в эту тему."
+        to_topic_blank: "Введите псевдоним или эл. почту пользователя, которого вы хотите пригласить в эту тему."
         to_topic_email: "Вы указали адрес электронной почты. Мы отправим приглашение, которое позволит вашему другу немедленно ответить в этой теме."
         to_topic_username: "Вы указали псевдоним пользователя. Мы отправим ему уведомление со ссылкой, чтобы пригласить его в эту тему."
         to_username: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему. Мы отправим ему уведомление о том, что вы приглашаете его присоединиться к этой теме."
@@ -3463,6 +3466,7 @@ ru:
       all: "Все разделы"
       choose: "Выберите раздел&hellip;"
       edit: "Изменить"
+      edit_title: "Редактировать раздел"
       edit_dialog_title: "Редактировать: %{categoryName}"
       view: "Просмотр тем по разделам"
       back: "Вернуться в раздел"
@@ -3603,9 +3607,9 @@ ru:
         general: "Основные"
         moderation: "Модерация"
         appearance: "Внешний вид"
-        email: "Email"
+        email: "Эл. почта"
       list_filters:
-        all: "Все темы"
+        all: "Все непрочитанные темы"
         none: "Без подразделов"
       colors_disabled: "Вы не можете выбирать цвета, поскольку не указан стиль раздела."
     flagging:
@@ -3664,14 +3668,14 @@ ru:
       title: "Сводка по теме"
       participants_title: "Частые авторы"
       links_title: "Популярные ссылки"
-      links_shown: "Показать все ссылки..."
+      links_shown: "Отобразить все ссылки..."
       clicks:
         one: "%{count} клик"
         few: "%{count} клика"
         many: "%{count} кликов"
         other: "%{count} кликов"
     post_links:
-      about: "Отобразить все ссылки"
+      about: "Отобразить все ссылающиеся сообщения"
       title:
         one: "ещё %{count}"
         few: "ещё %{count}"
@@ -4121,7 +4125,7 @@ ru:
         visible_only_to_groups: "Теги видны только указанным группам"
         cannot_save: "Невозможно сохранить группу тегов. Убедитесь, что выбран хотя бы один тег, указано название группы тегов, и указаны соответствующие группы, если выбрано ограничение по использованию тегов."
         tags_placeholder: "Найти или создать тег"
-        parent_tag_placeholder: "Опционально"
+        parent_tag_placeholder: "Необязательно"
         select_groups_placeholder: "Выберите группы..."
         disabled: "Теги отключены. "
       topics:
@@ -4166,7 +4170,7 @@ ru:
         newuser: "Новичок"
         basic: "Обычный пользователь"
         member: "Участник"
-        regular: "Активный"
+        regular: "Активный(-ая)"
         leader: "Лидер"
       detailed_name: "%{level}: %{name}"
     pick_files_button:
@@ -4194,10 +4198,10 @@ ru:
     fullscreen_table:
       expand_btn: "Развернуть таблицу"
     second_factor_auth:
-      redirect_after_success: "Проверка подлинности второго фактора прошла успешно. Перенаправление на предыдущую страницу…"
+      redirect_after_success: "Двухфакторная аутентификация прошла успешно. Перенаправление на предыдущую страницу…"
     sidebar:
       unread_count:
-        one: "%{count} непрочитанная"
+        one: "Непрочитанных: %{count}"
         few: "%{count} непрочитанных"
         many: "%{count} непрочитанных"
         other: "%{count} непрочитанных"
@@ -4398,9 +4402,9 @@ ru:
             blank: "Название группы не может быть пустым"
         manage:
           interaction:
-            email: Email
+            email: Эл. почта
             incoming_email: "Специальный адрес для входящих писем"
-            incoming_email_placeholder: "Введите адрес Email"
+            incoming_email_placeholder: "Введите адрес эл. почты"
             visibility: Видимость
             visibility_levels:
               title: "Кто может видеть эту группу?"
@@ -4983,8 +4987,8 @@ ru:
           warning: "Это повлияет на соответствующие настройки сайта."
           overridden: Изменены стандартные настройки в файле robots.txt.
         email_style:
-          title: "Стиль Email"
-          heading: "Настройка стиля Email"
+          title: "Стиль эл. письма"
+          heading: "Настройка стиля эл. письма"
           html: "HTML-шаблон"
           css: "CSS"
           reset: "Сбросить на значения по умолчанию"
@@ -5017,7 +5021,7 @@ ru:
         email_type: "Тип письма"
         details_title: "Показать данные электронной почты"
         to_address: "Адресат"
-        test_email_address: "Email-адрес тестового письма"
+        test_email_address: "Эл. адрес тестового письма"
         send_test: "Отправить тестовое письмо"
         sent_test: "Отправлено!"
         delivery_method: "Метод отправки"
@@ -5050,9 +5054,9 @@ ru:
             body: "Тело"
             rejection_message: "Письмо отклонения"
           filters:
-            from_placeholder: "from@gsp-example.com"
-            to_placeholder: "to@gsp-example.com"
-            cc_placeholder: "cc@gsp-example.com"
+            from_placeholder: "от@gsp-пример.ком"
+            to_placeholder: "для@gsp-пример.ком"
+            cc_placeholder: "cc@gsp-пример.ком"
             subject_placeholder: "Заголовок..."
             error_placeholder: "Ошибка"
         logs:
@@ -5060,7 +5064,7 @@ ru:
           filters:
             title: "Фильтр"
             user_placeholder: "Псевдоним"
-            address_placeholder: "name@gsp-example.com"
+            address_placeholder: "имя@gsp-пример.ком"
             type_placeholder: "дайджест, подписка..."
             reply_key_placeholder: "Ключ ответа"
             smtp_transaction_response_placeholder: "SMTP ID"
@@ -5121,7 +5125,7 @@ ru:
             removed_unsuspend_user: "Удаление размороженного пользователя"
             grant_badge: "Выдача награды"
             revoke_badge: "Отзыв награды"
-            check_email: "Доступ к адресу e-mail"
+            check_email: "Доступ к адресу эл. почты"
             delete_topic: "Удаление темы"
             recover_topic: "Восстановление удалённой темы"
             delete_post: "Удаление сообщения"
@@ -5143,7 +5147,7 @@ ru:
             deleted_tag: "Удаление тега"
             deleted_unused_tags: "Удаление неиспользуемых тегов"
             renamed_tag: "Переименование тега"
-            revoke_email: "Отзыв e-mail"
+            revoke_email: "Отозвать эл. письмо"
             lock_trust_level: "Блокировка уровня доверия"
             unlock_trust_level: "Разблокировка уровня доверия"
             activate_user: "Активация пользователя"
@@ -5187,9 +5191,9 @@ ru:
             override_upload_secure_status: "Переопределение статуса защищённой загрузки"
             page_published: "Публикация страницы"
             page_unpublished: "Отмена публикации страницы"
-            add_email: "Добавление адреса e-mail"
-            update_email: "Обновление адреса e-mail"
-            destroy_email: "Удаление e-mail"
+            add_email: "Добавление адреса эл. почты"
+            update_email: "Обновление адреса эл. почты"
+            destroy_email: "Удаление эл. почты"
             topic_closed: "Закрытие темы"
             topic_opened: "Открытие темы"
             topic_archived: "Архивация темы"
@@ -5306,8 +5310,8 @@ ru:
         not_found: "К сожалению, такой псевдоним не зарегистрирован."
         id_not_found: "К сожалению, этот пользователь не зарегистрирован."
         active: "Активирован"
-        show_emails: "Показать адреса Email"
-        hide_emails: "Скрыть адреса Email"
+        show_emails: "Показать адреса эл. почты"
+        hide_emails: "Скрыть адреса эл. почты"
         nav:
           new: "Новые"
           active: "Активные"
@@ -5333,7 +5337,7 @@ ru:
           staged: "Сымитированные пользователи"
         not_verified: "Непроверенные"
         check_email:
-          title: "Показать e-mail этого пользователя"
+          title: "Показать эл. почту этого пользователя"
           text: "Показать"
         check_sso:
           title: "Показать полезную нагрузку SSO"
@@ -5494,7 +5498,7 @@ ru:
           other: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений. (Настройка delete_all_posts_max.)"
         delete_confirm_title: "Вы ДЕЙСТВИТЕЛЬНО хотите удалить этого пользователя? Этот пользователь будет удалён безвозвратно!"
         delete_confirm: "Как правило, предпочтительнее анонимизировать пользователей, а не удалять их, чтобы избежать удаления контента из существующих обсуждений."
-        delete_and_block: "Удалить и <b>заблокировать</b> этот Email и IP-адрес"
+        delete_and_block: "Удалить и <b>заблокировать</b> эту эл. почту и IP-адрес"
         delete_dont_block: "Только удалить"
         deleting_user: "Удаление пользователя ..."
         deleted: "Пользователь удалён."
@@ -5515,7 +5519,7 @@ ru:
           label: "Сбросить"
           title: "сбросить карму к 0"
         visit_profile: "Посетите <a href='%{url}'> страницу настроек этого пользователя</a>, чтобы отредактировать его профиль"
-        deactivate_explanation: "Деактивированный пользователь должен заново подтвердить свой Email."
+        deactivate_explanation: "Выключенный пользователь должен заново подтвердить свою эл. почту."
         suspended_explanation: "Замороженный пользователь не может войти в систему."
         silence_explanation: "Заблокированный пользователь не может создавать темы или отвечать на сообщения."
         staged_explanation: "Сымитированный пользователь может отправлять сообщения только по электронной почте и только в определённые темы."
@@ -5798,7 +5802,7 @@ ru:
       embedding:
         get_started: "Для встраивания на другой сайт необходимо добавить соответствующий хост."
         confirm_delete: "Вы действительно хотите удалить это поле?"
-        sample: "Используйте следующий HTML-код на своём сайте для создания связанных тем. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, в которую производится встраивание."
+        sample: "Используйте следующий HTML-код на своём сайте для создания и встраивания тем Discourse. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, в которую производится встраивание."
         title: "Встраивание"
         host: "Разрешённые хосты"
         class_name: "Имя класса"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 2a43c7abb6..4d8be59a13 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -824,6 +824,7 @@ sv:
         group_type: "Grupptyper"
         is_group_user: "Medlem"
         is_group_owner: "Ägare"
+        search_results: "Sökresultat kommer att visas nedan."
       title:
         one: "Grupp"
         other: "Grupper"
@@ -858,6 +859,7 @@ sv:
         no_filter_matches: "Inga medlemmar matchar den sökningen."
       topics: "Ämnen"
       posts: "Inlägg"
+      aria_post_number: "%{title} - inlägg #%{postNumber}"
       mentions: "Omnämnanden"
       messages: "Meddelanden"
       notification_level: "Standardaviseringsnivå för gruppmeddelanden"
@@ -1084,6 +1086,7 @@ sv:
         not_first_time: "Är det inte din första gång?"
         skip_link: "Hoppa över dessa tips"
         read_later: "Jag läser det senare."
+      reset_seen_popups: "Visa nybörjartips igen"
       theme_default_on_all_devices: "Gör detta till standardtema för alla mina enheter"
       color_scheme_default_on_all_devices: "Ange standardfärgschema(n) för alla mina enheter"
       color_scheme: "Färgschema"
@@ -1103,13 +1106,16 @@ sv:
       enable_quoting: "Aktivera citatsvar för markerad text"
       enable_defer: "Aktivera fördröjning för att markera ämnen som lästa"
       experimental_sidebar:
+        enable: "Aktivera sidofältet"
         options: "Alternativ"
         categories_section: "Sektion Kategorier"
         categories_section_instruction: "Valda kategorier kommer att visas under sidofältets kategorisektion."
         tags_section: "Sektion Taggar"
         tags_section_instruction: "Valda taggar kommer att visas under sidofältets tagg-sektion."
         navigation_section: "Navigering"
+        list_destination_instruction: "När jag klickar på en länk till en ämneslista i sidofältet med nya eller olästa ämnen kommer jag till"
         list_destination_default: "Standard"
+        list_destination_unread_new: "Nya/olästa"
       change: "ändra"
       featured_topic: "Utvalt ämne"
       moderator: "%{user} är en moderator"
@@ -1280,6 +1286,8 @@ sv:
         edit: "Redigera"
         edit_title: "Redigera autentisering"
         edit_description: "Autentiseringsnamn"
+        enable_security_key_description: |
+          När du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">maskinvarusäkerhetsnyckel</a> eller kompatibel mobil enhet till hands, tryck på registrera-knappen nedan.
         totp:
           title: "Bevisbaserad autentisering"
           add: "Lägg till autentisering"
@@ -1287,12 +1295,16 @@ sv:
           name_and_code_required_error: "Du måste ange ett namn samt koden från din app för autentisering."
         security_key:
           register: "Registrera"
+          title: "Fysiska säkerhetsnycklar"
+          add: "Lägg till fysisk säkerhetsnyckel"
           default_name: "Huvudsäkerhetsnyckel"
           iphone_default_name: "iPhone"
           android_default_name: "Android"
           not_allowed_error: "Registreringsprocessen för säkerhetsnyckel dröjde antingen för länge eller avbröts."
           already_added_error: "Du har redan registrerat denna säkerhetsnyckel.\nDu behöver inte registrera den igen."
+          edit: "Redigera fysisk säkerhetsnyckel"
           save: "Spara"
+          edit_description: "Namn på fysisk säkerhetsnyckel"
           name_required_error: "Du måste ge din säkerhetsnyckel ett namn."
       change_about:
         title: "Ändra Om mig"
@@ -1819,6 +1831,7 @@ sv:
       second_factor_backup_title: "Tvåfaktorsreserv"
       second_factor_backup_description: "Ange en av dina reservkoder:"
       second_factor: "Logga in via autentiseringsappen"
+      security_key_description: "När du har din fysiska säkerhetsnyckel eller kompatibla mobil enhet beredd, tryck på knappen Autentisera med knappen Säkerhetsnyckel nedanför."
       security_key_alternative: "Prova ett annat sätt"
       security_key_authenticate: "Autentisera med säkerhetsnyckel"
       security_key_not_allowed_error: "Processen för autentiseringssäkerhetsnyckel dröjde antingen för länge eller avbröts."
@@ -2937,6 +2950,7 @@ sv:
       gap:
         one: "visa %{count} dolt svar"
         other: "visa %{count} dolda svar"
+      sr_reply_to: "Svara på inlägg #%{post_number} av @%{username}"
       notice:
         new_user: "Detta är första gången som användaren %{user} har skapat ett inlägg — låt oss välkomna hen till vår gemenskap!"
         returning_user: "Det var ett tag sedan vi såg %{user} — senaste inlägget gjordes %{time}."
@@ -3150,6 +3164,7 @@ sv:
       all: "Alla kategorier"
       choose: "kategori&hellip;"
       edit: "Redigera"
+      edit_title: "Redigera denna kategori"
       edit_dialog_title: "Ändra: %{categoryName}"
       view: "Visa ämnen i kategori"
       back: "Tillbaka till kategorin"
@@ -3856,11 +3871,13 @@ sv:
           click_to_get_started: "Klicka här för att komma igång."
           header_link_text: "Taggar"
           header_action_title: "redigera sidofältets taggar"
+          configure_defaults: "Konfigurera standardvärden"
         categories:
           none: "Du har inte lagt till några kategorier."
           click_to_get_started: "Klicka här för att komma igång."
           header_link_text: "Kategorier"
           header_action_title: "redigera sidofältets kategorier"
+          configure_defaults: "Konfigurera standardvärden"
         community:
           header_link_text: "Community"
           header_action_title: "skapa ett nytt ämne"
@@ -5405,7 +5422,7 @@ sv:
       embedding:
         get_started: "Börja genom att lägga till värden, om du vill bädda in Discourse på en annan hemsida. "
         confirm_delete: "Är du säker på att du vill ta bort värden?"
-        sample: "Klistra in följande HTML-kod på din webbplats för att skapa och bädda in discourse-ämnen. Byt ut <b>REPLACE_ME</b> mot den vägledande URL-en för sidan som du bäddar in den i."
+        sample: "Klistra in följande HTML-kod på din webbplats för att skapa och bädda in Discourse-ämnen. Byt ut <b>REPLACE_ME</b> mot den vägledande URL-en för sidan som du bäddar in den i."
         title: "Inbäddning"
         host: "Tillåtna värdar"
         class_name: "Klassnamn"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 6a71b2fc89..b9e8fb78a4 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -806,6 +806,7 @@ tr_TR:
         group_type: "Grup türü"
         is_group_user: "Üye"
         is_group_owner: "Sahip"
+        search_results: "Arama sonuçları aşağıda görünecektir."
       title:
         one: "Gruplar"
         other: "Gruplar"
@@ -840,6 +841,7 @@ tr_TR:
         no_filter_matches: "Bu aramayla eşleşen üye yok."
       topics: "Konular"
       posts: "Gönderiler"
+      aria_post_number: "%{title} - gönderi #%{postNumber}"
       mentions: "Bahsedilenler"
       messages: "İletiler"
       notification_level: "Grup iletileri için varsayılan bildirim düzeyi"
@@ -1064,6 +1066,7 @@ tr_TR:
         not_first_time: "İlk defa değil mi?"
         skip_link: "İpuçlarını atla"
         read_later: "Daha sonra okuyacağım."
+      reset_seen_popups: "İlk katılım ipuçlarını tekrar göster"
       theme_default_on_all_devices: "Bu temayı bütün cihazlarımda varsayılan yap"
       color_scheme_default_on_all_devices: "Tüm cihazlarımda varsayılan renk düzen(ler)ini ayarla"
       color_scheme: "Renk uyumu"
@@ -3065,6 +3068,7 @@ tr_TR:
       all: "Tüm kategoriler"
       choose: "kategori&hellip;"
       edit: "Düzenle"
+      edit_title: "Bu kategoriyi düzenle"
       edit_dialog_title: "Düzenle: %{categoryName}"
       view: "Bu Kategorideki Konuları Görüntüle"
       back: "Kategoriye dön"
@@ -5280,6 +5284,7 @@ tr_TR:
       embedding:
         get_started: "Eğer Discourse'u başka bir web sitesine yerleştirmek istiyorsan bu sitenin sunucusunu ekleyerek başla."
         confirm_delete: "Bu sunucuyu silmek istediğine emin misin?"
+        sample: "Discourse konuları oluşturmak ve gömmek için aşağıdaki HTML kodunu sitenize yapıştırın. <b>REPLACE_ME</b> kısmını, gömdüğünüz sayfanın standart URL'si ile değiştirin."
         title: "Yerleştirme"
         host: "İzin Verilen Sunucular"
         class_name: "Sınıf adı"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 3606bbfbb2..6a9e87ef01 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -5762,7 +5762,6 @@ uk:
       embedding:
         get_started: "Для вбудовування на Інший сайт необхідно додати відповідний хост."
         confirm_delete: "Ви впевнені, що хочете видалити цей хост?"
-        sample: "Використовуйте наступний HTML-код на своєму сайті, для створення пов’язаних тем. Замініть <b>REPLACE_ME</b> канонічним посиланням сторінки, в яку проводиться вбудовування."
         title: "Взаємодія"
         host: "Дозволені Хости"
         class_name: "Назва класу"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 91b490f1f2..bfe2ddb846 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -5169,7 +5169,6 @@ ur:
       embedding:
         get_started: "اگر آپ ڈِسکورس کو ایک اور ویب سائٹ پر اَیمبَیڈ کرنا چاہتے ہیں، تو ہوسٹ شامل کر کے شروع کریں۔"
         confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
-        sample: "گفتگو کے عنوانات کو تخلیق اور شامل کرنے کے لیے درج ذیل HTML کوڈ کو اپنی سائٹ میں چسپاں کریں۔ <b>REPLACE_ME</b> کو اس صفحہ کے کینونیکل URL سے بدل دیں جس پر آپ اسے شامل کر رہے ہیں۔"
         title: "اَیمبَیڈ کرنا"
         host: "اجازت یافتہ ہَوسٹ"
         class_name: "کلاس کا نام"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 709fee31f5..8ace446bba 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -5085,7 +5085,6 @@ vi:
       embedding:
         get_started: "Nếu bạn muốn nhúng Discourse trên một website khác, bắt đầu bằng cách thêm host."
         confirm_delete: "Bạn muốn xóa host này?"
-        sample: "Dán mã HTML sau vào trang web của bạn để tạo và nhúng các chủ đề diễn ngôn. Thay thế <b>REPLACE_ME</b> bằng URL chuẩn của trang mà bạn đang nhúng nó vào."
         title: "Nhúng"
         host: "Cho phép Host"
         class_name: "Tên lớp"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index f7e63f3688..29699e65d8 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -3643,7 +3643,7 @@ zh_CN:
     fullscreen_table:
       expand_btn: "展开表"
     second_factor_auth:
-      redirect_after_success: "第二重认证验证成功。正在重定向到之前的页面…"
+      redirect_after_success: "第二重身份验证成功。正在重定向到之前的页面…"
     sidebar:
       unread_count:
         other: "%{count} 未读"
@@ -5207,7 +5207,6 @@ zh_CN:
       embedding:
         get_started: "如果您想将 Discourse 嵌入另一个网站，请先添加其主机。"
         confirm_delete: "确定要删除该主机吗？"
-        sample: "将以下 HTML 代码粘贴到您的站点中以创建和嵌入 Discourse 话题。将 <b>REPLACE_ME</b> 替换为您要嵌入它的页面的规范 URL。"
         title: "嵌入"
         host: "允许的主机"
         class_name: "类名"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index eb7faded6a..28d94f690d 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -160,6 +160,7 @@ zh_TW:
       other: "為了讓您更輕鬆地建設網站，您正處於初始模式。將會自動授予所有新註冊的使用者信任等級 1，並自動啟用每日摘要電子郵件。該功能將於 %{count} 個使用者註冊後自動關閉。"
     bootstrap_mode_disabled: "初始模式將會在 24 小時後自動禁用。"
     bootstrap_invite_button_title: "送出邀請"
+    bootstrap_wizard_link_title: "完成安裝精靈"
     themes:
       default_description: "預設"
       broken_theme_alert: "您的網站可能無法運行，因為主題/組件有錯誤。"
@@ -937,11 +938,13 @@ zh_TW:
       first_notification: "你的第一則通知！選擇以開始。"
       dynamic_favicon: "在瀏覽器小圖示上顯示計數\\bIcon"
       skip_new_user_tips:
+        description: "跳過新使用者登入時的提示和徽章"
         skip_link: "跳過這些提示"
       theme_default_on_all_devices: "在所有裝置上設為預設佈景主題"
       color_scheme: "色彩配置"
       color_schemes:
         default_description: "預設佈景主題"
+        dark_instructions: "您可以透過切換您設備的深色模式來預覽深色模式的配色方案。"
         undo: "重置"
         regular: "普通"
         dark: "夜間模式"
@@ -1014,6 +1017,7 @@ zh_TW:
       users: "使用者"
       muted_users: "靜音"
       allowed_pm_users: "允許的"
+      allow_private_messages_from_specific_users: "只允許指定的使用者寄送個人訊息給我"
       ignored_users: "忽略"
       tracked_topics_link: "顯示"
       automatically_unpin_topics: "當我完整閲讀了話題時自動解除置頂。"
@@ -1084,6 +1088,8 @@ zh_TW:
           title: "已產生備用碼"
           description: "每個備用碼僅可使用一次。請將它們保存在安全且可被找到的地方。"
       second_factor:
+        title: "兩步驟驗證"
+        enable: "管理兩步驟驗證"
         confirm_password_description: "請確認你的密碼以繼續"
         name: "名稱"
         label: "代碼"
@@ -1128,9 +1134,14 @@ zh_TW:
         uploaded_avatar_empty: "新增一張自訂圖片"
         upload_title: "上傳你的圖片"
         image_is_not_a_square: "警告：我們裁切了你的圖片，因為該圖片不是正方形的。"
+      change_profile_background:
+        title: "個人檔案標頭"
+        instructions: "個人檔案標頭將會置中以及預設1110px的寬度。"
       change_card_background:
         title: "使用者卡背景"
         instructions: "背景會被置中，且默認寬度為850px。"
+      change_featured_topic:
+        instructions: "此主題的連結將顯示您的使用者卡和個人檔案上。"
       email:
         title: "電子郵件"
         primary: "主要電子郵件"
@@ -1234,9 +1245,11 @@ zh_TW:
         every_month: "每個月"
         every_six_months: "每半年"
       email_level:
+        title: "當我被引用、回覆、提到我的 @username，或者我看過的類別、標籤或主題中有新的活動時，請寄電子郵件給我"
         always: "總是"
         only_when_away: "只在離開時"
         never: "永不"
+      email_messages_level: "當我收到個人訊息時，請寄電子郵件給我"
       include_tl0_in_digests: "摘要郵件中包含新使用者的內容"
       email_in_reply_to: "郵件中包含回覆你的內容節選"
       other_settings: "其它"
@@ -1265,6 +1278,7 @@ zh_TW:
         title: "邀請"
         pending_tab: "等待中"
         pending_tab_with_count: "等待中 (%{count})"
+        expired_tab: "已過期"
         redeemed_tab: "接受日期"
         redeemed_tab_with_count: "接受日期 (%{count})"
         invited_via: "邀請函"
@@ -1286,6 +1300,7 @@ zh_TW:
         topics_entered: "參與的話題"
         posts_read_count: "已讀的貼文"
         expired: "此邀請已過期"
+        remove_all: "刪除過期的邀請"
         removed_all: "已移除所有過期的邀請！"
         remove_all_confirm: "您是否確定要移除所有過期的邀請？"
         reinvite_all_confirm: "您確定要重新寄出所有邀請嗎?"
@@ -1297,6 +1312,7 @@ zh_TW:
         invite_link:
           success: "邀請連結生成成功！"
         bulk_invite:
+          none: "此頁面上沒有邀請函顯示。"
           error: "上傳的檔案必須是 csv 格式。"
       password:
         title: "密碼"
@@ -1357,6 +1373,9 @@ zh_TW:
         none: "(無)"
       flair:
         none: "(無)"
+      status:
+        title: "自訂狀態"
+        not_set: "未設定"
       primary_group:
         title: "主要群組"
         none: "(無)"
@@ -1443,6 +1462,7 @@ zh_TW:
     search_hint: "使用者名稱、電子郵件、或是IP位址"
     create_account:
       header_title: "歡迎!"
+      disclaimer: "註冊即表示您同意 <a href='%{privacy_link}' target='blank'>隱私政策</a> 和 <a href='%{tos_link}' target='blank'>服務條款</a>。"
       failed: "發生了某些錯誤，可能此電子郵件地址已經註冊過，請試試看忘記密碼連結"
     forgot_password:
       title: "寄出密碼"
@@ -1596,6 +1616,7 @@ zh_TW:
       similar_topics: "與你的話題類似的討論..."
       drafts_offline: "離線草稿"
       edit_conflict: "編輯衝突"
+      esc: "退出"
       group_mentioned_limit:
         other: "<b>提醒</b>你提及了<a href='%{group_link}'>%{group}</a>，但此群組的人數多於管理員配置的提及人數上限（%{count}位），因此不會有任何人收到通知。"
       group_mentioned:
@@ -1941,12 +1962,17 @@ zh_TW:
       read_more_in_category: "要閱讀更多貼文嗎? 瀏覽 %{catLink} 裡的話題或 %{latestLink}。"
       read_more: "要閱讀更多貼文嗎? 請按 %{catLink} 或 %{latestLink}。"
       browse_all_categories: 瀏覽所有分類
+      browse_all_tags: 瀏覽所有標籤
       view_latest_topics: 檢視最近的貼文
+      suggest_create_topic: 準備好 <a href>開始新的對話了嗎？</a>
       jump_reply_up: 跳到更早的回覆
       jump_reply_down: 跳到更晚的回覆
       deleted: "此話題已被刪除"
       slow_mode_update:
+        title: "慢速模式"
+        select: "使用者在本主題的發文頻率限制："
         enable: "啟用"
+        enabled_until: "啟用直到："
         remove: "停用"
       topic_status_update:
         title: "話題計時器"
@@ -2046,11 +2072,14 @@ zh_TW:
         open: "開放話題"
         close: "關閉話題"
         multi_select: "選擇貼文"
+        slow_mode: "設定慢速模式..."
         timed_update: "設定話題計時器"
         pin: "置頂話題"
         unpin: "取消置頂話題"
         unarchive: "復原已封存的話題"
         archive: "封存話題"
+        invisible: "隱藏主題"
+        visible: "顯示主題"
         reset_read: "重置讀取資料"
         make_private: "設置為私訊"
         reset_bump_date: "重設上浮日期"
@@ -2349,6 +2378,7 @@ zh_TW:
       edit: "編輯"
       edit_dialog_title: "編輯：%{categoryName}"
       view: "檢視分類裡的話題"
+      back: "回到類別"
       general: "一般"
       settings: "設定"
       topic_template: "話題範本"
@@ -2771,8 +2801,15 @@ zh_TW:
           title: "靜音"
           description: "你將不會收到這些分類中的新討論話題通知，它們也不會出現在你的未讀欄內。"
       groups:
+        back_btn: "返回所有標籤"
         title: "標籤組"
+        about_heading: "選取一個標籤群組或建立一個新標籤群組"
+        about_description: "標記組可協助您集中管理多個標籤的權限。"
         new: "新標籤組"
+        edit_title: "編輯標籤組"
+        tags_label: "此群組中的標籤"
+        parent_tag_label: "上級標籤："
+        parent_tag_description: "只有當上級標籤存在時，才能使用此群組的標籤。"
         one_per_topic_label: "只可給話題設置一個該組內的標籤"
         new_name: "新標籤組名"
         name_placeholder: "名稱"
@@ -2886,6 +2923,8 @@ zh_TW:
               content: "審核"
               title: "審核"
               pending_count: "剩餘 %{count}"
+    welcome_topic_banner:
+      title: "建立您的歡迎主題"
   admin_js:
     type_to_filter: "輸入要搜尋的文字..."
     admin:
@@ -3405,6 +3444,7 @@ zh_TW:
             name: "愛"
             description: "按讚按鈕的顏色"
         email_style:
+          heading: "自訂電子郵件風格"
           css: "CSS"
       email:
         title: "電子郵件"
@@ -3486,7 +3526,7 @@ zh_TW:
           delete_topic: "話題已被刪除"
           post_approved: "貼文已通過審核"
       logs:
-        title: "記錄"
+        title: "紀錄"
         action: "動作"
         created_at: "已建立"
         last_match_at: "最近出現時間"
@@ -3703,6 +3743,8 @@ zh_TW:
         suspend_reason_hidden_label: "您為何要將該使用者停權？使用者在登入時會看見這段文字，請簡短描述。"
         suspend_reason: "原因"
         suspend_reason_title: "停權原因"
+        suspend_reasons:
+          custom: "自訂..."
         suspend_message: "Email 訊息"
         suspend_message_placeholder: "提供更多停權使用者的原因，並且會以郵件發信給該使用者。（可選）"
         suspended_by: "將其停權者"
@@ -3999,6 +4041,7 @@ zh_TW:
         enabled: 啟用徽章
         icon: 圖示
         image: 圖片
+        read_only_setting_help: "自訂文字"
         query: 徽章查詢語法 (SQL)
         target_posts: 查詢貼文張貼目標
         auto_revoke: 每日執行撤銷用的 SQL 語法
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 5ea048413d..860882692b 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -16,6 +16,7 @@ fi:
       date_only: "%d. %B[ta] %Y"
       long: "%B %-d, %Y, %l.%M%P"
       no_day: "%B %Y"
+      calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
     - null
@@ -60,6 +61,7 @@ fi:
     ember_selector_error: "Valitettavasti #ember- tai .ember-näkymän CSS-valitsimien käyttö ei ole sallittua, koska nämä nimet luodaan dynaamisesti ajon aikana ja ne muuttuvat ajan myötä, mikä johtaa lopulta rikkoutuneeseen CSS:ään. Kokeile toista valitsinta."
     import_error:
       generic: Teeman tuomisessa tapahtui virhe
+      upload: "Virhe luotaessa latausresurssia: %{name}. %{errors}"
       about_json: "Virhe tuotaessa: about.json ei ole olemassa tai ei kelpaa. Oletko varma, että tämä on Discourse-teema?"
       about_json_values: "about.json sisältää virheellisiä arvoja: %{errors}"
       modifier_values: "about.json-tiedoston määreet sisältävät virheellisiä arvoja: %{errors}"
@@ -69,6 +71,7 @@ fi:
       file_too_big: "Purettu tiedosto on liian suuri."
       unknown_file_type: "Lataamasi tiedosto ei näytä olevan kelvollinen Discourse-teema."
       not_allowed_theme: "`%{repo}` ei ole sallittujen teemojen luettelossa (tarkista `allowed_theme_repos` -asetus)."
+      ssh_key_gone: "Odotit liian kauan teeman asentamista, ja SSH-avain vanheni. Yritä uudelleen."
     errors:
       component_no_user_selectable: "Teemakomponentti ei voi olla käyttäjän valittavissa"
       component_no_default: "Teemakomponentti ei voi olla oletusteema"
@@ -125,6 +128,7 @@ fi:
         unsubscribe_not_allowed: "Näin käy, kun tämä käyttäjä ei voi perua tilausta sähköpostitse."
         email_not_allowed: "Näin käy, kun sähköpostiosoite ei ole sallittujen listalla tai on kiellettyjen listalla."
       unrecognized_error: "Tuntematon virhe"
+    secure_uploads_placeholder: "Piilotettu: Tällä sivustolla on suojatut lataukset käytössä, vieraile ketjussa tai katso liitetyt lataukset napsauttamalla Näytä sisältö -painiketta."
     view_redacted_media: "Näytä sisältö"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -163,7 +167,7 @@ fi:
       ip_address_already_screened: "sisältyy jo olemassa olevaan sääntöön"
       restrict_dependent_destroy:
         one: "Tietuetta ei voi poistaa, koska siitä riippuva tietue %{record} on olemassa"
-        other: "Tietuetta ei voi poistaa, koska siitä riippuva tietue %{record} on olemassa"
+        other: "Tietuetta ei voi poistaa, koska siitä riippuvia tietueita %{record} on olemassa"
       too_long:
         one: on liian pitkä (enintään %{count} merkki)
         other: on liian pitkä (enintään %{count} merkkiä)
@@ -194,6 +198,7 @@ fi:
       page_publishing_requirements: "Sivun julkaisua ei voida ottaa käyttöön, jos suojattu media on käytössä."
       s3_backup_requires_s3_settings: "Et voi käyttää S3:a varmuuskopiosijaintina, ellei %{setting_name} ei ole määritetty."
       s3_bucket_reused: "Sama säiliö ei voi olla sekä 's3_upload_bucket' että 's3_backup_bucket'. Valitse eri säiliö tai määritä eri polku jokaiselle säiliölle."
+      secure_uploads_requirements: "S3-lataukset täytyy ottaa käyttöön ennen suojattujen latausten käyttöönottoa."
       share_quote_facebook_requirements: "Facebook-sovellustunnus on määritettävä, jotta lainausten jakaminen Facebookiin on mahdollista."
       second_factor_cannot_enforce_with_socials: "Et voi pakottaa 2FA-asetusta käyttöön, kun yhteisökirjautuminen on aktiivisena. Poista yhteisökirjautuminen käytöstä täällä: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Et voi pakottaa kaksivaiheista tunnistusta, jos paikallinen kirjautuminen on pois käytöstä."
@@ -201,6 +206,10 @@ fi:
       local_login_cannot_be_disabled_if_second_factor_enforced: "Et voi poistaa paikallista kirjautumista käytöstä, jos kaksivaiheinen tunnistus on pakollinen. Kun poistat kaksivaiheisen tunnistuksen pakollisuuden, voit ottaa käyttöön paikallisen kirjautumisen."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Et voi ottaa S3-latauksia käyttöön, koska S3-lataukset ovat käytössä globaalisti, ja käyttöönotto sivustonlaajuisesti voi aiheuttaa kriittisiä latauksiin liittyviä ongelmia"
       cors_origins_should_not_have_trailing_slash: "CORS-poluissa ei tulisi olla kauttaviivaa (/) lopussa."
+      slow_down_crawler_user_agent_must_be_at_least_3_characters: "Käyttäjäagenttien täytyy olla vähintään kolmen merkin pituisia ihmiskäyttäjien 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ä."
+      twitter_summary_large_image_no_svg: "Twitterin yhteenvetokuvat, joita käytetään twitter:image-metatiedoissa, eivät voi olla .svg-kuvia."
     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>'
     onebox:
       invalid_address: "Valitettavasti emme voineet luoda esikatselua tälle verkkosivulle, koska palvelinta '%{hostname}' ei löydy. Esikatselun sijaan viestissä näkyy vain linkki. :cry:"
@@ -221,6 +230,9 @@ fi:
       <p>Jos muistat salasanasi, voit <a href="%{base_url}/login">kirjautua sisään</a>.</p>
 
       <p>Muussa tapauksessa <a href="%{base_url}/password-reset">vaihda salasanasi</a>.</p>
+    not_found_template_link: |
+      <p>Tätä kutsua sivustolle <a href="%{base_url}">%{site_name}</a> ei voa enää käyttää. Pyydä henkilöä, joka kutsui sinut, lähettämään sinulle uusi kutsu.</p>
+    user_exists: "Henkilöä <b>%{email}</b> ei tarvitse kutsua, hänellä on jo tili!"
     invite_exists: "Olet jo lähettänyt kutsun osoitteeseen <b>%{email}</b>."
     invalid_email: "%{email} ei ole kelvollinen sähköpostiosoite."
     rate_limit:
@@ -231,6 +243,11 @@ fi:
     disabled_errors:
       discourse_connect_enabled: "Kutsut on poistettu käytöstä, koska DiscourseConnect on aktiivinen."
       invalid_access: "Sinulla ei ole oikeutta nähdä pyydettyä resurssia."
+    requires_groups: "Kutsua ei tallennettu, koska määritetty ketju ei ole käytettävissä. Lisää jokin seuraavista ryhmistä: %{groups}."
+    domain_not_allowed: "Sähköpostiosoitettasi ei voi käyttää tämän kutsun hyväksymiseen."
+    max_redemptions_allowed_one: "sähköpostikutsuissa pitäisi olla 1."
+    redemption_count_less_than_max: "pitäisi olla vähemmän kuin %{max_redemptions_allowed}."
+    email_xor_domain: "Sähköposti- ja verkkotunnuskenttiä ei sallitta samanaikaisesti"
   bulk_invite:
     file_should_be_csv: "Ladattavan tiedoston tulee olla CSV-muodossa."
     max_rows: "Ensimmäiset %{max_bulk_invites} kutsua lähetettiin. Jaa tiedosto pienempiin osiin."
@@ -240,6 +257,7 @@ fi:
     max_redemptions_limit: "tulisi olla välillä 2–%{max_limit}."
   topic_invite:
     failed_to_invite: "Käyttäjää ei voi kutsua ketjuun, jollei hän ole jonkun näistä ryhmistä jäsen: %{group_names}."
+    not_pm: "Voit kutsua vain yksityisviesteihin."
     user_exists: "Pahoittelut, tämä käyttäjä on jo kutsuttu. Voit kutsua toisen käyttäjän ketjuun vain yhden kerran."
     muted_topic: "Valitettavasti käyttäjä on vaimentanut tämän ketjun."
     receiver_does_not_allow_pm: "Tämä käyttäjä ei salli sinun lähettää hänelle yksityisviestejä."
@@ -256,6 +274,7 @@ fi:
   not_found: "Pyydettyä URL-osoitetta tai resurssia ei löytynyt."
   invalid_access: "Sinulla ei ole oikeutta nähdä pyydettyä resurssia."
   authenticator_not_found: "Todennusmenetelmää ei ole olemassa tai se on poistettu käytöstä."
+  authenticator_no_connect: "Tämä todennuspalveluntarjoaja ei salli yhteyttä olemassa olevaan foorumitiliin."
   invalid_api_credentials: "Et voi katsella pyytämääsi resurssia. API-käyttäjätunnus tai avain ei kelpaa."
   provider_not_enabled: "Et voi katsella pyydettyä resurssia. Todennuksen tarjoajaa ei ole otettu käyttöön."
   provider_not_found: "Et voi katsella pyydettyä resurssia. Todennuksen tarjoajaa ei ole olemassa."
@@ -325,6 +344,8 @@ fi:
   too_many_links:
     one: "Uudet käyttäjät voivat lisätä vain yhden linkin viestiin."
     other: "Uudet käyttäjät voivat lisätä vain %{count} linkkiä viestiin."
+  contains_blocked_word: "Et voi lähettää sanaa \"%{word}\"; sitä ei sallita."
+  contains_blocked_words: "Et voi lähettää tätä. Ei sallittu: %{words}."
   spamming_host: "Et voi lisätä linkkiä tähän isäntään."
   user_is_suspended: "Hyllytetyt käyttäjät eivät saa luoda viestejä."
   topic_not_found: "Jokin on mennyt pieleen. Ehkä tämä ketju on suljettu tai poistettu sillä välin, kun katselit sitä?"
@@ -379,9 +400,14 @@ fi:
   bookmarks:
     errors:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
+      already_bookmarked: "Sama %{type} voidaan lisätä kirjanmerkkeihin vain kerran."
       too_many: "Et voi lisätä enempää kuin %{limit} kirjanmerkkiä. Voit poistaa kirjanmerkkejä kohdassa <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a>."
       cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
       cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
+      time_must_be_provided: "Kaikkiin muistutuksiin on asetettava kellonaika"
+      for_topic_must_use_first_post: "Voit käyttää vain ensimmäistä viestiä ketjun lisäämiseen kirjanmerkkeihin."
+      bookmarkable_id_type_required: "Kirjanmerkkeihin lisättävät tietueen nimi ja tyyppi ovat pakollisia."
+      invalid_bookmarkable: "%{type} ei ole lisättävissä kirjanmerkkeihin."
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytälaitteellani"
       later_today: "Myöhemmin tänään"
@@ -469,6 +495,8 @@ fi:
       Voit muokata edellistä viestiäsi ja lisätä siihen lainauksen maalaamalla lainattavan viestin tekstiä ja klikkaamalla ilmestyvää <b>lainaa</b>-painiketta.
 
       On helpompaa lukea ketjua, jossa on vähemmän pidempiä vastauksia kuin sellaista, jossa on paljon lyhyitä yksittäisiä vastauksia.
+    dominating_topic: Olet lähettänyt yli %{percent} % vastauksista täällä, olisiko aika antaa muiden osallistua keskusteluun?
+    get_a_room: Olet vastannut käyttäjälle @%{reply_username} %{count} kertaa, tiesitkö, että voit lähettää hänelle yksityisviestin?
     too_many_replies: |
       ### Olet kirjoittanut enimmäismäärän vastauksia tähän ketjuun
 
@@ -564,14 +592,21 @@ fi:
               too_many: "Toiminnolle on määritelty liian monta sanaa"
             base:
               invalid_url: "Korvaava URL-osoite on virheellinen"
+              invalid_tag_list: "Korvaavien tunnisteiden luetelo on virheellinen"
+        sidebar_section_link:
+          attributes:
+            linkable_type:
+              invalid: "ei ole kelvollinen"
       <<: *errors
   uncategorized_category_name: "Luokittelematon"
   general_category_name: "Yleistä"
+  general_category_description: "Täällä voit luoda ketjuja, jotka eivät sovi millekään muulle olemassa olevalle alueelle."
   meta_category_name: "Sivuston palaute"
   meta_category_description: "Keskustelua tästä sivustosta, sen järjestämisestä, siitä miten se toimii ja miten sitä voisi parantaa."
   staff_category_name: "Henkilökunta"
   staff_category_description: "Yksityinen alue henkilökunnan keskusteluille. Ketjut näkyvät ainoastaan ylläpitäjille ja valvojille."
   discourse_welcome_topic:
+    title: "Tervetuloa yhteisöömme!"
     body: |2
 
       Tämän kiinnitetyn ketjun ensimmäinen kappale on sivustolla vierailevalle näkyvä tervetulotoivotus. Se on tärkeä!
@@ -603,6 +638,7 @@ fi:
       permission_conflict: "Ryhmällä, jolle myönnetään pääsy ala-alueelle, on oltava pääsy ylätason alueelle. Näillä ryhmillä on pääsy jollekin ala-alueelle, muttei ylätason alueelle: %{group_names}."
       disallowed_topic_tags: "Ketjulla on tunnisteita, jotka eivät ole sallittuja tällä alueella: '%{tags}'"
       disallowed_tags_generic: "Tällä ketjulla on kiellettyjä tunnisteita."
+      slug_contains_non_ascii_chars: "sisältää muita kuin ascii-merkkejä"
     cannot_delete:
       uncategorized: "Tämä alue on erityinen. Se on tarkoitettu säilytyspaikaksi ketjuille, joilla ei ole aluetta; sitä ei voi poistaa."
       has_subcategories: "Aluetta ei voi poistaa, koska sillä on ala-alueita."
@@ -618,9 +654,18 @@ fi:
   post:
     image_placeholder:
       broken: "Tämä kuva ei toimi"
+      blocked_hotlinked_title: "Kuva on isännöity toisella sivustolla. Avaa se uudessa välilehdessä napsauttamalla."
+      blocked_hotlinked: "Ulkoinen kuva"
+    media_placeholder:
+      blocked_hotlinked_title: "Mediasisältö on isännöity toisella sivustolla. Avaa se uudessa välilehdessä napsauttamalla."
+      blocked_hotlinked: "Ulkoinen mediasisältö"
+    hidden_bidi_character: "Kaksisuuntaiset merkit voivat muuttaa tekstin esitysjärjestystä. Tätä voidaan käyttää haitallisen koodin peittämiseen."
     has_likes:
       one: "%{count} tykkäys"
       other: "%{count} tykkäystä"
+    cannot_permanently_delete:
+      many_posts: "Et voi poistaa tätä ketjua pysyvästi, koska siinä on muita viestejä."
+      wait_or_different_admin: "Sinun täytyy odottaa %{time_left} ennen kuin poistat tämän viestin pysyvästi, tai toisen järjestelmänvalvojan on tehtävä se."
   rate_limiter:
     slow_down: "Olet suorittanut toiminnon liian monta kertaa. Kokeile myöhemmin uudelleen."
     too_many_requests: "Olet suorittanut toiminnon liian monta kertaa. Odota %{time_left} ja yritä sitten uudelleen."
@@ -633,6 +678,7 @@ fi:
       public_group_membership: "Liityt tai poistut ryhmistä hieman liian usein. Odota %{time_left} ja yritä sitten uudelleen."
       topics_per_day: "Olet saavuttanut päivittäin sallittujen uusien ketjujen enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
       pms_per_day: "Olet saavuttanut päivässä sallitun viestien enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
+      create_like: "Vau! Olet jakanut paljon rakkautta! Olet saavuttanut päivittäisten tykkäysten ylärajan 24 tunnin aikana, mutta kun saavutat korkeamman luottamustason, ansaitset enemmän päivittäisiä tykkäyksiä. Odota %{time_left} ja yritä sitten uudelleen."
       create_bookmark: "Olet saavuttanut päivittäisten kirjanmerkkien enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
       edit_post: "Olet saavuttanut päivittäisten muokkausten enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
       live_post_counts: "Kysyt viestimääriä liian nopealla tahdilla. Odota %{time_left} ja yritä sitten uudelleen."
@@ -843,6 +889,8 @@ fi:
   draft_backup:
     pm_title: "Varmuuskopiot käynnissä olevien ketjujen luonnoksista"
     pm_body: "Ketju, joka sisältää varmuuskopioluonnoksia"
+  user_activity:
+    no_log_search_queries: "Hakulokikyselyt eivät ole tällä hetkellä käytössä (ylläpitäjä voi ottaa ne käyttöön sivuston asetuksissa)."
   email_settings:
     pop3_authentication_error: "Annetuissa POP3-tunnistetiedoissa oli ongelma, tarkista käyttäjätunnus ja salasana ja yritä uudelleen."
     imap_authentication_error: "Annetuissa IMAP-tunnistetiedoissa oli ongelma, tarkista käyttäjätunnus ja salasana ja yritä uudelleen."
@@ -903,6 +951,7 @@ fi:
         remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun yläosassa."
   unsubscribed:
     title: "Sähköpostiasetukset päivitetty"
+    description: "Sähköpostiasetukset osoitteelle <b>%{email}</b> päivitettiin. Voit muuttaa sähköpostiasetuksia <a href='%{url}'>käyttäjäasetuksissasi</a>."
     topic_description: "Tilaa %{link} uudelleen ketjun alla tai oikealla puolen sijaitsevan ilmoitusvalikon kautta."
     private_topic_description: "Voit tilata ketjun uudelleen sen alla tai oikealla puolella sijaitsevan ilmoitusvalikon kautta."
   uploads:
@@ -1282,18 +1331,26 @@ fi:
         mutes_count: Vaimennusten määrä
       description: "Käyttäjät, jotka monet muista on vaimentaneet tai estäneet."
     top_users_by_likes_received:
+      title: "Eniten tykkäyksiä saaneet käyttäjät"
       labels:
         user: Käyttäjä
         qtt_like: Saatuja tykkäyksiä
+      description: "10 eniten tykkäyksiä saanutta käyttäjää."
     top_users_by_likes_received_from_inferior_trust_level:
+      title: "Käyttäjät, jotka ovat saaneet eniten tykkäyksiä alemman luottamustason käyttäjiltä"
       labels:
         user: Käyttäjä
+        trust_level: Luottamustaso
         qtt_like: Saatuja tykkäyksiä
+      description: "10 korkeamman luottamustason käyttäjää, jotka saavat eniten tykkäyksiä alemman luottamustason käyttäjiltä."
     top_users_by_likes_received_from_a_variety_of_people:
+      title: "Erilaisilta ihmisiltä eniten tykkäyksiä saaneet käyttäjät"
       labels:
         user: Käyttäjä
         qtt_like: Saatuja tykkäyksiä
+      description: "10 käyttäjää, jotka ovat saaneet eniten tykkäyksiä monilta erilaisilta ihmisiltä."
   dashboard:
+    group_email_credentials_warning: 'Ryhmän <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> sähköpostitunnistetiedoissa oli ongelma. Ryhmän postilaatikosta ei lähetetä sähköposteja, ennen kuin tämä ongelma on ratkaistu. %{error}'
     rails_env_warning: "Palvelintasi ajetaan tilassa %{env}."
     host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusarvoista localhost-isäntänimeä. Päivitä se käyttämään sivuston isäntänimeä."
     sidekiq_warning: 'Sidekiq ei ole käynnissä. Monet tehtävät, kuten sähköpostien lähettäminen, suoritetaan asynkronisesti sidekiqin avulla. Varmista, että vähintään yksi sidekiq-prosessi on käynnissä. <a href="https://github.com/mperham/sidekiq" target="_blank">Lue lisää Sidekiqista täällä</a>.'
@@ -1319,7 +1376,9 @@ fi:
     force_https_warning: "Sivusto käyttää SSL-salausta, mutta `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ei ole valittuna sivuston asetuksissa."
     out_of_date_themes: "Päivityksiä on saatavilla näihin teemoihin:"
     unreachable_themes: "Näille teemoille ei voitu tarkistaa päivityksiä:"
+    watched_word_regexp_error: "Säännöllinen lauseke %{action}-tyypin tarkkailuille sanoille ei kelpaa. Tarkista <a href='%{base_path}/admin/customize/watched_words'>tarkkailtujen sanojen asetukset</a> tai poista käytöstä \"watched words regular expressions\" -sivustoasetus."
   site_settings:
+    allow_bulk_invite: "Salli joukkokutsut lataamalla CSV-tiedosto"
     disabled: "poistettu käytöstä"
     display_local_time_in_user_card: "Näytä käyttäjän aikavyöhykkeeseen perustuva paikallinen aika hänen käyttäjäkortissaan."
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
@@ -1340,6 +1399,8 @@ fi:
     min_personal_message_title_length: "Yksityisviestin otsikon vähimmäismerkkimäärä"
     max_emojis_in_title: "Kuinka monta emojia enintään otsikossa"
     min_search_term_length: "Haun merkkien minimimäärä"
+    search_tokenize_chinese: "Pakota haku saneistamaan kiina myös muilla kuin kiinankielisillä sivustoilla"
+    search_tokenize_japanese: "Pakota haku saneistamaan japani myös muilla kuin japaninkielisillä sivustoilla"
     search_prefer_recent_posts: "Jos hakeminen suurelta foorumilta on hidasta, tämä asetus kokeilee indeksiä, jossa tuoreimmat viestit ovat ensin"
     search_recent_posts_size: "Kuinka monta tuoretta viestiä pidetään indeksissä"
     log_search_queries: "Pidä lokia käyttäjien tekemistä hauista"
@@ -1350,6 +1411,7 @@ fi:
     category_search_priority_high_weight: "Korkean hakuprioriteetin painoarvo."
     allow_uncategorized_topics: "Salli ketjujen aloittaminen valitsematta aluetta. VAROITUS: alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
     allow_duplicate_topic_titles: "Salli ketjun aloittaminen identtisellä otsikolla."
+    allow_duplicate_topic_titles_category: "Salli ketjut, joilla on identtiset otsikot, jos ketjut on eri alueella. Asetuksen allow_duplicate_topic_titles on oltava pois käytöstä."
     unique_posts_mins: "Kuinka monen minuutin kuluttua käyttäjä voi lähettää uudestaan samansisältöisen viestin"
     educate_until_posts: "Näytä uuden käyttäjän ohje, kun käyttäjä alkaa kirjoittamaan ensimmäistä (n) viestiään viestikenttään."
     title: "Tämän sivuston nimi, käytetään otsikkotunnisteessa."
@@ -1358,8 +1420,11 @@ fi:
     contact_email: "Sivustosta vastaavan henkilön sähköpostiosoite. Siihen lähetetään kriittiset ilmoitukset, ja se näkyy myös <a href='%{base_path}/about' target='_blank'>/about</a>-sivulla kiireellisiä yhteydenottoja varten."
     contact_url: "URL-osoite sivuston yhteydenottoja varten. Näytetään <a href='%{base_path}/about' target='_blank'>Tietoja</a>-sivulla kiireellisiä yhteydenottoja varten."
     crawl_images: "Lataa linkatut kuvat kuvan mittojen määrittamiseksi."
+    download_remote_images_to_local: "Muunna etäkuvat (linkitetyt) paikallisiksi kuviksi lataamalle ne. Tämä säilyttää sisällön myös silloin, jos kuvat poistetaan etäsivustolta tulevaisuudessa."
     download_remote_images_threshold: "Vähin vapaa tila, jotta linkatut kuvat ladataan paikallisesti (prosenteissa)"
     disabled_image_download_domains: "Linkattuja kuvia ei koskaan ladata näistä verkkotunnuksista. Pystyviivalla eroteltu luettelo."
+    block_hotlinked_media: "Estä käyttäjiä käyttämästä etämediasisältöä (linkitettyä) viesteissään. Etämediasisältö, jota ei ole ladattu \"download_remote_images_to_local\"-asetuksen kautta, korvataan paikkamerkkilinkillä."
+    block_hotlinked_media_exceptions: "Luettelo perus-URL-osoitteista, joihin ei sovelleta block_hotlinked_media-asetusta. Liitä mukaan protokolla (esim. https://example.com)."
     editing_grace_period: "Viestin muokkaaminen (n) sekunnin sisällä sen lähettämisestä ei luo viestistä uutta versiota viestin historiaan."
     editing_grace_period_max_diff: "Kuinka monen merkin muutos sallitaan muokkauksen katumusaikana. Jos muutos on isompi, tallennetaan uusi viestirevisio (luottamustasolla 0 ja 1)."
     editing_grace_period_max_diff_high_trust: "Kuinka monen merkin muutos sallitaan muokkauksen katumusaikana. Jos muutos on isompi, tallennetaan uusi viestirevisio (luottamustasosta 2 ylöspäin)."
@@ -1368,6 +1433,7 @@ fi:
     tl2_post_edit_time_limit: "Vähintään Lt2-kirjoittaja voi muokata viestiään (n) minuutin ajan viestin lähettämisen jälkeen. Aseta 0, niin viestiä voi muokata aina."
     edit_history_visible_to_public: "Salli kaikkien nähdä muokatun viestin edelliset versiot. Jos asetus poistetaan käytöstä, vain henkilökunta näkee versiot."
     delete_removed_posts_after: "Kirjoittajan poistamat viestit poistetaan automaattisesti (n) tunnin kuluttua. Jos arvoksi asetetaan 0, viestit poistetaan välittömästi."
+    notify_users_after_responses_deleted_on_flagged_post: "Kun viesti liputetaan ja poistetaan tämän jälkeen, kaikille viestiin vastanneille käyttäjille, joiden vastaukset on poistettu, ilmoitetaan."
     max_image_width: "Esikatselukuvan suurin sallittu leveys viestissä"
     max_image_height: "Esikatselukuvan suurin sallittu korkeus viestissä"
     responsive_post_image_sizes: "Muuta lightbox-esikatselukuvien kokoa seuraavien pikselisuhteiden suuren DPI:n näyttöjä varten. Poista kaikki arvot poistaaksesi responsiiviset kuvat käytöstä."
@@ -1380,6 +1446,8 @@ fi:
     show_pinned_excerpt_mobile: "Näytä katkelma kiinnitetyistä ketjuista mobiilinäkymässä."
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
+    blocked_onebox_domains: "Luettelo verkkotunnuksista, joista ei koskaan näytetä onebox-esikatselua, esim. wikipedia.org\n(jokerimerkkejä * ja ? ei tueta)"
+    block_onebox_on_redirect: "Estä onebox uudelleenohjaaville URL-osoitteille"
     allowed_inline_onebox_domains: "Verkko-osoitteet, joista luodaan minimoitu Onebox-esikatselu, jos niihin linkitetään määrittämättä otsikkoa."
     enable_inline_onebox_on_all_domains: "Ohita inline_onebox_domain_whitelist-asetus ja salli Onebox-esikatselut kaikista verkko-osoitteista."
     force_custom_user_agent_hosts: "Isännät, joille käytetään mukautettua onebox-käyttäjäagenttia kaikissa pyynnöissä. (Erityisen hyödyllinen isännille, jotka rajoittavat käyttäjäagentin pääsyä)."
@@ -1398,17 +1466,22 @@ fi:
     favicon: "Sivuston favicon, ks. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Täytyy olla png, jotta toimii CDN:n kanssa. Skaalataan kokoon 32x32. Jos jätetty tyhjäksi, large_icon-kuvaketta käytetään."
     apple_touch_icon: "Applen kosketuslaitteissa käytettävä kuvake. Skaalataan automaattisesti kokoon 180x180. Jos jätetään tyhjäksi, large_icon-kuvaketta käytetään."
     opengraph_image: "Oletuksena käytettävä opengraph-kuva, käytetään, kun sivulla ei ole muita sopivia kuvia. Jos jätetty tyhjäksi, large_icon-kuvaa käytetään"
+    twitter_summary_large_image: "Twitter-kortin \"summary large image\" (leveys vähintään 280 ja korkeus vähintään 150, ei voi olla .svg). Jos jätetty tyhjäksi, tavallisen kortin metatiedot luodaan käyttämällä opengraph_image-kuvaa, kunhan se ei ole myös .svg."
     notification_email: "Sähköpostiosoite, josta kaikki tärkeät järjestelmän lähettämät sähköpostiviestit lähetetään. Tässä määritetyn verkkotunnuksen SPF, DKIM ja käänteiset PTR-tietueet täytyy olla asetettu oikein, jotta sähköpostit menevät perille."
     email_custom_headers: "Pystyviivalla eroteltu luettelo mukautetuista sähköpostin otsikkotiedoista"
     email_subject: "Mukautettava tavallisten sähköpostiviestien aiheen muoto. Katso englanninkielinen ohje: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "Kertoo käyttäjälle tarkemmin, miksi hän ei pääse tiettyyn ketjuun. Huomioi: tämä vaarantaa tietoturvaa, koska käyttäjä saa tietää, että URL osoittaa olemassa olevaan ketjuun."
     enforce_second_factor: "Pakottaa käyttäjät ottamaan kaksivaiheisen tunnistuksen käyttöön. Voit pakottaa sen kaikille valitsemalla \"kaikki\". Vaihtoehto \"henkilökunta\" pakottaa sen vain henkilökunnalle."
     force_https: "Pakota sivusto käyttämään vain HTTPS:ää. VAROITUS: älä ota tätä käyttöön ennen kuin HTTPS on täysin käytössä ja toimii täysin kaikkialla! Tarkastitko käyttämäsi CDN:n, kaikki sosiaaliset kirjautumiset ja kaikki ulkoiset logot ja muut riippuvuudet varmistaaksesi, että ne ovat myös HTTPS-yhteensopivia?"
+    same_site_cookies: "Käytä saman sivuston evästeitä, ne eliminoivat kaikki sivustojenvälisen pyynnön väärennyksen vektorit tuetuilla selaimilla (lax tai strict). Varoitus: strict toimii vain sivustoilla, jotka pakottavat kirjautumisen ja käyttävät ulkoista todennustapaa."
     summary_score_threshold: "Viestin minimipistemäärä, jotta se näytetään ketjun tiivistelmässä."
     summary_posts_required: "Vähimmäismäärä viestejä ketjussa ennen kuin Näytä ketjun tiivistelmä otetaan käyttöön. Muutokset tähän asetukseen otetaan käyttöön taannehtivasti viikon kuluessa."
     summary_likes_required: "Vähimmäismäärä tykkäyksiä ketjussa ennen kuin Näytä ketjun tiivistelmä otetaan käyttöön. Muutokset tähän asetukseen otetaan käyttöön taannehtivasti viikon kuluessa."
     summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä"
     summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä"
+    summary_timeline_button: "Näytä yhteenvetopainike aikajanalla"
+    enable_personal_messages: "VANHENTUNUT, käytä tämän sijaan \"personal message enabled groups\" -asetusta. Salli luottamustason 1 (määritettävissä viestien lähettämiseen vaadittavan vähimmäisluottamustason kautta) käyttäjien luoda viestejä ja vastata viesteihin. Henkilökunta voi aina lähettää viestejä asetuksista riippumatta."
+    personal_message_enabled_groups: "Salli näiden ryhmien käyttäjien luoda viestejä ja vastata viesteihin. Luottamustasoryhmät sisältävät kaikki tämän luvun yläpuolella olevat luottamustasot. Esimerkiksi luottamustason 1 valitseminen sallii myös luottamustasojen 2, 3 ja 4 käyttäjien lähettää yksityisviestejä. Henkilökunta voi aina lähettää viestejä asetuksista riippumatta."
     enable_system_message_replies: "Sallii käyttäjien vastata järjestelmän viesteihin, vaikka yksityisviestit eivät olisikaan käytössä"
     enable_chunked_encoding: "Ota käyttöön palvelimen joukkokoodausvastaukset. Tämä ominaisuus toimii useimmissa määrityksissä, mutta jotkin välityspalvelimet saattavat puskuroida, mikä aiheuttaa vastausten viivästymisen"
     long_polling_base_url: "Perus-URL, jota käytetään long pollingissa (kun CDN tarjoaa dynaamista sisältöä, varmista että tämä on asetettu noudoksi lähteestä) esim: http://lähde.sivusto.com"
@@ -1427,6 +1500,9 @@ fi:
     tl2_additional_edits_per_day_multiplier: "Nosta muokkausten päivittäistä rajaa tasolla lt2 (konkari) kertomalla tällä luvulla"
     tl3_additional_edits_per_day_multiplier: "Nosta muokkausten päivittäistä rajaa tasolla lt3 (mestari) kertomalla tällä luvulla"
     tl4_additional_edits_per_day_multiplier: "Nosta muokkausten päivittäistä rajaa tasolla lt4 (johtaja) kertomalla tällä luvulla"
+    tl2_additional_flags_per_day_multiplier: "Nosta liputusten päivittäistä rajaa tasolla lt2 (konkari) kertomalla tällä luvulla"
+    tl3_additional_flags_per_day_multiplier: "Nosta liputusten päivittäistä rajaa tasolla lt3 (mestari) kertomalla tällä luvulla"
+    tl4_additional_flags_per_day_multiplier: "Nosta liputusten päivittäistä rajaa tasolla lt4 (johtaja) kertomalla tällä luvulla"
     num_users_to_silence_new_user: "Jos uuden käyttäjän viestit saavat num_spam_flags_to_silence_new_user roskapostilmerkintää näin monelta eri käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
     num_tl3_flags_to_silence_new_user: "Jos uuden käyttäjän viestit saavat näin monta merkintää num_tl3_users_to_silence_new_user eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
     num_tl3_users_to_silence_new_user: "Jos uuden käyttäjän viestit saavat num_tl3_flags_to_silence_new_user merkintää näin monelta eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
@@ -1451,6 +1527,8 @@ fi:
     ga_universal_auto_link_domains: "Ota käyttöön Google Universal Analyticsin verkkotunnusten välinen seuranta. Asiakastunniste liitetään näihin verkkotunnuksiin ulospäin suuntautuvissa linkeissä. Tutustu <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Googlen Verkkotunnusten välisen seurannan määrittäminen ohjeeseen.</a>"
     gtm_container_id: "Google Tag Manager -säiliön tunnus, esim: GTM-ABCDEF. <br/>Huomautus: kolmansien osapuolien skriptit, joita GTM käyttää, voi joutua erikseen sallimaan asetuksessa \"content security policy script src\"."
     enable_escaped_fragments: "Käytä Googlen Ajax-sivustoille tarkoitettua APIa, jos webcrawleria ei tunnisteta. Katso <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_and_groups: "Salli valvojien luoda ja hallita alueita ja ryhmiä"
+    moderators_change_post_ownership: "Salli valvojien muuttaa viestin omistajuutta"
     cors_origins: "Sallitut alkuperät eri alkuperät sisältäville pyynnöille (CORS). Jokaisen alkuperän täytyy sisältää http:// tai https://. DISCOURSE_ENABLE_CORS-ympäristömuuttuja täytyy olla asetettu todeksi CORSin käyttöönottamiseksi."
     use_admin_ip_allowlist: "Ylläpitäjät voivat kirjautua vain IP-osoitteista, jotka on määritetty Seulottavien IP:iden listassa (Ylläpito > Lokit > Seulottavat IP:t)"
     blocked_ip_blocks: "Luettelo yksityisistä IP-lohkoista, joita Discourse ei tulisi koskaan indeksoida"
@@ -1459,6 +1537,7 @@ fi:
     allowed_iframes: "Iframe src -verkkotunnusten etuliitteet, jotka Discourse voi turvallisesti sallia viesteissä"
     allowed_crawler_user_agents: "Hakurobottien käyttäjäagentit, jotka saavat tulla sivustolle. VAROITUS! TÄMÄ ASETUS ESTÄÄ KAIKKI HAKUROBOTIT, JOITA EI LISTATA TÄSSÄ!"
     blocked_crawler_user_agents: "Käyttäjäagentin nimessä oleva kirjainkoosta riippumaton yksilöllinen merkkijono, jolla tunnistetaan estettävät hakurobotit. Ei sovelleta, jos sallittujen hakurobottien luettelo on määriteltynä."
+    slow_down_crawler_user_agents: 'Hakurobottien käyttäjäagentit, joiden nopeutta tulisi rajoittaa "slow down crawler rate" -asetuksessa määritetyn mukaisesti. Jokaisen arvon täytyy olla ainakin kolmen merkin pituinen.'
     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 käyttöön epäilyttävän sisällön seulonta (Content-Security-Policy)"
     content_security_policy_report_only: "Ota käyttöön epäilyttävästä sisällöstä raportointi (Content-Security-Policy-Report-Only)"
@@ -1470,6 +1549,7 @@ fi:
     post_menu: "Mitkä painikkeet näytetään viestin valikossa ja missä järjestyksessä. Esimerkiksi like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Viestivalikossa piilotettavat valikon vaihtoehdot, ellei laajentavaa kolmea pistettä klikata."
     share_links: "Mitkä kohteet näytetään jakamisvalintaikkunassa ja missä järjestyksessä."
+    allow_username_in_share_links: "Salli käyttäjätunnusten sisällyttäminen jakolinkkeihin. Tämä on hyödyllistä kunniamerkkien antamiseksi yksilöllisten vierailijoiden perusteella."
     site_contact_username: "Henkilökuntaan kuuluvan käyttäjä, jonka nimissä kaikki automaattiset viestit lähetetään. Jos jätetty tyhjäksi, oletuksena on oletusjärjestelmätili."
     site_contact_group_name: "Kelvollinen ryhmän nimi, joka kutsutaan kaikkiin automaattisesti luotuihin viesteihin."
     send_welcome_message: "Lähetä kaikille uusille käyttäjille tervetuloviesti, jossa on pika-aloitusopas."
@@ -1477,6 +1557,7 @@ fi:
     send_tl2_promotion_message: "Lähetä uusille luottamustason 2 käyttäjille viesti ylennyksestä."
     suppress_reply_directly_below: "Älä näytä vastausten lukumäärää viestissä,, jos viestin alapuolella on vain yksi vastaus."
     suppress_reply_directly_above: "Älä näytä vastauksena-merkintää viestissä, jos viestin yläpuolella on vain yksi vastaus."
+    remove_full_quote: "Poista lainaus automaattisesti, jos (a) se näkyy viestin alussa, (b) se on koko viesti ja (c) se on peräisin välittömästi edeltävästä viestistä. Katso lisätietoja <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>täydellisten lainausten poistaminen suorista vastauksista</a>"
     suppress_reply_when_quoting: "Älä näytä vastauksena-painiketta viestissä, kun viestissä on lainaus."
     max_reply_history: "Maksimimäärä laajennettavia vastauksia, kun \"vastauksena\" laajennetaan"
     topics_per_period_in_top_summary: "Ketjujen lukumäärä, joka näytetään oletuksena Suositut-listauksissa."
@@ -1491,10 +1572,13 @@ fi:
     enable_badges: "Ota kunniamerkkijärjestelmä käyttöön"
     max_favorite_badges: "Enimmäismäärä kunniamerkkejä, jonka käyttäjä voi valita"
     enable_whispers: "Salli henkilökunnan yksityiskeskustelu ketjujen sisällä."
+    whispers_allowed_groups: "Salli tiettyjen ryhmien jäsenten yksityinen viestintä ketjuissa."
     allow_index_in_robots_txt: "Määritä robots.txt-tiedostossa, että hakurobotit saavat indeksoida tätä sivustoa. Poikkeuksellisissa tapauksissa voit <a href='%{base_path}/admin/customize/robots'>ohittaa robots.txt:n</a> pysyvästi."
     blocked_email_domains: "Pystyviivalla eroteltu luettelo sähköpostiverkkotunnuksista, joilla käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com|trashmail.net"
     allowed_email_domains: "Pystyviivalla eroteltu luettelo sähköpostiverkkotunnuksista, joilla käyttäjien TÄYTYY luoda tilinsä. VAROITUS: käyttäjiä, joiden sähköpostiverkkotunnus ei ole luettelossa, ei sallita!"
+    normalize_emails: "Tarkista, onko normalisoitu sähköpostiosoite yksilöllinen. Normalisoitu sähköpostiosoite poistaa kaikki pisteet käyttäjätunnuksesta ja kaiken +- ja @-symbolien väliltä."
     auto_approve_email_domains: "Käyttäjät, joilla on sähköpostiosoite tästä verkkotunnusten luettelosta, hyväksytään automaattisesti."
+    hide_email_address_taken: "Älä ilmoita käyttäjille rekisteröitymisen tai unohtuneen salasanan palautuksen aikana, että annetulla sähköpostiosoitteella on olemassa tili. Vaadi täydellinen sähköpostiosoite unohtuneen salasanan pyynnöissä."
     log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos KAIKILTA laitteilta"
     version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä ilmoitus <a href='%{base_path}/admin' target='_blank'>/ylläpitäjän</a> hallintapaneelissa, kun uusi versio on saatavilla"
     new_version_emails: "Lähetä sähköposti contact_email-osoitteeseen, kun uusi versio Discoursesta on saatavilla."
@@ -1523,6 +1607,11 @@ fi:
     auth_overrides_email: "Ohittaa paikallisen sähköpostiosoitteen ulkoisen sivuston sähköpostiosoitteella jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia. (VAROITUS: paikallisten sähköpostien normalisointi voi aiheuttaa poikkeamia)"
     auth_overrides_username: "Korvaa paikallisen käyttäjätunnuksen ulkoisen sivuston käyttäjätunnuksella jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia. (VAROITUS: paikallisten käyttäjätunnusten pituus ja vaatimukset voi aiheuttaa poikkeamia)"
     auth_overrides_name: "Korvaa paikallisen koko nimen ulkoisen sivuston koko nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia."
+    discourse_connect_overrides_avatar: "Korvaa käyttäjän avatarin arvolla DiscourseConnectin tiedoista. Jos tämä on käytössä, käyttäjä ei voi ladata avataria Discourseen."
+    discourse_connect_overrides_location: "Korvaa käyttäjän sijainnin arvolla DiscourseConnectin tiedoista ja estää paikalliset muutokset."
+    discourse_connect_overrides_website: "Korvaa käyttäjän verkkosivuston arvolla DiscourseConnectin tiedoista ja estää paikalliset muutokset."
+    discourse_connect_overrides_profile_background: "Korvaa käyttäjän profiilin taustakuvan arvolla DiscourseConnectin tiedoista."
+    discourse_connect_overrides_card_background: "Korvaa käyttäjän kortin taustakuvan arvolla DiscourseConnectin tiedoista."
     discourse_connect_not_approved_url: "Uudelleenohjaa hyväksymättömät DiscourseConnect-tilit tähän URL-osoitteeseen"
     discourse_connect_allows_all_return_paths: "Älä rajoita DiscourseConnectin antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
     enable_local_logins: "Salli kirjautuminen paikallisesti käyttäjätunnuksen ja salasanan avulla. VAROITUS: jos tämä ei ole käytössä, voi sinun olla mahdotonta kirjautua sisään, jollet ole aiemmin määritellyt ainakin yhtä muuta kirjautumistapaa."
@@ -1534,6 +1623,9 @@ fi:
     google_oauth2_client_secret: "Google-sovelluksesi asiakkaan salatunnus."
     google_oauth2_prompt: "Valinnainen välilyönneillä eroteltu lista merkkijonoarvoja, jotka määräävät pyytääkö todennuspalvelin käyttäjältä uudelleentunnistautumista ja suostumusta. Ks. käyvät arvot: <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a>"
     google_oauth2_hd: "Valinnainen Google Appsin isännöity verkkotunnus, johon kirjautuminen on rajoitettu. Katso lisätietoja osoitteesta <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a>."
+    google_oauth2_hd_groups: "(kokeellinen) Hae käyttäjien Google-ryhmät isännöidyllä verkkotunnuksella todennuksen yhteydessä. Haettuja Google-ryhmiä voidaan käyttää automaattisen Discourse-ryhmän jäsenyyden myöntämiseen (katso ryhmäasetukset). Lisätietoja on osoitteessa https://meta.discourse.org/t/226850."
+    google_oauth2_hd_groups_service_account_admin_email: "Sähköpostiosoite, joka kuuluu Google Workspacen järjestelmänvalvojan tilille. Käytetään palvelutilin tunnistetietojen kanssa ryhmän tietojen hakemiseen."
+    google_oauth2_hd_groups_service_account_json: "Palvelutilin JSON-muotoiset avaintiedot. Käytetään ryhmän tietojen hakemiseen."
     enable_twitter_logins: "Ota käyttöön Twitter-tunnistautuminen, vaaditaan twitter_consumer_key ja twitter_consumer_secret. Katso <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
     twitter_consumer_key: "Twitter-todennuksen consumer key, joka rekisteröidään osoitteessa <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Twitter-todennuksen consumer secret, joka rekisteröidään osoitteessa <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -1548,6 +1640,7 @@ fi:
     discord_secret: "Discordin salainen avain"
     discord_trusted_guilds: 'Salli vain näiden Discord-kiltojen jäsenten kirjautua Discordin avulla. Käytä killan numeerista tunnusta. Jos tarvitset lisätietoa, ohjeet löytyy <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">täältä</a>. Jätä tyhjäksi, jos et halua rajoittaa killan perusteella.'
     enable_backups: "Salli ylläpitäjien tehdä varmuuskopioita foorumista"
+    allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä pois käytöstä, jos et aio palauttaa sivuston varmuuskopiota."
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden enimmäismäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
     automatic_backups_enabled: "Tee automaattinen varmuuskopiointi varmuuskopiotiheydessä määritetyn mukaisesti"
     backup_frequency: "Kuinka monen päivän välein otetaan varmuuskopio."
@@ -1568,6 +1661,8 @@ fi:
     top_topics_formula_first_post_likes_multiplier: "avausviestin tykkäysmäärän kerroin (n) Suositut-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * (n) + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
     top_topics_formula_least_likes_per_post_multiplier: "tykkäykset/viestit -suhteen enimmäisarvo (n) Suositut-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, (n)) + 10 + log(viestien määrä)`"
     enable_safe_mode: "Salli käyttäjän siirtyä vikasietotilaan lisäosien vianmääritystä varten."
+    enable_experimental_sidebar_hamburger: "Mahdollistaa kokeellisen sivupalkin ja käyttäjän hampurilaisvalikon käyttöönoton."
+    enable_sidebar: "Ottaa käyttöön kokeellisen sivupalkin."
     rate_limit_create_topic: "Ketjun aloittamisen jälkeen käyttäjän täytyy odottaa (n) sekuntia ennen toisen ketjun aloittamista."
     rate_limit_create_post: "Viestin luomisen jälkeen käyttäjän täytyy odottaa (n) sekuntia ennen uuden viestin luomista."
     rate_limit_new_user_create_topic: "Ketjun luomisen jälkeen uuden käyttäjän täytyy odottaa (n) sekuntia ennen uuden ketjun luomista."
@@ -1580,6 +1675,7 @@ fi:
     max_personal_messages_per_day: "Kuinka monta uutta yksityisviestiketjua käyttäjä voi aloittaa päivässä."
     max_invites_per_day: "Maksimimäärä kutsuja, jonka käyttäjä voi lähettää päivässä."
     max_topic_invitations_per_day: "Maksimimäärä ketjukutsuja, jonka käyttäjä voi lähettää päivässä."
+    max_topic_invitations_per_minute: "Maksimimäärä ketjukutsuja, jonka käyttäjä voi lähettää minuutissa."
     max_logins_per_ip_per_hour: "Enimmäismäärä kirjautumisia IP-osoitetta kohden tunnissa"
     max_logins_per_ip_per_minute: "Enimmäismäärä kirjautumisia IP-osoitetta kohden minuutissa"
     max_post_deletions_per_minute: "Kuinka monta viestiä käyttäjä voi poistaa minuutissa. Poista viestien poistot käytöstä asettamalla arvoksi 0."
@@ -1610,6 +1706,8 @@ fi:
     external_emoji_url: "Emoji-kuvien ulkoisen palvelun URL-osoite. Poista käytöstä jättämällä tyhjäksi."
     use_site_small_logo_as_system_avatar: "Käytä sivuston pientä logoa järjestelmäkäyttäjän avatarin sijasta. Edellyttää, että logo on asetettu."
     restrict_letter_avatar_colors: "Luettelo kuusinumeroisista heksadesimaalisista väriarvoista, joita käytetään kirjainavatareja luotaessa."
+    enable_listing_suspended_users_on_search: "Salli tavallisten käyttäjien löytää hyllytettyjä käyttäjiä."
+    selectable_avatars_mode: "Salli käyttäjien valita avatar selectable_avatars-luettelosta ja rajoita mukautettujen avatarien lataukset valitulle luottamustasolle."
     selectable_avatars: "Avatarit, joista käyttäjä voi valita."
     allow_all_attachments_for_group_messages: "Salli kaikki sähköpostiliitteet ryhmäviesteissä."
     png_to_jpg_quality: "Muunnetun JPG-tiedoston laatu (1 on huonoin laatu, 99 on paras laatu, 100 poistaa käytöstä)."
@@ -1656,6 +1754,7 @@ fi:
     min_trust_to_edit_wiki_post: "Wiki-viestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_edit_post: "Viestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_allow_self_wiki: "Minimiluottamustaso, jolla käyttäjä voi tehdä omasta viestistään wiki-viestin."
+    min_trust_to_send_messages: "VANHENTUNUT, käytä tämän sijaan 'personal message enabled groups' -asetusta. Uusien yksityisviestin luomiseen vaadittava vähimmäisluottamustaso."
     min_trust_to_send_email_messages: "Vähimmäisluottamustaso, jolla voi lähettää yksityisviestejä sähköpostitse."
     min_trust_to_flag_posts: "Vähimmäisluottamustaso, jolla voi merkitä viestejä"
     min_trust_to_post_links: "Vähimmäisluottamustaso, jolla voi lisätä linkkejä viesteihin"
@@ -1673,6 +1772,9 @@ fi:
     max_mentions_per_post: "Kuinka monta @nimi-ilmoitusta kukaan voi lisätä viestiin."
     max_users_notified_per_group_mention: "Kuinka moni voi saada ilmoituksen, kun ryhmä mainitaan (jos raja ylittyy, kukaan ei saa ilmoitusta)"
     enable_mentions: "Salli käyttäjän mainita toinen käyttäjä."
+    here_mention: "@maininnassa käytettävä nimi, jolla oikeutetut käyttäjät voivat ilmoittaa enintään \"max_here_mentioned\"-asetuksen mukaiselle ketjuun osallistuvalle henkilömäärälle. Ei saa olla olemassa oleva käyttäjätunnus."
+    max_here_mentioned: "Enimmäismäärä mainittuja henkilöitä @here-maininnalla."
+    min_trust_level_for_here_mention: "Vähimmäisluottamustaso, jolla tehdä @here-maininnan."
     create_thumbnails: "Luo esikatselu- ja lightbox-kuvia, jotka ovat liian suuria mahtuakseen viestiin."
     email_time_window_mins: "Odota (n) minuuttia ennen ilmoitussähköpostien lähettämistä, jotta käyttäjällä on aikaa muokata ja viimeistellä viestinsä."
     personal_email_time_window_seconds: "Odota (n) sekuntia ennen kuin yksityisviestien sähköposti-ilmoitusten lähettämistä, jotta käyttäjillä on mahdollisuus muokata ja viimeistellä viestinsä."
@@ -1723,6 +1825,7 @@ fi:
     topic_view_duration_hours: "Laske uusi ketjun katselu kerran per IP/käyttäjä joka N:s tunti"
     user_profile_view_duration_hours: "Laske uusi profiilin katselu kerran per IP/käyttäjä joka N:s tunti"
     levenshtein_distance_spammer_emails: "Verrattaessa sähköpostiosoitteita tunnettuihin roskapostittajiin, näin monen merkin ero saa vielä aikaan sumean osuman."
+    max_new_accounts_per_registration_ip: "Jos samasta IP-osoitteesta on jo (n) luottamustason 0 käyttäjätiliä (eikä yhtään henkilökunnan tai vähintään LT2), lakkaa hyväksymästä uusia rekisteröitymisiä tästä IP:stä. Poista raja käytöstä asettamalla arvoksi 0."
     min_ban_entries_for_roll_up: "Kun Kokoa-painiketta painetaan, luodaan IP-porttikielloista aliverkon kattavia, kieltoja jos kieltoja on asettu vähintään (N) määrä."
     max_age_unmatched_emails: "Poista osumattomat seulotut sähköpostiosoitteet (N) päivän jälkeen."
     max_age_unmatched_ips: "Poista osumattomat seulotut IP-osoitteet (N) päivän jälkeen."
@@ -1756,6 +1859,7 @@ fi:
     max_emails_per_day_per_user: "Käyttäjälle päivässä lähetettävien sähköpostien enimmäismäärä. Aseta 0, jos et halua rajoittaa."
     enable_staged_users: "Luo automaattisesti esikäyttäjiä, kun saapuvia sähköposteja käsitellään."
     maximum_staged_users_per_email: "Enimmäismäärä automaattisesti luotuja esikäyttäjiä, kun käsitellään saapuvaa sähköpostia."
+    maximum_recipients_per_new_group_email: "Estä saapuvat sähköpostit, joilla on liian monta vastaanottajaa."
     auto_generated_allowlist: "Luettelo sähköpostiosoitteista, joiden viestejä ei tarkasteta automaattisesti luodun sisällön osalta. Esimerkki: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Estä saapuvat sähköpostit, jotka tunnistetaan automaattisesti luoduiksi."
     ignore_by_title: "Jätä sähköpostit huomiotta niiden otsikon perusteella."
@@ -1775,6 +1879,7 @@ fi:
     raw_email_max_length: "Enintään kuinka monta merkkiä säilytetään saapuvasta sähköpostista."
     raw_rejected_email_max_length: "Enintään kuinka monta merkkiä säilytetään hylätystä saapuvasta sähköpostista."
     delete_rejected_email_after_days: "Poista yli (n) päivää vanhat hylätyt sähköpostit."
+    require_change_email_confirmation: "Vaadi muita kuin henkilökunnan käyttäjiä vahvistamaan vanha sähköpostiosoitteensa ennen sen vaihtamista. Ei koske henkilökunnan käyttäjiä, heidän täytyy aina vahvistaa vanha sähköpostiosoitteensa."
     manual_polling_enabled: "Työnnä sähköpostit käyttäen sähköpostivastausten APIa."
     pop3_polling_enabled: "Pollaa sähköpostivastaukset POP3:lla."
     pop3_polling_ssl: "Käytä SSL-salausta yhdistettäessä POP3-palvelimeen. (Suositellaan)"
@@ -1853,11 +1958,14 @@ fi:
     enable_mobile_theme: "Mobiililaitteet käyttävät mobiiliystävällistä teemaa, jonka voi vaihtaa koko sivustoon. Poista asetus käytöstä, jos haluat käyttää omaa tyylitiedostoa, joka on mukautuva eri laitteille."
     dominating_topic_minimum_percent: "Kuinka monta prosenttia ketjun viesteistä käyttäjän täytyy kirjoittaa, ennen kuin häntä muistutetaan ketjun dominoinnista."
     disable_avatar_education_message: "Poista opastusviesti käytöstä, joka näytetään kun profiilikuvaa vaihdetaan."
+    pm_warn_user_last_seen_months_ago: "Varoita käyttäjiä yksityisviestiä luotaessa siitä, että vastaanottaja on nähty viimeksi yli n kuukautta sitten."
     suppress_uncategorized_badge: "Älä näytä alueettomille ketjuille tunnusta ketjujen listauksissa."
     header_dropdown_category_count: "Kuinka monta aluetta näytetään yläpalkin pudotusvalikossa."
     permalink_normalizations: "Sovella tätä säännöllistä lauseketta ennen pysyvien linkkien sovittamista, esim. /(topic.*)\\?.*/\\1 poistaa hakulausekkeet ketjujen reiteistä. Muoto on regex+string, \\1 jne. avulla pääset käsiksi captureihin."
     global_notice: "Näytä kaikilla sivuilla kaikille käyttäjille KIIREELLISESTÄ HÄTÄTAPAUKSESTA kertova banneri, jota ei voi piilottaa. Vaihda tyhjäksi piilottaaksesi sen (HTML sallittu)."
     disable_system_edit_notifications: "Poistaa järjestelmäkäyttäjän muokkausilmoitukset käytöstä, kun 'download_remote_images_to_local' on asetettu."
+    disable_category_edit_notifications: "Poista käytöstä alueiden muokkausilmoitukset ketjuissa."
+    disable_tags_edit_notifications: "Poista käytöstä tunnisteiden muokkausilmoitukset ketjuissa."
     notification_consolidation_threshold: "Kuinka monta tykkäys- tai jäsenhakemusilmoitusta tulee saada, jotta ne yhdistetään yhdeksi. Arvo 0 poistaa käytöstä."
     likes_notification_consolidation_window_mins: "Kesto minuutteina, jonka aikana tykkäysilmoitukset yhdistetään yhdeksi ilmoitukseksi, kun raja on saavutettu. Rajan voi määrittää asetuksella `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Poista ketjun kiinnitys automaattisesti, kun käyttäjä on sen lopussa."
@@ -1869,6 +1977,7 @@ fi:
     app_association_ios: "Contents of <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>-päätepisteen sisältö, käytetään universaalien linkkien luomiseen tämän sivuston ja iOS-sovellusten välille."
     share_anonymized_statistics: "Julkaise yksilöimättömät käyttötilastot."
     auto_handle_queued_age: "Käsittele automaattisesti asiat, jotka ovat odottaneet käsittelyä näin monta päivää. Liput ohitetaan. Jonossa olevat viestit ja käyttäjät ohitetaan. Jos asetat 0:ksi, ominaisuus ei ole käytössä."
+    penalty_step_hours: "Oletusrangaistukset käyttäjien hiljentämisestä tai hyllyttämisestä tunneissa. Ensimmäisen rikkeen oletusarvo on ensimmäinen arvo, toisen rikkeen toinen jne."
     svg_icon_subset: "Lisää ylimääräisiä FontAwesome 5 -kuvakkeita, jotka haluat sisällyttää käytettäviisi. Käytä etuliitettä \"fa-\", kun haluat täytetyn kuvakkeen, \"far-\", kun haluat tavallisen ja \"fab-\", kun haluat brändikuvakkeen."
     max_prints_per_hour_per_user: "Tulostuspyyntöjen (/print) enimmäismäärä (aseta 0 poistaaksesi käytöstä)"
     full_name_required: "Koko nimi on käyttäjäprofiilin pakollinen kenttä."
@@ -1876,9 +1985,11 @@ fi:
     display_name_on_posts: "Näytä käyttäjän koko nimi viesteissä @käyttäjätunnuksen lisäksi."
     show_time_gap_days: "Jos kahden viestin välissä on kulunut näin monta päivää, näytä aikaväli ketjussa."
     short_progress_text_threshold: "Kuinka monen viestin jälkeen ketjun edistyspalkissa näytetään vain nykyisen viestin numero. Jos muutat palkin leveyttä, voit joutua muuttamaan tätä arvoa."
+    default_code_lang: "Oletusarvoinen ohjelmointikielen syntaksin korostus, jota käytetään koodilohkoissa (auto, nohighlight, ruby, python jne.). Tämä arvo täytyy esiintyä myös \"highlighted languages\" -sivustoasetuksessa."
     warn_reviving_old_topic_age: "Kun käyttäjä alkaa kirjoittamaan vastausta ketjuun, jonka uusin viesti on tätä vanhempi päivissä, näytetään varoitus. Poista käytöstä asettamalla arvoksi 0."
     autohighlight_all_code: "Pakota koodin korostus kaikkiin esimuotoiltuihin koodilohkoihin, vaikka käyttäjä ei määrittelisi kieltä."
     highlighted_languages: "Mitä syntaksikorostussääntöjä on käytössä. (Varoitus: liian monen kielen käyttöönotto voi vaikuttaa suorituskykyyn.) Ks. demo: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
+    show_copy_button_on_codeblocks: "Lisää koodilohkoihin painike lohkon sisällön kopioimiseksi käyttäjän leikepöydälle."
     embed_any_origin: "Salli upotettava sisältö alkuperästä riippumatta. Tämä vaaditaan mobiilisovelluksille, joissa on staattista HTML:ää."
     embed_topics_list: "Tue ketjuluetteloiden HTML-upottamista"
     embed_set_canonical_url: "Aseta upotetun sisällön URL-osoitteeksi upotettujen ketjujen kanoninen URL."
@@ -1895,6 +2006,12 @@ fi:
     delete_merged_stub_topics_after_days: "Kuinka montaa päivää odotetaan ennen kuin täysin yhdistetyt tynkäketjut poistetaan automaattisesti. Jos asetat arvoksi 0, tynkäketjuja ei poistetan koskaan."
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
     prevent_anons_from_downloading_files: "Estä tuntemattomia käyttäjiä lataamasta liitteitä."
+    secure_media: 'VANHENTUNUT: Käytä tämän sijaan secure_uploads-asetusta, poistetaan Discourse 3.0:ssa.'
+    secure_uploads: 'Rajoittaa pääsyä KAIKKIIN latauksiin (kuvat, videot, äänet, tekstit, pdf-tiedostot, zip-tiedostot ja muut). Jos "sisäänkirjautuminen vaaditaan" on käytössä, vain kirjautuneilla käyttäjillä on pääsy latauksiin. Muussa tapauksessa pääsy rajoitetaan vain yksityisviesteihin ja yksityisiin alueisiin ladattuihin mediatiedostoihin. VAROITUS: Tämä asetus on monimutkainen ja vaatii syvällistä hallinnollista ymmärrystä. Katso lisätietoja <a target="_blank" href="https://meta.discourse.org/t/-/140017">turvallisia latauksia palvelimeen käsittelevästä ketjusta Metassa</a>.'
+    secure_media_allow_embed_images_in_emails: "VANHENTUNUT: Käytä \"secure_uploads_allow_embed_images_in_emails\"-asetusta, poistetaan Discourse 3.0:ssa."
+    secure_uploads_allow_embed_images_in_emails: "Sallii turvallisten kuvien upottamisen, jotka normaalisti karsittaisiin sähköposteissa, jos niiden koko on pienempi kuin \"secure uploads max email embed image size kb\" -asetus."
+    secure_media_max_email_embed_image_size_kb: "VANHENTUNUT: Käytä \"secure_uploads_max_email_embed_image_size_kb\"-asetusta, poistetaan Discourse 3.0:ssa."
+    secure_uploads_max_email_embed_image_size_kb: "Sähköposteihin upotettavien turvallisten kuvien kokoraja, jos \"secure uploads allow embed in emails\" -asetus on käytössä. Ilman kyseistä asetusta tällä asetuksella ei ole vaikutusta."
     slug_generation_method: "Valitse polkutunnuksen luomisen metodi, 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkutunnukset käytöstä."
     enable_emoji: "Ota emoji käyttöön"
     enable_emoji_shortcuts: "Yleiset tekstiemojit, kuten :), :p ja :(, muunnetaan emojeiksi"
@@ -1913,6 +2030,7 @@ fi:
     max_allowed_message_recipients: "Kuinka monta vastaanottajaa yksityisviestillä voi olla."
     watched_words_regular_expressions: "Tarkkaillut sanat ovat säännöllisiä lausekkeita."
     enable_diffhtml_preview: "Kokeellinen ominaisuus, joka käyttää diffHTML-tiedostoa esikatselun synkronointiin täydellisen uudelleenhahmontamisen sijaan"
+    enable_fast_edit: "Mahdollistaa pienen valinnan viestin tekstistä muokkaamisen tekstiin sidottuna."
     old_post_notice_days: "Kuinka monen päivän kuluttua viesti-ilmoitus vanhenee"
     new_user_notice_tl: "Vähimmäisluottamustaso, jolla näkee uusiin käyttäjiin liittyvät viesti-ilmoitukset."
     returning_user_notice_tl: "Vähimmäisluottamustaso, jolla näkee palaaviin käyttäjiin liittyvät viesti-ilmoitukset."
@@ -1971,6 +2089,7 @@ fi:
     tags_sort_alphabetically: "Näytä tunnisteet aakkosjärjestyksessä. Oletusasetus on näyttäminen suosion mukaan."
     tags_listed_by_group: "Listaa tunnisteet tunnisteryhmittäin <a href='%{base_path}/tags' target='_blank'>Tunnisteet-sivulla</a>."
     tag_style: "Tunnistemerkkien visuaalinen tyyli."
+    pm_tags_allowed_for_groups: "Sallita sisältyvien ryhmien jäsenten merkitä tunnisteella mikä tahansa yksityisviesti"
     min_trust_level_to_tag_topics: "Vähimmäisluottamustaso, jolla voi lisätä tunnisteita ketjuihin"
     suppress_overlapping_tags_in_list: "Jos tunniste esiintyy sanana täsmälleen ketjun otsikossa, älä näytä tunnistetta"
     remove_muted_tags_from_latest: "Jos ketjulla on vain vaimennettuja tunnisteita, älä näytä ketjua Tuoreimmat-ketjuluettelossa."
@@ -1984,6 +2103,10 @@ fi:
     push_notifications_icon: "Ilmoituskulmassa näkyvä kunniamerkkikuvake. Suosittelemme yksiväristä läpinäkyvää PNG:tä, jonka koko on 96×96."
     base_font: "Perusfontti, jota käytetään suurimmalle osalle sivuston tekstistä. Teemat voivat ohittaa valinnan mukautetulla CSS-määritteellä \"--font-family\"."
     heading_font: "Fontti, jota käytetään sivuston otsikoissa. Teemat voivat ohittaa valinnan mukautetulla CSS-määritteellä \"--heading-font-family\"."
+    enable_sitemap: "Luo sivustokartta sivustollesi ja sisällytä se robots.txt-tiedostoon."
+    sitemap_page_size: "Kuhunkin sivustokartan sivuun lisättävien URL-osoitteiden määrä. Enintään 50 000."
+    enable_user_status: "(kokeellinen) Salli käyttäjien asettaa mukautettu tilaviesti (emoji + kuvaus)."
+    enable_onboarding_popups: "(kokeellinen) Ota käyttöön opetusponnahdusikkunat, jotka kuvaavat keskeisiä ominaisuuksia käyttäjille"
     short_title: "Lyhyttä nimeä käytetään käyttäjän aloitusnäytöllä, käynnistysruudussa ja muissa tilanteissa, joissa tilaa on rajallisesti. Sen tulisi olla enintään 12 merkin pituinen."
     dashboard_hidden_reports: "Salli tiettyjen raporttien piilottaminen hallintapaneelista."
     dashboard_visible_tabs: "Valitse mitkä hallintapaneelin välilehdet ovat näkyvillä."
@@ -1994,9 +2117,19 @@ fi:
     share_quote_buttons: "Mitkä kohteet näytetään lainauksen jakamispienoisohjelmassa ja missä järjestyksessä."
     share_quote_visibility: "Milloin lainauksen jakamispainikkeet näytetään: ei koskaan, vain anonyymeille käyttäjille tai kaikille käyttäjille. "
     create_revision_on_bulk_topic_moves: "Luo revisio ensimmäisille viesteille, kun ketjut siirretään uuteen alueeseen joukkona."
+    allow_changing_staged_user_tracking: "Salli ylläpitäjäkäyttäjän muuttaa esikäyttäjän alue- ja tunnisteilmoitusasetuksia."
+    use_email_for_username_and_name_suggestions: "Käytä sähköpostiosoitteiden ensimmäistä osaa käyttäjätunnus- ja -nimiehdotuksiin. Huomioi, että tämän avulla ihmisten on helpompi arvata käyttäjän sähköpostiosoite (koska suuri osa ihmisistä käyttää yleisesti käytettyjä palveluita, kuten Gmailia)."
+    use_name_for_username_suggestions: "Käytä käyttäjän koko nimeä käyttäjätunnusten ehdottamiseen."
+    suggest_weekends_in_date_pickers: "Sisällytä viikonloput (lauantai ja sunnuntai) päivämäärävalitsimen ehdotuksiin (poista tämä käytöstä, jos käytät Discoursea vain arkipäivisin maanantaista perjantaihin)."
+    splash_screen: "Näyttää väliaikaisen latausnäytön sivuston resurssien latautuessa"
+    default_sidebar_categories: "Valitut alueet näkyvät sivupalkin Alueet-osiossa oletuksena."
+    default_sidebar_tags: "Valitut tunnisteet näkyvät sivupalkin Tunnisteet-osiossa oletuksena."
+    enable_new_user_profile_nav_groups: "KOKEELLINEN: valittujen ryhmien käyttäjille näytetään uusi käyttäjäprofiilin navigointivalikko"
     errors:
+      invalid_css_color: "Virheellinen väri. Anna värin nimi tai heksadesimaaliarvo."
       invalid_email: "Sähköpostiosoite ei kelpaa."
       invalid_username: "Tällä käyttäjätunnuksella ei löydy käyttäjää."
+      valid_username: "Tällä käyttäjätunnuksella löytyy käyttäjä."
       invalid_group: "Tällä nimellä ei löydy ryhmää."
       invalid_integer_min_max: "Arvon pitää olla välillä %{min}–%{max}."
       invalid_integer_min: "Arvon pitää olla vähintään %{min}."
@@ -2011,6 +2144,7 @@ fi:
       invalid_json: "Virheellinen JSON."
       invalid_reply_by_email_address: "Arvon täytyy sisältää '%{reply_key}' ja erota ilmoitusten sähköpostiosoitteesta."
       invalid_alternative_reply_by_email_addresses: "Kaikkien arvojen täytyy sisältää '%{reply_key}' ja erota ilmoitusten sähköpostiosoitteesta."
+      invalid_domain_hostname: "Ei saa sisältää merkkejä * tai ?."
       pop3_polling_host_is_empty: "Sinun täytyy asettaa 'pop3 polling host' ennen POP3-pollauksen käyttöönottoa."
       pop3_polling_username_is_empty: "Sinun täytyy asettaa 'pop3 polling username' ennen POP3-pollauksen käyttöönottoa."
       pop3_polling_password_is_empty: "Sinun täytyy asettaa 'pop3 polling password' ennen POP3-pollauksen käyttöönottoa."
@@ -2018,7 +2152,9 @@ fi:
       reply_by_email_address_is_empty: "'Reply by email address' täytyy olla asetettuna ennen sähköpostivastausten ottamista käyttöön."
       email_polling_disabled: "Sinun täytyy ottaa käyttöön joko manuaalinen tai POP3-pollaus ennen sähköpostivastausten käyttöönottoa."
       user_locale_not_enabled: "'Allow user locale' täytyy olla asetettuna ennen tämän asetuksen ottamista käyttöön."
+      personal_message_enabled_groups_invalid: "Sinun täytyy määrittää vähintään yksi ryhmä tälle asetukselle. Jos et halua muiden kuin henkilökunnan lähettävän yksityisviestejä, valitse henkilökunnan ryhmä."
       invalid_regex: "Säännöllinen lauseke ei kelpaa tai ei ole sallittu."
+      invalid_regex_with_message: "Säännöllisessä lausekkeessa \"%{regex}\" on virhe: %{message}"
       email_editable_enabled: "Sähköpostin muokkausmahdollisuus on poistettava käytöstä ennen tämän asetuksen käyttöönottoa."
       staged_users_disabled: "Esikäyttäjät on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
       reply_by_email_disabled: "Vastaus sähköpostilla täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
@@ -2039,6 +2175,12 @@ fi:
         leading_trailing_slash: "Säännöllinen lauseke ei voi alkaa eikä loppua kauttaviivalla."
       unicode_usernames_avatars: "Sisäinen avatarjärjestelmä ei tue Unicode-käyttäjätunnuksia."
       list_value_count: "Luettelon täytyy sisältää täsmälleen %{count} arvoa."
+      markdown_linkify_tlds: "Et voi lisätä arvoa \"*\"."
+      google_oauth2_hd_groups: "Sinun täytyy määrittää kaikki \"google oauth2 hd\" -asetukset ennen kuin otat tämän asetuksen käyttöön."
+      search_tokenize_chinese_enabled: "\"search_tokenize_chinese\" on poistettava käytöstä ennen tämän asetuksen käyttöönottoa."
+      search_tokenize_japanese_enabled: "\"search_tokenize_japanese\" on poistettava käytöstä ennen tämän asetuksen käyttöönottoa."
+      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Et voi ottaa DiscourseConnectia käyttöön, jos 2FA on pakotettu."
+      delete_rejected_email_after_days: "Tämä asetus ei voi olla pienempi kuin delete_email_logs_after_days-asetus tai suurempi kuin %{max}"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2167,6 +2309,7 @@ fi:
     reset_not_allowed_from_ip_address: "Et voi pyytää salasanan palauttamista tästä IP-osoitteesta."
     suspended: "Et voi kirjautu sisään ennen %{date}."
     suspended_with_reason: "Tili on hyllytetty %{date} asti: %{reason}"
+    suspended_with_reason_forever: "Tili on hyllytetty: %{reason}"
     errors: "%{errors}"
     not_available: "Ei saatavissa. Kokeile %{suggestion}?"
     something_already_taken: "Jokin meni vikaan. Tämä käyttäjätunnus tai sähköpostiosoite on ehkä jo rekisteröity, kokeile salasanan unohduslinkkiä."
@@ -2199,6 +2342,15 @@ fi:
     second_factor_toggle:
       totp: "Käytä todennussovellusta tai tunnistautumislaitetta tämän sijaan"
       backup_code: "Käytä varakoodia tämän sijaan"
+  second_factor_auth:
+    challenge_not_found: "2FA-haastetta ei löytynyt nykyisestä istunnostasi."
+    challenge_expired: "2FA-haasteen järjestämisestä on kulunut liian kauan, eikä se ole enää voimassa. Yritä uudelleen."
+    challenge_not_completed: "Et ole suorittanut 2FA-haastetta tämän toiminnon suorittamiseksi. Suorita 2FA-haaste ja yritä uudelleen."
+    actions:
+      grant_admin:
+        description: "Lisätietoturvatoimenpiteenä sinun täytyy vahvistaa 2FA:si ennen kuin käyttäjälle %{username} myönnetään ylläpitäjän käyttöoikeudet."
+      discourse_connect_provider:
+        description: "%{hostname} on pyytänyt sinua vahvistamaan 2FA:n. Sinut ohjataan takaisin sivustolle, kun olet vahvistanut 2FA:n."
   admin:
     email:
       sent_test: "lähetetty!"
@@ -2369,17 +2521,63 @@ fi:
   test_mailer:
     title: "Sähköpostipalvelun testaus"
     subject_template: "[%{email_prefix}] Sähköpostin toimitettavuustesti"
+    text_body_template: |
+      Tämä on testisähköposti lähettäjältä
+
+      [**%{base_url}**][0]
+
+      Toivomme, että vastaanotit tämän sähköpostin toimitustestin ongelmitta!
+
+      Tässä on [kätevä tarkistuslista sähköpostin toimitusmäärityksen tarkistamiseen][1].
+
+      Onnea,
+
+      Ystäväsi [Discoursella](https://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839
   new_version_mailer:
     title: "Uusi versio"
     subject_template: "[%{email_prefix}] Uusi Discourse-versio, päivitys saatavilla"
+    text_body_template: |
+      Hurraa, uusi [Discourse-versio](https://www.discourse.org) on saatavilla!
+
+      Sinun versiosi: %{installed_version}
+      Uusi versio: **%{new_version}**
+
+      – Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
+
+      – Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tag/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/main)
+
+      – Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
   new_version_mailer_with_notes:
     title: "Uusi versio julkaisumuistiolla"
     subject_template: "[%{email_prefix}] päivitys saatavilla"
+    text_body_template: |
+      Hurraa, uusi [Discourse-versio](https://www.discourse.org) on saatavilla!
+
+      Sinun versiosi: %{installed_version}
+      Uusi versio: **%{new_version}**
+
+      – Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
+
+      – Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tag/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/main)
+
+      – Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
+
+      ### Julkaisutiedot
+
+      %{notes}
   flag_reasons:
     off_topic: "Viestisi merkittiin **eksyvän aiheesta**: koetaan, ettei se ei kuulu ketjun aiheeseen, jonka määrittelevät sen aloitusviesti ja otsikko."
     inappropriate: "Viestisi merkittiin **sopimattomaksi**: se koetaan loukkaavaksi, herjaavaksi tai [yhteisön sääntöjen](%{base_path}/guidelines) vastaiseksi."
     spam: "Viestisi merkittiin **roskapostiksi**: sen koetaan olevan luonteeltaan mainostamista eikä hyödyllinen tai asiallinen lisä keskusteluun."
     notify_moderators: "Viestisi merkittiin **valvojien tiedoksi**: siinä koetaan olevan jotain, mihin henkilökunnan pitäisi puuttua."
+    responder:
+      off_topic: "Viestisi merkittiin **eksyvän aiheesta**: koetaan, ettei se ei kuulu ketjun aiheeseen, jonka määrittelevät sen aloitusviesti ja otsikko."
+      inappropriate: "Viesti merkittiin **sopimattomaksi**: se koetaan loukkaavaksi, herjaavaksi tai [yhteisön sääntöjen](%{base_path}/guidelines) vastaiseksi."
+      spam: "Viesti merkittiin **roskapostiksi**: sen koetaan olevan luonteeltaan mainostamista eikä hyödyllinen tai asiallinen lisä keskusteluun."
+      notify_moderators: "Viesti merkittiin **valvojien tiedoksi**: siinä koetaan olevan jotain, mihin henkilökunnan pitäisi puuttua."
   flags_dispositions:
     agreed: "Kiitos kun toit asian tietoomme. Olemme samaa mieltä ongelmasta ja selvitämme sitä."
     agreed_and_deleted: "Kiitos kun toit asian tietoomme. Olemme samaa mieltä ongelmasta ja poistimme kyseisen viestin."
@@ -2390,6 +2588,11 @@ fi:
     one: "Ketju on väliaikaisesti suljettu ainakin %{count} tunnin ajaksi johtuen suuresta määrästä yhteisön merkintöjä."
     other: "Ketju on väliaikaisesti suljettu ainakin %{count} tunnin ajaksi johtuen suuresta määrästä yhteisön merkintöjä."
   system_messages:
+    reviewables_reminder:
+      subject_template: "Tarkastusjono käsittelyä vaativia kohteita"
+      text_body_template:
+        one: "%{mentions} Kohteet lähetettiin yli %{count} tunti sitten. [Tarkasta ne](%{base_url}/review)."
+        other: "%{mentions} Kohteet lähetettiin yli %{count} tuntia sitten. [Tarkasta ne](%{base_url}/review)."
     private_topic_title: "Ketju #%{id}"
     contents_hidden: "Käy lukemassa viesti, jotta näet sen sisällön."
     post_hidden:
@@ -2469,6 +2672,28 @@ fi:
         ```
 
         Kertaa [yhteisön säännöt](%{base_url}/guidelines), jos haluat lisätietoa.
+    flags_agreed_and_post_deleted_for_responders:
+      title: "Henkilökunta poisti vastauksen liputetusta viestistä"
+      subject_template: "Henkilökunta poisti vastauksen liputetusta viestistä"
+      text_body_template: |
+        Hei,
+
+        Tämä automaattinen viesti lähetettiin sivustolta %{site_name} kertoaksemme sinulle, että [viesti](%{base_url}%{url}), johon vastasit, poistettiin.
+
+        %{flag_reason}
+
+        Yhteisö liputti viestin, ja henkilökunnan jäsen päätti poistaa sen.
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        Johon vastasit
+
+        ``` markdown
+        %{flagged_post_response_raw_content}
+        ```
+
+        Lisätietoja poistamisen syystä saat kertaamalla [yhteisön säännöt](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         [Tässä blogikirjoituksessa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) on joitakin käteviä vinkkejä uudelle käyttäjälle.
@@ -2520,24 +2745,70 @@ fi:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "Onnittelut luottamustason noususta!"
+      text_body_template: |
+        Olemme ylentäneet sinut toiselle [luottamustasolle](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Luottamustason 2 saavuttaminen tarkoittaa, että olet lukenut ja osallistunut aktiivisesti tarpeeksi, jotta sinut voidaan lukea tämän yhteisön jäseneksi.
+
+        Kokeneena käyttäjänä saatat arvostaa [tätä hyödyllisten vinkkien luetteloa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Kutsumme sinut jatkamaan osallistumistasi – on mukavaa, että olet seurassamme.
     backup_succeeded:
       title: "Varmuuskopiointi onnistui"
       subject_template: "Varmuuskopiointi suoritettu onnistuneesti"
+      text_body_template: |
+        Varmuuskopiointi onnistui.
+
+        Lataa varmuuskopio siirtymällä kohtaan [ylläpito > varmuuskopiot](%{base_url}/admin/backups).
+
+        Tässä loki:
+
+        %{logs}
     backup_failed:
       title: "Varmuuskopiointi epäonnistui"
       subject_template: "Varmuuskopiointi epäonnistui"
+      text_body_template: |
+        Varmuuskopiointi epäonnistui.
+
+        Tässä loki:
+
+        %{logs}
     restore_succeeded:
       title: "Palautus onnistui"
       subject_template: "Palautus suoritettu onnistuneesti"
+      text_body_template: |
+        Palautus onnistui.
+
+        Tässä loki:
+
+        %{logs}
     restore_failed:
       title: "Palautus epäonnistui"
       subject_template: "Palautus epäonnistui"
+      text_body_template: |
+        Palautus epäonnistui.
+
+        Tässä loki:
+
+        %{logs}
     bulk_invite_succeeded:
       title: "Massakutsun lähetys onnistui"
       subject_template: "Massakutsun käsittely onnistui"
+      text_body_template: |
+        Massakutsutiedostosi käsiteltiin, %{sent} kutsua lähetettiin, %{skipped} ohitettiin, %{warnings} varoitus(ta).
+
+        Tässä loki:
+
+        %{logs}
     bulk_invite_failed:
       title: "Massakutsun lähetys epäonnistui"
       subject_template: "Massakutsun käsittelyssä tapahtui virhe"
+      text_body_template: |
+        Massakutsutiedostosi käsiteltiin, %{sent} kutsua lähetettiin, %{skipped} ohitettiin, %{warnings} varoitus(ta) ja %{failed} virhe(ttä).
+
+        Tässä loki:
+
+        %{logs}
     user_added_to_group_as_owner:
       title: "Lisätty ryhmään omistajana"
       subject_template: "Sinut on lisätty ryhmän %{group_name} omistajaksi"
@@ -2757,6 +3028,15 @@ fi:
 
         Vastasit yhteenvetosähköpostiin, mitä ei hyväksytä.
 
+        Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
+    email_reject_too_many_recipients:
+      title: "Sähköposti hylätty, liian monta vastaanottajaa"
+      subject_template: "[%{email_prefix}] Sähköpostiongelma -- liian monta vastaanottajaa"
+      text_body_template: |
+        Sähköpostin lähettäminen kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
+
+        Yritit lähettää sähköpostin yli %{max_recipients_count} henkilölle, ja järjestelmämme merkitsi sähköpostisi automaattisesti roskapostiksi.
+
         Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_error_notification:
       title: "Ilmoitus sähköpostivirheestä"
@@ -2908,6 +3188,7 @@ fi:
   subject_re: "VS:"
   subject_pm: "[YV]"
   email_from: "%{user_name} sivustolta %{site_name}"
+  email_from_without_site: "%{group_name}"
   user_notifications:
     previous_discussion: "Edelliset vastaukset"
     reached_limit:
@@ -2926,6 +3207,9 @@ fi:
     reply_above_line: "## Kirjoita vastauksesi tämän viivan yläpuolelle. ##"
     posted_by: "Käyttäjältä %{username} %{post_date}"
     pm_participants: "Osanottajat: %{participants}"
+    more_pm_participants:
+      one: "%{participants} ja %{count} muu"
+      other: "%{participants} ja %{count} muuta"
     invited_group_to_private_message_body: |
       %{username} kutsui ryhmän @%{group_name} yksityiskeskusteluun
 
@@ -3082,6 +3366,7 @@ fi:
 
         %{respond_instructions}
     user_group_mentioned_pm:
+      title: "Käyttäjäryhmä mainittu yksityisviestissä"
       subject_template: "[%{email_prefix}] [YV] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3092,6 +3377,7 @@ fi:
 
         %{respond_instructions}
     user_group_mentioned_pm_group:
+      title: "Käyttäjäryhmä mainittu yksityisviestissä"
       subject_template: "[%{email_prefix}] [YV] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3150,6 +3436,10 @@ fi:
     account_suspended_forever:
       title: "Tili hyllytetty"
       subject_template: "[%{email_prefix}] Tilisi on hyllytetty"
+      text_body_template: |
+        Sinut hyllytettiin foorumilta.
+
+        Syy: %{reason}
     account_silenced:
       title: "Tili hiljennetty"
       subject_template: "[%{email_prefix}] Tilisi on hiljennetty"
@@ -3160,6 +3450,10 @@ fi:
     account_silenced_forever:
       title: "Tili hiljennetty"
       subject_template: "[%{email_prefix}] Tilisi on hiljennetty"
+      text_body_template: |
+        Sinut hiljennettiin foorumilta.
+
+        Syy: %{reason}
     account_exists:
       title: "Tili on jo olemassa"
       subject_template: "[%{email_prefix}] TIli on jo olemassa"
@@ -3351,6 +3645,18 @@ fi:
     suspicious_login:
       title: "Varoitus uudesta kirjautumisesta"
       subject_template: "[%{site_name}] Uusi kirjautuminen paikasta %{location}"
+      text_body_template: |
+        Hei,
+
+        Huomasimme, että kirjauduit sinulle epätavalliselta laitteelta tai paikasta. Olitko se sinä?
+
+         – Paikka: %{location} (%{client_ip})
+         – Selain: %{browser}
+         – Laite: %{device} – %{os}
+
+        Jos se olit sinä, hyvä! Sinun ei tarvitse reagoida mitenkään.
+
+        Jollet se ollut sinä, [tarkastele käynnissä olevia istuntojasi](%{base_url}/my/preferences/security) ja harkitse salasanasi vaihtamista.
     post_approved:
       title: "Viestisi hyväksyttiin"
       subject_template: "[%{site_name}] Viestisi hyväksyttiin"
@@ -3388,16 +3694,29 @@ fi:
     store_failure: "Latauksen #%{upload_id} käyttäjälle #%{user_id} tallentaminen epäonnistui."
     file_missing: "Sinun täytyy valita ladattava tiedosto."
     empty: "Tiedostosi on tyhjä."
+    failed: "Lataus epäonnistui. Yritä uudelleen."
     png_to_jpg_conversion_failure_message: "PNG:n muuttamisessa JPG:ksi tapahtui virhe."
     optimize_failure_message: "Ladatun kuvan optimoinnissa tapahtui virhe."
+    download_failure: "Tiedoston lataaminen ulkoiselta palveluntarjoajalta epäonnistui."
+    size_mismatch_failure: "S3:een ladatun tiedoston koko ei vastannut ulkoisen latauksen tyngän tarkoitettua kokoa. %{additional_detail}"
+    create_multipart_failure: "Moniosaisen latauksen luominen ulkoisessa tallennustilassa epäonnistui."
+    abort_multipart_failure: "Moniosaisen latauksen hylkääminen ulkoisessa tallennustilassa epäonnistui."
+    complete_multipart_failure: "Moniosaisen latauksen viimeistely ulkoisessa tallennustilassa epäonnistui."
+    external_upload_not_found: "Latausta ei löytynyt ulkoisesta tallennustilasta. %{additional_detail}"
+    checksum_mismatch_failure: "Lataamasi tiedoston tarkistussumma ei täsmää. Tiedoston sisältö on saattanut muuttua latauksen yhteydessä. Yritä uudelleen."
+    cannot_promote_failure: "Latausta ei voi suorittaa loppuun, se on ehkä valmistunut tai epäonnistunut jo aikaisemmin."
+    size_zero_failure: "Jokin näyttää menneen vikaan. Tiedosto, jota yrität ladata, on 0 tavua. Yritä uudelleen."
     attachments:
       too_large: "Tiedosto, jonka yritit ladata, on liian suuri (suurin tiedostokoko on %{max_size_kb} kt)."
+      too_large_humanized: "Tiedosto, jonka yritit ladata, on liian suuri (suurin tiedostokoko on %{max_size})."
     images:
       too_large: "Kuva, jonka yritit ladata, on liian suuri (suurin sallittu koko on %{max_size_kb} kt), pienennä kuvaa ja yritä uudestaan."
+      too_large_humanized: "Kuva, jonka yritit ladata, on liian suuri (suurin sallittu koko on %{max_size}), pienennä kuvaa ja yritä uudestaan."
       larger_than_x_megapixels: "Kuva, jonka yritit ladata, on liian suuri (maksimikoko on %{max_image_megapixels} megapikseliä). Muuta kuvan kokoa ja yritä uudelleen."
       size_not_found: "Emme pystyneet selvittämään kuvan kokoa. Ehkä kuvatiedosto on vahingoittunut?"
     placeholders:
       too_large: "(kuva on suurempi kuin %{max_size_kb} kt)"
+      too_large_humanized: "(kuva on suurempi kuin %{max_size})"
   avatar:
     missing: "Tähän sähköpostiosoitteeseen liitettyä avataria ei löydy. Voitko yrittää ladata sen uudestaan?"
   flag_reason:
@@ -3442,6 +3761,12 @@ fi:
     dark_rose: "Tumma ruusu"
     wcag: "WCAG-vaalea"
     wcag_theme_name: "WCAG-vaalea"
+    dracula: "Dracula"
+    dracula_theme_name: "Dracula"
+    solarized_light: "Solarisoitu valo"
+    solarized_light_theme_name: "Solarisoitu valo"
+    solarized_dark: "Solarisoitu tumma"
+    solarized_dark_theme_name: "Solarisoitu tumma"
     wcag_dark: "WCAG Tumma"
     wcag_dark_theme_name: "WCAG Tumma"
     default_theme_name: "Oletus"
@@ -3822,7 +4147,9 @@ fi:
     mass_award:
       errors:
         invalid_csv: Rivillä %{line_number} havaittiin virhe. Varmista, että CSV:ssä on yksi sähköpostiosoite riviä kohden.
+        too_many_csv_entries: Liian monta merkintää CSV-tiedostossa. Anna CSV-tiedosto, jossa on enintään %{count} merkintää.
         badge_disabled: Ota kunniamerkki %{badge_name} käyttöön ensin.
+        cant_grant_multiple_times: Kunniamerkkiä %{badge_name} ei voi myöntää useita kertoja yhdelle käyttäjälle.
     editor:
       name: Muokkaaja
       description: Ensimmäinen viestin muokkaus
@@ -4071,6 +4398,7 @@ fi:
       invalid_token: "Tunniste ei kelpaa."
     email_input: "Ylläpitäjän sähköpostiosoite"
     submit_button: "Lähetä sähköposti"
+    safe_mode: "Vikasietotila: poista kaikki teemat ja lisäosat käytöstä kirjautuessasi sisään"
   performance_report:
     initial_post_raw: Tämä ketju sisältää päivittäisiä suorituskykyrapotteja sivustoltasi
     initial_topic_title: Sivuston suorituskykyraportit
@@ -4092,6 +4420,12 @@ fi:
         other: 'Tunnistetta "%{tag_name}" voi käyttää ainoastaan seuraavilla alueilla: %{category_names}'
       synonym: 'Synonyymit kielletty. Käytä sen sijaan tunnistetta "%{tag_name}".'
       has_synonyms: 'Tunnistetta "%{tag_name}" ei voi käyttää, koska sillä on synonyymejä.'
+      restricted_tags_cannot_be_used_in_category:
+        one: 'Tunnistetta "%{tags}" ei voi käyttää alueella "%{category}". Poista se.'
+        other: 'Tunnisteita "%{tags}" ei voi käyttää alueella "%{category}". Poista ne.'
+      category_does_not_allow_tags:
+        one: 'Alue "%{category}" ei salli tunnistetta "%{tags}". Poista se.'
+        other: 'Alue "%{category}" ei salli tunnisteita "%{tags}". Poista ne.'
     required_tags_from_group:
       one: "Sinun täytyy lisätä vähintään %{count} ryhmän %{tag_group_name} tunniste. Tämän ryhmän tunnisteet ovat: %{tags}."
       other: "Sinun täytyy lisätä vähintään %{count} ryhmän %{tag_group_name} tunnistetta. Tämän ryhmän tunnisteet ovat: %{tags}."
@@ -4103,6 +4437,7 @@ fi:
     register:
       button: "Rekisteröidy"
       title: "Rekisteröi ylläpitäjän tili"
+      help: "Aloita rekisteröimällä uusi tili."
       no_emails: "Ylläpitäjän sähköpostiosoitetta ei määritetty asennuksen aikana, joten asennuksen viimeistely voi olla vaikeaa. Lisää kehittäjän sähköpostiosoite määritystiedostoon tai <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>luo ylläpitäjän tili konsolissa</a>."
     confirm_email:
       title: "Vahvista sähköpostisi"
@@ -4112,6 +4447,8 @@ fi:
       message: "<p>Lähetimme uuden aktivointiviestin osoitteeseen <b>%{email}</b>"
   safe_mode:
     title: "Siirry vikasietotilaan"
+    description: "Vikasietotilassa voit testata sivustoasi ilman lisäosia ja teemoja."
+    no_themes: "Poista teemat ja teeman komponentit käytöstä"
     no_unofficial_plugins: "Poista epäviralliset lisäosat käytöstä"
     no_plugins: "Poista kaikki lisäosat käytöstä"
     enter: "Siirry vikasietotilaan"
@@ -4120,24 +4457,40 @@ fi:
     title: "Discoursen asennus"
     step:
       introduction:
+        title: "Kerro meille yhteisöstäsi"
         fields:
           title:
+            label: "Yhteisön nimi"
             placeholder: "Jennin mesta"
           site_description:
+            label: "Kuvaile yhteisöä yhdellä lauseella"
             placeholder: "Paikka, jossa Jenni ja hänen ystävänsä voivat keskustella kivoista jutuista"
+          contact_email:
+            label: "Yhteyshenkilö"
+            placeholder: "esimerkki@käyttäjä.com"
+            description: "Tästä yhteisöstä vastaava henkilö tai ryhmä. Käytetään kriittisiin päivityksiin, ja se on ilmoitettu <a href='%{base_path}/about' target='_blank'>tietoa-sivulla</a> kiireellisiä yhteydenottoja varten."
           default_locale:
             label: "Kieli"
       privacy:
+        title: "Jäsenkokemus"
         fields:
           login_required:
             placeholder: "Yksityinen"
             extra_description: "Vain kirjautuneilla käyttäjillä on pääsy yhteisöön"
+          invite_only:
+            placeholder: "Vain kutsusta"
+            extra_description: "Luotettujen käyttäjien tai henkilökunnan on kutsuttava käyttäjät, muutoin käyttäjät voivat rekisteröityä itse"
           must_approve_users:
-            placeholder: "Vie hyväksyttäväksi"
+            placeholder: "Vaadi hyväksyntä"
+            extra_description: "Henkilökunnan täytyy hyväksyä käyttäjät"
       ready:
         title: "Discourse-sivustosi on valmis!"
+        description: "Olet nyt tehnyt perusasioat yhteisösi määrittämiseksi. Nyt voit alkaa tutustumaan paikkoihin, kirjoittaa tervetuloketjun ja lähettää kutsuja!<br><br>Pidä hauskaa!"
       styling:
+        title: "Ulkoasu ja tuntuma"
         fields:
+          color_scheme:
+            label: "Värimalli"
           body_font:
             label: "Leipätekstin fontti"
           heading_font:
@@ -4145,6 +4498,7 @@ fi:
           styling_preview:
             label: "Esikatselu"
           homepage_style:
+            label: "Aloitussivun tyyli"
             choices:
               latest:
                 label: "Tuoreimmat ketjut"
@@ -4154,26 +4508,42 @@ fi:
                 label: "Alueet, joissa on esiteltyjä ketjuja"
               categories_and_latest_topics:
                 label: "Alueet ja tuoreimmat ketjut"
+              categories_and_latest_topics_created_date:
+                label: "Alueet ja tuoreimmat ketjut (lajiteltuna ketjun luomispäivän mukaan)"
               categories_and_top_topics:
                 label: "Alueet ja suosittuja ketjuja"
+              categories_boxes:
+                label: "Alueet laatikoissa"
+              categories_boxes_with_topics:
+                label: "Alueet laatikoissa, joissa ketjuja"
+              subcategories_with_featured_topics:
+                label: "Ala-alueet, joissa on esiteltyjä ketjuja"
       branding:
+        title: "Mukauta logoja"
         fields:
           logo:
             label: "Ensisijainen logo"
+            description: "Sivuston vasemmassa yläkulmassa oleva logo. Käytä leveää suorakulmaista kuvaa, jonka korkeus on 120 ja kuvasuhde suurempi kuin 3:1"
           logo_small:
             label: "Neliölogo"
+            description: "Neliön muotoinen versio sivuston logosta. Näkyy vasemmassa yläkulmassa, kun vierität sivua alaspäin, sekä sosiaalisen median julkaisuissa. Mielellään vähintään 512x512."
           favicon:
             label: "Selaimen kuvake"
+            description: "Kuvake, jota käytetään kuvaamaan sivustoasi verkkoselaimissa, ja joka näyttää hyvältä pienessä koossa. Suositellut kuvamuodot ovat PNG ja JPG. Neliönmuotoista logoa käytetään oletuksena."
           large_icon:
             label: "Suuri kuvake"
+            description: "Kuvake, jota käytetään kuvaamaan sivustoa mobiililaitteilla, ja joka näyttää hyvältä suuremmissa kokoluokissa. Mielellään suurempi kuin 512×512. Neliönmuotoista logoa käytetään oletuksena."
       corporate:
+        title: "Organisaatiosi"
         fields:
           company_name:
             label: "Yrityksen nimi"
             placeholder: "Esimerkkiorganisaatio"
+            description: "Lisätään käyttöehtosivullesi. Voit ohittaa tämän, jos sinulla ei ole yritystä."
           governing_law:
             label: "Sovellettava lainsäädäntö"
             placeholder: "Kalifornian laki"
+            description: "Lisätään käyttöehtosivullesi. Voit ohittaa tämän, jos sinulla ei ole yritystä."
           contact_url:
             label: "Verkkosivu"
             placeholder: "https://www.esimerkki.fi/ota-yhteytta"
@@ -4181,6 +4551,7 @@ fi:
           city_for_disputes:
             label: "Kaupunki, jonka oikeudessa riidat ratkotaan"
             placeholder: "San Francisco, Kalifornia"
+            description: "Lisätään käyttöehtosivullesi. Voit ohittaa tämän, jos sinulla ei ole yritystä."
           site_contact:
             label: "Automaattiset viestit"
             description: "Kaikki Discoursen automaattiset yksityisviestit lähetetään tältä käyttäjältä, kuten varoitukset merkinnöistä ja ilmoitukset valmistuneista varmuuskopioista."
@@ -4239,8 +4610,24 @@ fi:
     missing_version: "Sinun on annettava version parametri"
     conflict: "Tapahtui muutosristiriita, joka estää tämän toimenpiteen."
     reasons:
+      post_count: "Muutama ensimmäinen viesti jokaiselta uudelta käyttäjältä tulee henkilökunnan hyväksyttäväksi. Katso %{link}."
+      trust_level: "Matalan luottamustason käyttäjien vastaukset tulevat henkilökunnan hyväksyttäviksi. Katso %{link}."
+      new_topics_unless_trust_level: "Matalan luottamustason käyttäjien ketjut tulevat henkilökunnan hyväksyttäviksi. Katso %{link}."
+      fast_typer: "Uusi käyttäjä kirjoitti ensimmäisen viestinsä epäilyttävän nopeasti. Käyttäytyminen viittaa bottiin tai roskapostittajaan. Katso %{link}."
+      auto_silence_regex: "Uusi käyttäjä, jonka ensimmäinen viesti vastaa %{link}-asetusta."
+      watched_word: "Tämä viesti sisälsi tarkkaillun sanan. Katso %{link}."
+      staged: "Henkilökunnan täytyy hyväksyä esikäyttäjien uudet ketjut ja viestit. Katso %{link}."
+      category: "Tämän alueen viestit vaativat henkilökunnan hyväksyntää. Katso %{link}."
+      must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki uudet käyttäjät. Katso %{link}."
+      invite_only: "Kaikki uudet käyttäjät täytyy kutsua. Katso %{link}."
       email_auth_res_enqueue: "Tämän sähköpostiviestin DMARC-tarkistus epäonnistui, todennäköisesti se ei ole kyseiseltä henkilöltä. Tarkista sähköpostin otsikkotiedot saadaksesi lisätietoja."
+      email_spam: "Tämä sähköposti liputettiin roskapostiksi asetuksessa %{link} määritellyllä otsikolla."
+      suspect_user: "Tämä uusi käyttäjä täytti profiilitiedot lukematta ketjuja tai viestejä, mikä viittaa vahvasti siihen, että hän saattaa olla roskapostittaja. Katso %{link}."
+      contains_media: "Tämä viesti sisältää upotettua mediasisältöä. Katso %{link}."
       queued_by_staff: "Henkilökunnan jäsen kokee, että tämä viesti on tarkistettava. Se pysyy piilotettuna, kunnes se on tarkastettu."
+      links:
+        watched_word: tarkkailtujen sanojen luettelo
+        category: alueen asetukset
     actions:
       agree:
         title: "Hyväksy..."
@@ -4324,6 +4711,8 @@ fi:
   notification_level:
     ignore_error: "Et voi sivuuttaa kyseistä käyttäjää."
     mute_error: "Et voi hiljentää kyseistä käyttäjää."
+    error: "Et voi muuttaa tämän käyttäjän ilmoitustasoa."
+    invalid_value: '"%{value}" ei ole kelvollinen ilmoitustaso.'
   discord:
     not_in_allowed_guild: "Todennus epäonnistui. Et ole sallitun Discord-killan jäsen."
   old_keys_reminder:
@@ -4343,6 +4732,9 @@ fi:
     post_raw: "Jatkaa keskustelua ketjusta %{parent_url}.\n\nAikaisemmat keskustelut:\n\n%{previous_topics}"
     small_action_post_raw: "Jatka keskustelua ketjussa %{new_title}."
   fallback_username: "käyttäjä"
+  user_status:
+    errors:
+      ends_at_should_be_greater_than_set_at: "ends_at täytyy olla suurempi kuin set_at"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 92b154f348..8b6358ca10 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -61,7 +61,7 @@ fr:
     ember_selector_error: "Nous sommes désolés, utiliser un sélecteur CSS nommé #ember ou .ember-view n'est pas permis, car ces noms sont générés dynamiquement au moment de l'exécution et sont amenés à changer au cours du temps, ce qui entraînera potentiellement un dysfonctionnement des définitions CSS. Veuillez choisir un autre sélecteur."
     import_error:
       generic: Une erreur s'est produite lors de l'importation de ce thème
-      upload: "Erreur lors de la création de l'élément de téléchargement : %{name}. %{errors}"
+      upload: "Erreur lors de la création de l'élément de téléversement : %{name}. %{errors}"
       about_json: "Erreur d'importation : about.json n'existe pas ou est invalide. Êtes-vous sûr(e) qu'il s'agit d'un thème Discourse ?"
       about_json_values: "about.json contient des valeurs invalides : %{errors}"
       modifier_values: "les modificateurs du fichier about.json contiennent des valeurs invalides : %{errors}"
@@ -128,6 +128,7 @@ fr:
         unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
         email_not_allowed: "Se produit quand l'adresse courriel n'est pas reprise dans la liste autorisée ou se trouve dans la liste des expéditeurs indésirables."
       unrecognized_error: "Erreur non reconnue"
+    secure_uploads_placeholder: "Masqué : ce site a activé la sécurisation des téléversements. Visitez le sujet ou cliquez sur « Afficher le contenu multimédia » pour les voir."
     view_redacted_media: "Afficher le média"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -165,8 +166,8 @@ fr:
       emojis_disabled: "ne peut pas contenir des émojis"
       ip_address_already_screened: "est déjà inclus dans une règle existante"
       restrict_dependent_destroy:
-        one: "Impossible de supprimer l'enregistrement car certains %{record} existent et en dépendent"
-        other: "Impossible de supprimer l'enregistrement car un %{record} existe et en dépend"
+        one: "Impossible de supprimer l'enregistrement, car un %{record} dépendant existe"
+        other: "Impossible de supprimer l'enregistrement, car des %{record} dépendants existent"
       too_long:
         one: 'est trop long (nombre maximal de caractères : %{count})'
         other: 'est trop long (nombre maximal de caractères : %{count})'
@@ -197,6 +198,7 @@ fr:
       page_publishing_requirements: "La publication de pages ne peut pas être activée si la sécurisation des médias est activée."
       s3_backup_requires_s3_settings: "Utiliser S3 comme emplacement de sauvegarde nécessite de renseigner le paramètre « %{setting_name} »."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour « s3_upload_bucket » et « s3_backup_bucket ». Choisissez un autre bucket ou utilisez un chemin d'accès différent pour chaque bucket."
+      secure_uploads_requirements: "Les téléversements S3 doivent être activés avant d'activer les téléversements sécurisés."
       share_quote_facebook_requirements: "Vous devez définir un identifiant d'application Facebook pour activer le partage de citation vers Facebook."
       second_factor_cannot_enforce_with_socials: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque des connexions aux réseaux sociaux sont activées. Vous devez d'abord désactiver la connexion via : %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque les connexions locales sont désactivées."
@@ -204,10 +206,10 @@ fr:
       local_login_cannot_be_disabled_if_second_factor_enforced: "Vous ne pouvez pas désactiver les connexions locales lorsque l'authentification à deux facteurs est obligatoire. Veuillez désactiver l'obligation d'authentification à deux facteurs avant de désactiver les connexions locales."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Il n'est pas possible d'activer l'envoi de fichiers sur S3 car il est déjà activé globalement, et l'activer au niveau du site pourrait provoquer des problèmes majeurs avec les fichiers envoyés."
       cors_origins_should_not_have_trailing_slash: "Vous ne devez pas ajouter la barre oblique finale (/) aux origines CORS."
-      slow_down_crawler_user_agent_must_be_at_least_3_characters: "Les champs \"User-agent\" spécifiés ne peuvent être inférieurs à 3 caractères, afin d'éviter tout ralentissement accidentel des utilisateurs légitimes du site."
-      slow_down_crawler_user_agent_cannot_be_popular_browsers: "Pour ce réglage, vous ne pouvez pas utiliser les valeurs suivantes : %{values}."
-      strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Vous ne pouvez désactiver \"Enlever les métadonnées de l'image\" si \"Permet l'optimisation multimédia côté client des fichiers image téléversés\" est activé. Désactivez \"Permet l'optimisation multimédia côté client des fichiers image téléversés\" puis désactivez \"Enlever les métadonnées de l'image\"."
-      twitter_summary_large_image_no_svg: "Les images pour les cartes résumées de Twitter ne peuvent être au format .svg"
+      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 incorrectement le débit des utilisateurs humains."
+      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 le retrait des métadonnées de l'image si l'option « Image d’optimisation des médias du compositeur activée » est activée. Désactivez cette option avant de désactiver les métadonnées de l'image."
+      twitter_summary_large_image_no_svg: "Les images de résumé Twitter utilisées pour les métadonnées twitter:image ne peuvent pas être des images .svg."
     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>'
     onebox:
       invalid_address: "Nous sommes désolés, nous n'avons pas pu générer d'aperçu pour cette page Web car le serveur « %{hostname} » n'a pas pu être trouvé. Au lieu d'un aperçu, seul un lien apparaîtra dans votre message. :cry:"
@@ -230,7 +232,7 @@ fr:
       <p>Sinon, veuillez <a href="%{base_url}/password-reset">réinitialiser votre mot de passe</a>.</p>
     not_found_template_link: |
       <p>La date d'expiration de cette invitation à <a href="%{base_url}">%{site_name}</a> est dépassée. Nous vous invitons à demander à la personne qui vous a invité(e) de vous faire parvenir une nouvelle invitation.</p>
-    user_exists: "Inutile d'inviter <b>%{email}</b>, un compte existe déjà !"
+    user_exists: "Inutile d'inviter <b>%{email}</b>, cette adresse est déjà associée à un compte !"
     invite_exists: "Vous avez déjà invité <b>%{email}</b>."
     invalid_email: "%{email} n'est pas une adresse de courriel valable."
     rate_limit:
@@ -241,8 +243,11 @@ fr:
     disabled_errors:
       discourse_connect_enabled: "Les invitations sont désactivées car DiscourseConnect est activé."
       invalid_access: "Vous n'êtes pas autorisé(e) à afficher la ressource demandée."
-    requires_groups: "L'invitation n'a pas été enregistrée car le sujet indiqué n'est pas accessible. Veuillez ajouter un des groupes suivants : %{groups}."
-    domain_not_allowed: "Votre adresse de courriel ne peut pas servir à utiliser cette invitation."
+    requires_groups: "L'invitation n'a pas été enregistrée, car le sujet indiqué n'est pas accessible. Veuillez ajouter un des groupes suivants : %{groups}."
+    domain_not_allowed: "Votre adresse e-mail ne peut pas servir à utiliser cette invitation."
+    max_redemptions_allowed_one: "pour les invitations par e-mail, la valeur doit être 1"
+    redemption_count_less_than_max: "doit être inférieur à %{max_redemptions_allowed}."
+    email_xor_domain: "Les champs e-mail et domaine ne sont pas autorisés en même temps"
   bulk_invite:
     file_should_be_csv: "Le fichier envoyé doit être au format CSV."
     max_rows: "Les premières %{max_bulk_invites} invitations ont été envoyées. Essayez de diviser le fichier en parties plus petites."
@@ -252,6 +257,7 @@ fr:
     max_redemptions_limit: "doit être compris entre 2 et %{max_limit}."
   topic_invite:
     failed_to_invite: "L'utilisateur ne peut pas être invité dans ce sujet sans être membre d'un des groupes suivants : %{group_names}."
+    not_pm: "Vous pouvez uniquement inviter à rejoindre des messages privés."
     user_exists: "Nous sommes désolés, cet utilisateur a déjà été invité. Vous ne pouvez inviter un utilisateur qu'une seule fois par sujet."
     muted_topic: "Nous sommes désolés, cet utilisateur a mis ce sujet en sourdine."
     receiver_does_not_allow_pm: "Nous sommes désolés, cet utilisateur ne vous autorise pas à lui envoyer des messages directs."
@@ -338,8 +344,8 @@ fr:
   too_many_links:
     one: "Nous sommes désolés, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message."
     other: "Nous sommes désolés, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message."
-  contains_blocked_word: "Navré, il vous est impossible d'utiliser le mot « %{word} » car il est interdit."
-  contains_blocked_words: "Navré, il vous est impossible de publier ce message car les mots suivants sont interdits : « %{words} »."
+  contains_blocked_word: "Nous sommes désolés, le mot « %{word} » est interdit et il vous est impossible de l'utiliser."
+  contains_blocked_words: "Il vous est impossible de publier ce message, car les mots suivants sont interdits : « %{words} »."
   spamming_host: "Désolé, vous ne pouvez pas insérer de lien vers ce domaine."
   user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à publier des messages."
   topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez ?"
@@ -401,7 +407,7 @@ fr:
       time_must_be_provided: "Un horaire doit être indiqué pour chaque rappel"
       for_topic_must_use_first_post: "Un signet peut seulement être associé au premier message d'un sujet."
       bookmarkable_id_type_required: "Le nom et le type de l'enregistrement à mettre en signet sont requis."
-      invalid_bookmarkable: "Un %{type} ne peut pas être mis en favoris."
+      invalid_bookmarkable: "Un %{type} ne peut pas être mis en signet."
     reminders:
       at_desktop: "La prochaine fois que je suis à mon bureau"
       later_today: "Plus tard dans la journée"
@@ -489,8 +495,8 @@ fr:
       Vous pouvez modifier votre dernière réponse et ajouter une citation en sélectionnant le texte à citer et en cliquant sur le bouton <b>Citer</b>.
 
       Il est plus facile de lire des discussions comprenant des réponses approfondies plutôt que de nombreuses réponses individuelles brèves.
-    dominating_topic: Vous êtes l'auteur de %{percent} % des réponses actuelles à ce sujet ; pourriez-vous laisser l'occasion à d'autres personnes de s'exprimer ?
-    get_a_room: Nous remarquons que vous avez déjà envoyé un certain nombre de réponses (%{count}) à @%{reply_username} ; saviez-vous qu'il est également possible d'échanger des messages directs avec cette personne sur notre site ?
+    dominating_topic: Vous êtes l'auteur de %{percent} % des réponses actuelles de ce sujet. Pourriez-vous laisser l'occasion à d'autres personnes de s'exprimer ?
+    get_a_room: Nous remarquons que vous avez déjà envoyé un certain nombre de réponses (%{count}) à @%{reply_username}. Saviez-vous qu'il est également possible d'échanger des messages directs avec cette personne sur notre site ?
     too_many_replies: |
       ### Vous avez atteint le nombre maximal de réponses dans ce sujet
 
@@ -586,14 +592,21 @@ fr:
               too_many: "Trop de mots pour cette action"
             base:
               invalid_url: "L'URL de substitution n'est pas valide"
+              invalid_tag_list: "La liste d'étiquettes de remplacement n'est pas valide"
+        sidebar_section_link:
+          attributes:
+            linkable_type:
+              invalid: "n'est pas valide"
       <<: *errors
   uncategorized_category_name: "Sans catégorie"
   general_category_name: "Général"
+  general_category_description: "Créez ici des sujets qui ne rentrent dans aucune autre catégorie existante."
   meta_category_name: "Commentaires sur le site"
   meta_category_description: "Discussions à propos du site, son organisation, son fonctionnement et comment nous pouvons l'améliorer."
   staff_category_name: "Responsables"
   staff_category_description: "Catégorie privée pour les discussions entre responsables. Les sujets ne sont visibles que pour les administrateurs et les modérateurs."
   discourse_welcome_topic:
+    title: "Bienvenue dans notre communauté !"
     body: |2
 
       Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
@@ -641,14 +654,18 @@ fr:
   post:
     image_placeholder:
       broken: "Cette image ne fonctionne pas"
+      blocked_hotlinked_title: "Image hébergée sur un autre site. Cliquez pour ouvrir dans un nouvel onglet."
       blocked_hotlinked: "Image externe"
+    media_placeholder:
+      blocked_hotlinked_title: "Contenu multimédia hébergé sur un autre site. Cliquez pour ouvrir dans un nouvel onglet."
+      blocked_hotlinked: "Contenu multimédia externe"
     hidden_bidi_character: "Les caractères de contrôle bidirectionnels permettent de modifier l'ordre dans lequel les éléments d'un texte seront affichés. Ceci pourrait servir à dissimuler du code informatique malveillant."
     has_likes:
       one: "%{count} « J'aime »"
       other: "%{count} « J'aime »"
     cannot_permanently_delete:
-      many_posts: "Vous ne pouvez pas supprimer définitivement ce sujet car il contient un trop grand nombre de réponses."
-      wait_or_different_admin: "Un délai de %{time_left} doit d'abord s'écouler avant que vous ne puissiez supprimer définitivement ce message. Alternativement, un autre adminstrateur peut réaliser cette suppression immédiatement."
+      many_posts: "Vous ne pouvez pas supprimer définitivement ce sujet, car il contient un trop grand nombre de réponses."
+      wait_or_different_admin: "Vous devez attendre %{time_left} avant de supprimer définitivement ce message ou demander à un autre administrateur de le faire."
   rate_limiter:
     slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, veuillez réessayer plus tard."
     too_many_requests: "Vous avez effectué cette action un trop grand nombre de fois. Veuillez attendre %{time_left} avant de réessayer."
@@ -661,6 +678,7 @@ fr:
       public_group_membership: "Vous rejoignez ou quittez des groupes à rythme un peu trop élevé. Nous vous invitons à patienter %{time_left} avant de réessayer."
       topics_per_day: "Vous avez atteint la limite quotidienne de nouveaux sujets qu'il vous est possible de créer. Vous pourrez créer de nouveaux sujets d'ici %{time_left}."
       pms_per_day: "Vous avez atteint la limite quotidienne de messages qu'il vous est possible de publier. Vous pourrez publier de nouveaux messages d'ici %{time_left}."
+      create_like: "Ouah ! Vous avez beaucoup d'amour à partager ! Vous avez atteint la limite quotidienne du nombre de « J'aime » qu'ils vous est possible d'attribuer. Cependant, vous aurez le droit d'en attribuer davantage à mesure que votre niveau de confiance augmentera. Vous pourrez à nouveau laisser des « J'aime » d'ici %{time_left}."
       create_bookmark: "Vous avez atteint la limite quotidienne du nombre de signets qu'il vous est possible de créer. Vous pourrez créer de nouveaux signets d'ici %{time_left}."
       edit_post: "Vous avez atteint la limite quotidienne du nombre de modifications qu'il vous est possible d'apporter à des messages. Vous pourrez faire de nouvelles modifications d'ici %{time_left}."
       live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
@@ -933,7 +951,7 @@ fr:
         remove: "Ce sujet n'est plus à la une. Il ne sera plus affiché en haut de chaque page."
   unsubscribed:
     title: "Préférences de courriel enregistrées !"
-    description: "Les préférences d'envoi de courriel à <b>%{email}</b> ont été mises à jour. Pour modifier vos paramètres d'envoi de courriel, <a href='%{url}'>rendez-vous dans la rubrique Préférences de votre profil utilsiateur</a>."
+    description: "Les préférences de messagerie pour <b>%{email}</b> ont été mises à jour. Pour modifier vos paramètres de messagerie <a href='%{url}'>visitez vos préférences utilisateur</a>."
     topic_description: "Pour vous réabonner à %{link}, utilisez le contrôle des notifications en bas ou à droite du sujet."
     private_topic_description: "Pour vous réabonner, utilisez le contrôle des notifications en bas ou à droite du sujet."
   uploads:
@@ -1317,7 +1335,7 @@ fr:
       labels:
         user: Utilisateur
         qtt_like: '« J''aime » reçus'
-      description: "Top 10 des utilisateurs qui ont reçu des likes."
+      description: "Top 10 des utilisateurs qui ont reçu des J'aime."
     top_users_by_likes_received_from_inferior_trust_level:
       title: "Utilisateurs ayant reçu le plus de J'aime venant d'utilisateurs d'un niveau de confiance inférieur"
       labels:
@@ -1332,7 +1350,7 @@ fr:
         qtt_like: '« J''aime » reçus'
       description: "Liste des 10 utilisateurs ayant reçu le plus de J'aime de la part d'une grande diversité de personnes différentes."
   dashboard:
-    group_email_credentials_warning: 'L''authentification auprès du serveur de courriel a échoué avec les identifiants spécifiés pour le groupe <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. Les courriels liés à ce groupe ne pourront pas être expédiés avant que ce problème ne soit résolu. %{error}'
+    group_email_credentials_warning: 'L''authentification auprès du serveur de messagerie a échoué avec les identifiants spécifiés pour le groupe <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. Les e-mails liés à ce groupe ne pourront pas être expédiés tant que ce problème ne sera pas résolu. %{error}'
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
     sidekiq_warning: 'Sidekiq n''est pas en cours d''exécution. De nombreuses tâches, comme l''envoi de courriels, sont exécutées de manière asynchrone par Sidekiq. Assurez-vous d''avoir au moins un processus Sidekiq en exécution. <a href="https://github.com/mperham/sidekiq" target="_blank">En savoir plus sur Sidekiq</a>.'
@@ -1358,7 +1376,7 @@ fr:
     force_https_warning: "Votre site Web utilise SSL. Mais l'option « <a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a> » n'est pas encore activée dans les paramètres du site."
     out_of_date_themes: "Des mises à jour sont disponibles pour les thèmes suivants :"
     unreachable_themes: "Nous n'avons pas pu vérifier les mises à jour pour les thèmes suivants :"
-    watched_word_regexp_error: "L'expression régulière pour détecter des mots surveillés et déclencher l'action '%{action}' n'est pas valide. Veuillez vérifier la <a href='%{base_path}/admin/customize/watched_words'>configuration des mots surveillés</a> ou désactiver le paramètre 'watched words regular expressions'."
+    watched_word_regexp_error: "L'expression régulière pour détecter des mots suivis et déclencher l'action « %{action} » n'est pas valide. Veuillez vérifier la <a href='%{base_path}/admin/customize/watched_words'>configuration des mots surveillés</a> ou désactiver le paramètre « watched words regular expressions »."
   site_settings:
     allow_bulk_invite: "Autoriser l'envoi d'invitations multiples via l'importation d'un fichier CSV"
     disabled: "désactivé"
@@ -1393,7 +1411,7 @@ fr:
     category_search_priority_high_weight: "Pondération appliquée au classement des résultats de recherche pour les catégories à priorité élevée."
     allow_uncategorized_topics: "Autoriser la création de sujets sans catégorie. ATTENTION : s'il existe des sujets sans catégorie, vous devez les classer avant de désactiver ce paramètre."
     allow_duplicate_topic_titles: "Autoriser la création de sujet avec le même titre."
-    allow_duplicate_topic_titles_category: "Permettre l'existence de plusieurs sujets au titre identique s'ils appartiennent à des catégories différentes. Le paramètre 'allow_duplicate_topic_titles' doit, lui, être désactivé."
+    allow_duplicate_topic_titles_category: "Permettre l'existence de plusieurs sujets au titre identique s'ils appartiennent à des catégories différentes. Le paramètre « allow_duplicate_topic_titles » doit être désactivé."
     unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse publier le même contenu à nouveau"
     educate_until_posts: "Lors de la rédaction des (n) premiers nouveaux sujets de l'utilisateur, afficher le panneau d'aide à la saisie."
     title: "Le nom du site utilisé dans la balise title."
@@ -1402,8 +1420,11 @@ fr:
     contact_email: "Adresse courriel de la personne responsable de ce site. Elle est utilisée pour les notifications critiques et également affichée sur la page <a href='%{base_path}/about' target='_blank'>/about</a> pour les questions urgentes."
     contact_url: "URL de contact pour ce site. Elle est affichée sur la page <a href='%{base_path}/about' target='_blank'>À propos</a> et les utilisateurs sont invités à l'utiliser en cas de problème urgent."
     crawl_images: "Récupérer les images provenant de sources tierces pour y insérer les dimensions correctes (hauteur et largeur)."
+    download_remote_images_to_local: "Convertissez des images distantes (hotlink) en images locales en les téléchargeant. Cela préserve le contenu même si les images sont supprimées du site distant à l'avenir."
     download_remote_images_threshold: "Quantité minimale d'espace disque requise pour télécharger localement des images distantes (en pourcentage)"
     disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargées. Liste délimitée par des lignes verticales."
+    block_hotlinked_media: "Empêchez les utilisateurs d'introduire des contenus multimédias distants (liens hypertexte) dans leurs messages. Les contenus mutimédias distants qui ne sont pas téléchargé via « download_remote_images_to_local » seront remplacés par un lien réservé."
+    block_hotlinked_media_exceptions: "Liste des URL de base exemptées du paramètre block_hotlinked_media. Le protocole (p. ex., https://example.com) est inclus."
     editing_grace_period: "Pendant (n) secondes après sa publication, la modification du message ne créera pas de nouvelle version dans l'historique des messages."
     editing_grace_period_max_diff: "Nombre maximal de caractères modifiés autorisé dans le délai de grâce de modification. Si un plus grand nombre de caractères sont modifiés, une nouvelle révision du message sera enregistrée (niveau de confiance 0 et 1)"
     editing_grace_period_max_diff_high_trust: "Nombre maximal de caractères modifiés autorisé dans le délai de grâce de modification. Si un plus grand nombre de caractères sont modifiés, une nouvelle révision du message sera enregistrée (niveau de confiance 2 et plus)"
@@ -1412,7 +1433,7 @@ fr:
     tl2_post_edit_time_limit: "Un auteur de niveau de confiance 2 ou supérieur peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand cette option est désactivée, seuls les responsables peuvent voir l'historique."
     delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Si cette valeur est à 0, les messages seront supprimés immédiatement."
-    notify_users_after_responses_deleted_on_flagged_post: "Lorsqu'un message fait l'objet d'un signalement puis d'une suppression, envoyer une notification à tous les utilisateurs qui avaient répondu à ce message."
+    notify_users_after_responses_deleted_on_flagged_post: "Lorsqu'un message fait l'objet d'un signalement, puis d'une suppression, envoyer une notification à tous les utilisateurs qui avaient répondu à ce message."
     max_image_width: "Largeur maximale des images dans un message"
     max_image_height: "Hauteur maximale des images dans un message"
     responsive_post_image_sizes: "Adapter la taille des visualisations d'images aux écrans à haut DPI avec les ratios suivants. Retirez toutes les valeurs pour désactiver l'adaptation dynamique des images."
@@ -1425,7 +1446,7 @@ fr:
     show_pinned_excerpt_mobile: "Afficher les extraits des sujets épinglés en vue mobile."
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale en nombre de caractères d'un message Discourse intégré comme Onebox."
-    blocked_onebox_domains: "Liste de domaines qui ne seront jamais intégrés dans une Onebox. (Ex&nbsp;: wikipedia.org.) (Les symboles joker '*' et '?' ne sont pas pris en charge.)"
+    blocked_onebox_domains: "Liste de domaines qui ne seront jamais intégrés dans une Onebox. (P. ex., wikipedia.org.) (Les symboles joker « * » et « ? » ne sont pas pris en charge.)"
     block_onebox_on_redirect: "Bloquer Onebox pour les URL redirigées."
     allowed_inline_onebox_domains: "Une liste de domaines qui seront transformés en Onebox s'ils ont été insérés sans titre"
     enable_inline_onebox_on_all_domains: "Ignorer le paramètre « inline_onebox_domain_allowlist » et permettre des Onebox en ligne pour tous les domaines."
@@ -1452,13 +1473,15 @@ fr:
     detailed_404: "Donne plus d'informations aux utilisateurs concernant la raison pour laquelle ils ne peuvent pas accéder à ce sujet en particulier. Note : cela est moins sécurisé car les utilisateurs sauront si une URL pointe vers un sujet valide ou non."
     enforce_second_factor: "Force les utilisateurs à activer l'authentification à deux facteurs. Sélectionner « tous » pour l'appliquer à tous les utilisateurs. Sélectionner « responsables » pour l'appliquer aux responsables uniquement."
     force_https: "Forcer votre site en HTTPS uniquement. ATTENTION : n'activez PAS cette fonction tant que vous n'avez pas vérifié que le HTTPS est complètement configuré et fonctionne absolument partout ! Avez-vous vérifié que vos CDN, vos connexions de réseaux sociaux et tous les logos/dépendances tiers sont eux aussi compatibles avec HTTPS ?"
-    same_site_cookies: "Émettre des cookies avec l'attribut SameSite. Cela permet d'éliminer tous les vecteurs de requêtes illégitimes par rebond (attaques de type «&nbsp;CSRF&nbsp;») dans les navigateurs qui le prennent en charge (en mode «&nbsp;Lax&nbsp;» ou «&nbsp;Strict&nbsp;»). Attention&nbsp;: le mode «&nbsp;Strict&nbsp;» ne fonctionne que sur des sites qui obligent à s'authentifier et qui utilisent un système d'authentification externe."
+    same_site_cookies: "Émettre des cookies avec l'attribut SameSite. Cela permet d'éliminer tous les vecteurs de requêtes illégitimes par rebond (attaques de type « CSRF ») dans les navigateurs qui le prennent en charge (en mode « Lax » ou « Strict »). Attention : le mode « Strict » ne fonctionne que sur des sites qui obligent à s'authentifier et qui utilisent un système d'authentification externe."
     summary_score_threshold: "Le score minimal pour qu'un message soit inclus dans le résultat de « Résumer ce sujet »"
     summary_posts_required: "Nombre minimal de messages dans un sujet avant que la fonctionnalité « Résumer ce sujet » soit activée. Les modifications de ce paramètre sont appliquées rétroactivement sur une semaine."
     summary_likes_required: "Nombre minimal de « J'aime » dans un sujet avant que la fonctionnalité « Résumer ce sujet » soit activée. Les modifications de ce paramètre sont appliquées rétroactivement sur une semaine."
     summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
     summary_max_results: "Nombre maximal de messages inclus dans le résultat de « Résumer ce sujet »"
-    summary_timeline_button: "Afficher un bouton \"Résumer\" dans la timeline de chaque sujet"
+    summary_timeline_button: "Afficher un bouton « Résumer » dans la chronologie de chaque sujet"
+    enable_personal_messages: "OBSOLÈTE, utilisez plutôt le paramètre « Groupes activés par messages personnels ». Autorisez les utilisateurs de niveau de confiance 1 (configurable via une confiance minimale pour envoyer des messages) à créer des messages et à y répondre. Notez que les responsables peuvent toujours envoyer des messages quoi qu'il arrive."
+    personal_message_enabled_groups: "Autorisez les utilisateurs de ces groupes à créer des messages et à y répondre. Les groupes de niveaux de confiance incluent tous les niveaux de confiance supérieurs à ce nombre. Par exemple, le fait de choisir trust_level_1 permet également aux utilisateurs des niveaux trust_level_2, 3, 4 d'envoyer des messages directs. Notez que le personnel peut toujours envoyer des messages quoi qu'il arrive."
     enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
     enable_chunked_encoding: "Activer les réponses d'encodage par bloc par le serveur. Cette fonctionnalité fonctionne dans la plupart des configurations, mais certains proxys peuvent mettre les réponses en mémoire tampon et risquent donc de les retarder"
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode « origin pull »). Par exemple : http://origin.site.com"
@@ -1514,7 +1537,7 @@ fr:
     allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
     allowed_crawler_user_agents: "Les agents utilisateurs des robots d'indexation qui sont autorisés à accéder au site. ATTENTION : CE PARAMÈTRE BLOQUERA TOUS LES ROBOTS D'INDEXATION NON LISTÉS ICI !"
     blocked_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si la liste d'autorisations est définie."
-    slow_down_crawler_user_agents: 'Champs "User-agent" des robots d''indexation dont les requêtes seront plafonnées en vitesse, conformément au paramètre ''slow down crawler rate''. Chaque entrée doit contenir un minimum de 3 caractères.'
+    slow_down_crawler_user_agents: 'Agents utilisateurs des robots d''exploration Web dont le débit doit être limité, comme configuré dans le paramètre « slow down crawler rate ». Chaque valeur doit comporter au moins 3 caractères.'
     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: "Activer Content-Security-Policy"
     content_security_policy_report_only: "Activer Content-Security-Policy-Report-Only"
@@ -1534,7 +1557,7 @@ fr:
     send_tl2_promotion_message: "Envoyer aux nouveaux utilisateurs de niveau de confiance 2 un message à propos de la promotion."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse se trouve juste en dessous ce dernier."
     suppress_reply_directly_above: "Ne pas afficher « en réponse à » sur un message quand il n'y a qu'une réponse au-dessus de ce message."
-    remove_full_quote: "Suppression automatique de la citation si (a) elle se trouve en début du message, (b) qu'il s'agit de l'ensemble du message, et (c) qu'il s'agit du message directemnt précédent. Pour plus de détails, voir <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>Suppression des citations entières dans une réponse directe</a>"
+    remove_full_quote: "Suppression automatique de la citation si (a) elle se trouve en début du message, (b) il s'agit de l'ensemble du message, et (c) il s'agit du message précédent. Pour plus de détails, consultez <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>Suppression des citations entières dans une réponse directe</a>"
     suppress_reply_when_quoting: "Ne pas afficher « en réponse à » sur un message qui répond avec une citation."
     max_reply_history: "Nombre maximal de réponses à développer en déroulant « en réponse à »"
     topics_per_period_in_top_summary: "Nombre de meilleurs sujets affichés dans le résumé par défaut des meilleurs sujets."
@@ -1549,12 +1572,13 @@ fr:
     enable_badges: "Activer le système de badges"
     max_favorite_badges: "Nombre maximal de badges que l'utilisateur peut sélectionner"
     enable_whispers: "Autoriser les communications privées entre responsables au sein d'un sujet."
+    whispers_allowed_groups: "Autoriser la communication privée au sein des sujets pour les membres de groupes spécifiques."
     allow_index_in_robots_txt: "Indiquer dans le fichier robots.txt que ce site peut être indexé par les moteurs de recherche Web. Dans des cas exceptionnels, vous pouvez remplacer définitivement le fichier <a href='%{base_path}/admin/customize/robots'>robots.txt</a>."
     blocked_email_domains: "Une liste de domaines de courriels, séparés par des barres verticales (caractère « | ») que les utilisateurs ne sont pas autorisés à utiliser pour s'inscrire. Exemple : mailinator.com|trashmail.net"
     allowed_email_domains: "Une liste de domaines de courriels, séparés par des barres verticales (caractère « | ») que les utilisateurs DOIVENT utiliser pour s'inscrire. ATTENTION : les utilisateurs avec une adresse de courriel d'un domaine non repris dans la liste ne seront pas autorisés à s'inscrire !"
-    normalize_emails: "Vérifier que l'adresse de courriel normalisée n'est pas déjà utilisée. L'adresse normalisée s'obtient en ôtant tous les '.', et en ôtant tous les caractères éventuellement situés entre les symboles '+' et '@' de l'adrese indiquée par l'utilisateur."
+    normalize_emails: "Vérifiez que l'adresse e-mail normalisée n'est pas déjà utilisée. L'adresse normalisée s'obtient en ôtant tous les points et caractères éventuellement situés entre les symboles « + » et « @ » de l'adresse indiquée par l'utilisateur."
     auto_approve_email_domains: "Les utilisateurs dont le domaine de l'adresse courriel appartient à cette liste seront automatiquement approuvés."
-    hide_email_address_taken: "Ne pas indiquer aux utilisateurs qu'un compte associé à une adresse de courriel donnée existe sur le serveur, au moment de l'inscription ou lors de la récupération d'un mot de passe perdu. Exiger une adresse de courriel complète lors de la récupération d'un mot de passe perdu."
+    hide_email_address_taken: "Ne pas indiquer aux utilisateurs qu'un compte associé à une adresse e-mail donnée existe sur le serveur, au moment de l'inscription ou lors de la récupération d'un mot de passe perdu. Exiger une adresse e-mail complète lors de la récupération d'un mot de passe perdu."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions de l'utilisateur sur tous les appareils"
     version_checks: "Vérifier périodiquement les serveurs Discourse pour obtenir des informations de mises à jour et les afficher sur le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
@@ -1584,8 +1608,8 @@ fr:
     auth_overrides_username: "Écrase le nom d'utilisateur défini localement en le remplaçant par le nom d'utilisateur défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification. (ATTENTION : des divergences peuvent se produire en raison de contraintes de longueur ou de complexité des noms d'utilisateur)"
     auth_overrides_name: "Écrase le nom complet défini localement en le remplaçant par le nom complet défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification."
     discourse_connect_overrides_avatar: "Écrase l'image de profil en la remplaçant par une image de profil définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect. Lorsque ce paramètre est activé, les utilisateurs ne sont pas autorisés à envoyer et utiliser leurs propres images de profil dans Discourse."
-    discourse_connect_overrides_location: "Écrase le champ utilisateur \"Localisation\" en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect. Lorsque ce paramètre est activé, les utilisateurs ne sont pas autorisés à modifier ce champ."
-    discourse_connect_overrides_website: "Écrase le champ utilisateur \"Site internet\" en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect. Lorsque ce paramètre est activé, les utilisateurs ne sont pas autorisés à modifier ce champ."
+    discourse_connect_overrides_location: "Écrase le champ utilisateur « Localisation » en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect. Lorsque ce paramètre est activé, les utilisateurs ne sont pas autorisés à modifier ce champ."
+    discourse_connect_overrides_website: "Écrase le champ utilisateur « Site Web » en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect. Lorsque ce paramètre est activé, les utilisateurs ne sont pas autorisés à modifier ce champ."
     discourse_connect_overrides_profile_background: "Écrase l'arrière-plan du profil en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect."
     discourse_connect_overrides_card_background: "Écrase l'arrière-plan de la carte utilisateur en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect."
     discourse_connect_not_approved_url: "Rediriger les comptes DiscourseConnect non validés vers cette URL"
@@ -1599,6 +1623,9 @@ fr:
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
     google_oauth2_prompt: "Liste facultative de valeurs de chaînes de caractères délimitées par des espaces, qui spécifie si le serveur d'autorisation invite l'utilisateur à s'authentifier à nouveau et à donner son consentement. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> pour connaître les valeurs possibles."
     google_oauth2_hd: "Un domaine optionnel Google Apps Hosted auquel la connexion sera limitée. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> pour obtenir plus de détails."
+    google_oauth2_hd_groups: "(réglage expérimental) Pour chaque utilisateur, récupérer les groupes Google existant sur le domaine hébergé au moment de l'authentification. Les groupes Google ainsi récupérés peuvent être utilisés pour délencher automatiquement l'appartenance à un groupe Discourse (voir la rubrique « Groupes » dans les paramètres). Pour plus d'informations, voir https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "Une adresse e-mail appartenant à un compte administrateur Google Workspace. Elle sera utilisée avec les informations d'identification du compte de service pour récupérer les informations du groupe."
+    google_oauth2_hd_groups_service_account_json: "Informations clés au format JSON pour le compte de service. Elles seront utilisées pour récupérer les informations du groupe."
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et twitter_consumer_secret. Voir <a href='https://meta.discourse.org/t/13395' target='_blank'>Configurer la connexion Twitter (avec rich embeds) pour Discourse</a>."
     twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -1613,7 +1640,7 @@ fr:
     discord_secret: "Clé secrète Discord"
     discord_trusted_guilds: 'Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utilisez les identifiants numériques des guildes. Pour plus d''informations, suivez les instructions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laissez vide pour autoriser toutes les guildes.'
     enable_backups: "Autoriser les administrateurs à créer des sauvegardes du forum"
-    allow_restore: "Autoriser la restauration de données, ce qui peut écraser TOUTES les données du site&nbsp;! Laissez ce paramètre désactivé, sauf si vous envisagez de restaurer une sauvegarde."
+    allow_restore: "Autoriser la restauration de données, ce qui peut écraser TOUTES les données du site ! Laissez ce paramètre désactivé, sauf si vous envisagez de restaurer une sauvegarde."
     maximum_backups: "Nombre maximal de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
     automatic_backups_enabled: "Créer automatiquement des sauvegardes suivant la fréquence définie dans le paramètre « backup frequency »"
     backup_frequency: "Nombre de jours entre chaque sauvegarde"
@@ -1634,6 +1661,7 @@ fr:
     top_topics_formula_first_post_likes_multiplier: "formule permettant d'obtenir la valeur du multiplicateur des premiers « J'aime » (n) dans les sujets tendance : « 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: "formule permettant d'obtenir la valeur du multiplicateur du plus petit nombre de « J'aime » par message (n) dans les sujets tendance : « log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count) »"
     enable_safe_mode: "Permettre aux utilisateurs d'utiliser le mode sans échec pour déboguer les extensions."
+    enable_experimental_sidebar_hamburger: "Permet d'activer la barre latérale expérimentale et le menu déroulant hamburger de l'utilisateur."
     enable_sidebar: "Active la barre latérale expérimentale."
     rate_limit_create_topic: "Après la création d'un sujet, les utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
     rate_limit_create_post: "Après avoir publié un message, les utilisateurs doivent attendre (n) secondes avant de pouvoir en publier un autre."
@@ -1647,6 +1675,7 @@ fr:
     max_personal_messages_per_day: "Nombre maximal de messages directs différents qu'un utilisateur peut créer par jour."
     max_invites_per_day: "Nombre maximal d'invitations qu'un utilisateur peut envoyer par jour."
     max_topic_invitations_per_day: "Nombre maximal d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
+    max_topic_invitations_per_minute: "Nombre maximal d'invitations à des sujets qu'un utilisateur peut envoyer par minute."
     max_logins_per_ip_per_hour: "Nombre maximal de connexions autorisées par adresse IP et par heure"
     max_logins_per_ip_per_minute: "Nombre maximal de connexions autorisées par adresse IP, par minute"
     max_post_deletions_per_minute: "Nombre maximal de messages qu'un utilisateur peut supprimer par minute. Réglez sur 0 pour désactiver les suppressions de messages."
@@ -1678,7 +1707,7 @@ fr:
     use_site_small_logo_as_system_avatar: "Utiliser le logo de petit format du site à la place de l'avatar de l'utilisateur 'system'. Nécessite que ce logo soit défini."
     restrict_letter_avatar_colors: "Une liste de couleurs au format hexadécimal à 6 chiffres utilisées pour l'arrière-plan des avatars en forme de lettres."
     enable_listing_suspended_users_on_search: "Permettre aux utilisateurs habitués de trouver des utilisateurs suspendus lors d'une recherche."
-    selectable_avatars_mode: "Restreindre l'utilisation d'avatars personnalisés aux niveaux de confiance spécifiés, et n'autoriser les autres utilisateurs qu'à choisir un avatar dans la liste 'selectable_avatars'."
+    selectable_avatars_mode: "Restreindre l'utilisation d'avatars personnalisés aux niveaux de confiance spécifiés, et n'autoriser les autres utilisateurs qu'à choisir un avatar dans la liste « selectable_avatars »."
     selectable_avatars: "Liste d'avatars que les utilisateurs peuvent sélectionner."
     allow_all_attachments_for_group_messages: "Autoriser toutes les pièces jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 représente la qualité la plus faible, 99 la meilleure qualité, 100 sert à désactiver)."
@@ -1725,6 +1754,7 @@ fr:
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimal requis pour modifier les messages de type wiki."
     min_trust_to_edit_post: "Le niveau de confiance minimal requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimal requis pour transformer ses propres messages en type wiki."
+    min_trust_to_send_messages: "OBSOLÈTE, utilisez plutôt le paramètre « Groupes activés par messages directs ». Le niveau de confiance minimal requis pour créer de nouveaux messages directs."
     min_trust_to_send_email_messages: "Le niveau de confiance minimal pour envoyer un message privé par courriel."
     min_trust_to_flag_posts: "Le niveau de confiance minimal requis pour signaler des messages"
     min_trust_to_post_links: "Le niveau de confiance minimal requis pour inclure des liens dans les messages"
@@ -1742,8 +1772,8 @@ fr:
     max_mentions_per_post: "Nombre maximal de noms d'utilisateurs que les utilisateurs peuvent mentionner dans un message."
     max_users_notified_per_group_mention: "Nombre maximal d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint, aucune notification ne sera envoyée)"
     enable_mentions: "Permettre aux utilisateurs de mentionner d'autres utilisateurs."
-    here_mention: "Nom d'une @mention permettant aux utilisateurs privilégiés d'envoyer une notification à chaque participant à un sujet, avec une limite de 'max_here_mentioned' notifications envoyées. Doit être distinct de tout nom d'utilisateur existant."
-    max_here_mentioned: "Nombre maximum de personnes recevant une notification lorsque @here est utilisée."
+    here_mention: "Nom d'une @mention permettant aux utilisateurs privilégiés d'envoyer une notification à chaque participant à un sujet, avec une limite de « max_here_mentioned » notifications envoyées. Doit être distinct de tout nom d'utilisateur existant."
+    max_here_mentioned: "Nombre maximal de personnes recevant une notification lorsque la mention @here est utilisée."
     min_trust_level_for_here_mention: "Niveau de confiance minimal requis pour utiliser la mention @here."
     create_thumbnails: "Créer un aperçu et une visionneuse pour les images qui sont trop grandes pour le message."
     email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou de finaliser leurs messages."
@@ -1795,7 +1825,7 @@ fr:
     topic_view_duration_hours: "Compter la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures"
     user_profile_view_duration_hours: "Compter la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures"
     levenshtein_distance_spammer_emails: "Une adresse courriel sera attribuée à un spammeur connu même si elle diffère par ce nombre de caractères."
-    max_new_accounts_per_registration_ip: "S'il y a déjà (n) comptes avec un niveau de confiance de 0 utilisant cette adresse IP (et si aucun n'est un responsable ni un utilisateur avec un niveau de confiance de 2 ou plus), ne plus accepter de nouvelles inscriptions en provenance de cette adresse IP. Régler cette valeur à 0 désactive cette limite."
+    max_new_accounts_per_registration_ip: "S'il y a déjà (n) comptes avec un niveau de confiance de 0 utilisant cette adresse IP (et si aucun n'est un responsable ni un utilisateur avec un niveau de confiance de 2 ou plus), ne plus accepter de nouvelles inscriptions en provenance de cette adresse IP. Le réglage de cette valeur à 0 désactive cette limite."
     min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau."
     max_age_unmatched_emails: "Effacer les adresses courriel sous surveillance sans correspondance après (N) jours"
     max_age_unmatched_ips: "Effacer les adresses IP sous surveillance sans correspondance après (N) jours"
@@ -1829,6 +1859,7 @@ fr:
     max_emails_per_day_per_user: "Nombre maximal de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
     enable_staged_users: "Créer automatiquement des utilisateurs distants lors du traitement des courriels entrants."
     maximum_staged_users_per_email: "Nombre maximal d'utilisateurs distants créés lors du traitement d'un courriel entrant."
+    maximum_recipients_per_new_group_email: "Bloquez les e-mails entrants contenant trop de destinataires."
     auto_generated_allowlist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme étant générés automatiquement."
     ignore_by_title: "Ignorer les courriels entrants selon leur titre."
@@ -1848,6 +1879,7 @@ fr:
     raw_email_max_length: "Combien de caractères doivent être stockés pour le courriel entrant."
     raw_rejected_email_max_length: "Combien de caractères doivent être stockés pour le courriel entrant rejeté."
     delete_rejected_email_after_days: "Supprimer les courriels rejetés remontant à plus de (n) jours."
+    require_change_email_confirmation: "Demandez aux utilisateurs qui ne sont pas des responsables de confirmer leur ancienne adresse e-mail avant de la modifier. Ne s'applique pas aux responsables, ils doivent toujours confirmer leur ancienne adresse e-mail."
     manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel."
     pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel."
     pop3_polling_ssl: "Utiliser SSL pour les connexions au serveur POP3. (Recommandé)"
@@ -1926,6 +1958,7 @@ fr:
     enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client."
     dominating_topic_minimum_percent: "Quel pourcentage de messages un utilisateur doit publier dans un sujet avant d'être averti et invité à laisser la communauté répondre."
     disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar."
+    pm_warn_user_last_seen_months_ago: "Lors de la création d'un nouveau message direct, avertissez les utilisateurs lorsque le destinataire cible n'a pas été vu il y a plus de n mois."
     suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets sans catégorie dans les listes de sujets."
     header_dropdown_category_count: "Nombre de catégories qui peuvent être affichées dans le menu déroulant de l'en-tête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
@@ -1952,11 +1985,11 @@ fr:
     display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
     show_time_gap_days: "Si deux messages sont publiés avec ce nombre de jours d'écart, afficher cette durée dans le sujet."
     short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse cette valeur, la barre de progression affichera uniquement le nombre de messages actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur."
-    default_code_lang: "Langage de programmation par défaut de la coloration syntaxique appliquée aux blocs de code (auto, nohighlight, ruby, python, etc.). Cette valeur doit également être présente dans le paramètre du site « langages colorés syntaxiquement »."
+    default_code_lang: "Langage de programmation par défaut de la coloration syntaxique appliquée aux blocs de code (auto, nohighlight, ruby, python, etc.). Cette valeur doit également être présente dans le paramètre du site « highlighted languages »."
     warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse remonte à plusieurs jours, un avertissement sera affiché. Désactivez la fonctionnalité en indiquant 0."
     autohighlight_all_code: "Forcer la coloration syntaxique dans tous les blocs de codes, même si aucun langage de programmation n'est défini explicitement."
     highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances.) Voir : <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo/</a> pour une démonstration."
-    show_copy_button_on_codeblocks: "Afficher un bouton dans les blocs de mise en forme de type 'code' permettant de copier le contenu du bloc vers le presse-papier de l'utilisateur."
+    show_copy_button_on_codeblocks: "Afficher un bouton dans les blocs de mise en forme de type « code » permettant de copier le contenu du bloc vers le presse-papier de l'utilisateur."
     embed_any_origin: "Autoriser le contenu intégré, quelle que soit son origine. Cela est nécessaire pour les applications mobiles utilisant du HTML statique."
     embed_topics_list: "Permettre l'intégration HTML des listes de sujets"
     embed_set_canonical_url: "Configurer l'URL canonique des sujets intégrés à l'URL du contenu intégré."
@@ -1973,6 +2006,12 @@ fr:
     delete_merged_stub_topics_after_days: "Délai (en jours) de suppression automatique des sujets fusionnés, c'est-à-dire les sujets sans réponses résultant de la fusion de deux sujets par déplacement de messages. Si la valeur est fixée à 0, les sujets fusionnés ne seront pas supprimés."
     bootstrap_mode_min_users: "Nombre minimal d'utilisateurs nécessaire pour désactiver le mode d'amorçage (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Empêcher les utilisateurs anonymes de télécharger les pièces jointes."
+    secure_media: 'OBSOLÈTE : utilisez plutôt le paramètre secure_uploads, qui sera supprimé dans Discourse 3.0.'
+    secure_uploads: 'Limite l''accès à TOUS les fichiers envoyés (image, vidéo, audio, texte, PDF, ZIP, etc.). Si le paramètre « connexion requise » est activé, seuls les utilisateurs connectés peuvent accéder aux fichiers envoyés. Sinon, l''accès sera limité uniquement aux contenus multimédias des messages et catégories privés. ATTENTION : ce paramètre est complexe et nécessite des connaissances d''administration approfondies. Consultez <a target="_blank" href="https://meta.discourse.org/t/-/140017">ce sujet sur les téléversements sécurisés</a> pour en savoir plus.'
+    secure_media_allow_embed_images_in_emails: "OBSOLÈTE : utilisez secure_uploads_allow_embed_images_in_emails, qui sera supprimé dans Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "Autorise l'intégration d'images sécurisées (qui seraient autrement expurgées) dans les e-mails, si leur taille est inférieure à la valeur du paramètre « secure uploads max email embed image size kb »."
+    secure_media_max_email_embed_image_size_kb: "OBSOLÈTE : Utilisez secure_uploads_max_email_embed_image_size_kb, qui sera supprimé dans Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "La taille maximale d'images sécurisées qui seront intégrées dans des e-mails si le paramètre « secure uploads allow embed in emails » est activé. Si celui-ci n'est pas activé, ce paramètre est sans effet."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
     enable_emoji: "Activer les émojis"
     enable_emoji_shortcuts: "Les textes de smiley courants « :) », « :p » ou « :( » seront convertis en émojis"
@@ -2064,8 +2103,10 @@ fr:
     push_notifications_icon: "L'icône du badge qui apparaît dans les notifications. Une image monochrome de taille 96×96 et au format PNG avec transparence est recommandée."
     base_font: "Police de base à utiliser pour la plupart des textes du site. Les thèmes peuvent remplacer cette police via la propriété personnalisée CSS « --font-family »."
     heading_font: "Police à utiliser pour les titres du site. Les thèmes peuvent remplacer cette police via la propriété personnalisée CSS « --heading-font-family »."
-    enable_sitemap: "Générez un sitemap pour votre site et incluez-le dans le fichier robots.txt."
-    sitemap_page_size: "Nombre d'URL à inclure dans chaque page de sitemap. Maximum 50.000"
+    enable_sitemap: "Générez un sitemap pour votre site et l'inclure dans le fichier robots.txt."
+    sitemap_page_size: "Nombre d'URL à inclure dans chaque page de sitemap. Maximum 50 000"
+    enable_user_status: "(expérimental) Autoriser les utilisateurs à définir un message d'état personnalisé (émoji + description)."
+    enable_onboarding_popups: "(expérimental) Activer les fenêtres contextuelles éducatives qui décrivent les fonctionnalités clés aux utilisateurs"
     short_title: "Le titre court sera utilisé sur l'écran d'accueil de l'utilisateur, le lanceur d'applications ou d'autres endroits où la place disponible est limitée. Il devrait être limité à 12 caractères."
     dashboard_hidden_reports: "Permettre de masquer les rapports du tableau de bord."
     dashboard_visible_tabs: "Choisissez les onglets visibles sur le tableau de bord."
@@ -2076,10 +2117,14 @@ fr:
     share_quote_buttons: "Choisissez les éléments qui apparaissent dans le bouton de partage de citation, ainsi que leur ordre."
     share_quote_visibility: "Choisissez quand afficher le bouton de partage de citation : jamais, uniquement aux utilisateurs anonymes ou à tous les utilisateurs. "
     create_revision_on_bulk_topic_moves: "Créer une révision pour les premiers messages lorsque les sujets sont déplacés en masse dans une nouvelle catégorie."
-    allow_changing_staged_user_tracking: "Permettre aux administrateurs de modifier les préférences de notification relatives aux catégories et aux tags, pour les comptes d'utilisateurs distants."
-    use_email_for_username_and_name_suggestions: "Utiliser la première moitié des adresses de courriel pour suggérer des noms d'utilisateur et des pseudos. Veuillez noter que cela permet à chacun de facilement deviner les adresses de courriel entières des utilisateurs (car une grande part de ceux-ci sont inscrits à des services communément utilisés tels que GMail)."
-    use_name_for_username_suggestions: "Utilisez le nom complet d'un utilisateur lorsque vous suggérez des noms d'utilisateur."
-    suggest_weekends_in_date_pickers: "Inclure les weekends dans les suggestions du sélectionneur de date (désactivez ce paramètre si vous n'utilisez Discourse que les jours de semaine)."
+    allow_changing_staged_user_tracking: "Permettre aux administrateurs de modifier les préférences de notification relatives aux catégories et aux étiquettes, pour les comptes d'utilisateurs distants."
+    use_email_for_username_and_name_suggestions: "Utiliser la première moitié des adresses e-mail pour suggérer des noms d'utilisateur et des pseudos. Veuillez noter que cela permet à chacun de facilement deviner les adresses e-mail entières des utilisateurs (car une grande part de ceux-ci sont inscrits à des services communément utilisés tels que GMail)."
+    use_name_for_username_suggestions: "Utiliser le nom complet d'un utilisateur lorsque vous suggérez des noms d'utilisateur."
+    suggest_weekends_in_date_pickers: "Inclure les week-ends dans les suggestions du sélectionneur de date (désactivez ce paramètre si vous n'utilisez Discourse que les jours de semaine)."
+    splash_screen: "Affiche un écran de chargement temporaire pendant le chargement des ressources du site"
+    default_sidebar_categories: "Les catégories sélectionnées seront affichées par défaut dans la section Catégories de la barre latérale."
+    default_sidebar_tags: "Les étiquettes sélectionnées seront affichées par défaut dans la section Étiquettes de la barre latérale."
+    enable_new_user_profile_nav_groups: "EXPÉRIMENTAL : les utilisateurs des groupes sélectionnés verront apparaître le nouveau menu de navigation du profil utilisateur"
     errors:
       invalid_css_color: "Couleur non valide. Indiquez un nom de couleur ou une valeur hexadécimale."
       invalid_email: "Adresse courriel invalide."
@@ -2099,7 +2144,7 @@ fr:
       invalid_json: "Données JSON non valides."
       invalid_reply_by_email_address: "La valeur doit contenir « %{reply_key} » et être différente du courriel de notification."
       invalid_alternative_reply_by_email_addresses: "Toutes les valeurs doivent contenir « %{reply_key} » et être différentes du courriel de notification."
-      invalid_domain_hostname: "Ne peut inclure les caractères '*' ou '?'."
+      invalid_domain_hostname: "Ne peut inclure les caractères « * » ou « ? »."
       pop3_polling_host_is_empty: "Vous devez définir « pop3 polling host » avant d'activer le relevé via POP3."
       pop3_polling_username_is_empty: "Vous devez définir « pop3 polling username » avant d'activer le relevé via POP3."
       pop3_polling_password_is_empty: "Vous devez définir « pop3 polling password » avant d'activer le relevé via POP3."
@@ -2107,8 +2152,9 @@ fr:
       reply_by_email_address_is_empty: "Vous devez configurer le paramètre « reply by email address » avant d'activer les réponses par courriel."
       email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par courriel."
       user_locale_not_enabled: "Vous devez d'abord activer « allow user locale » avant d'activer ce paramètre."
+      personal_message_enabled_groups_invalid: "Vous devez spécifier au moins un groupe pour ce paramètre. Si vous ne souhaitez pas que quelqu'un d'autre que les responsables envoie des messages directs, choisissez le groupe des responsables."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
-      invalid_regex_with_message: "L'expression régulière '%{regex}' est erronée&nbsp;: %{message}"
+      invalid_regex_with_message: "L'expression régulière « %{regex} » est erronée : %{message}"
       email_editable_enabled: "Vous devez désactiver « email editable » avant d'activer ce paramètre."
       staged_users_disabled: "Vous devez d'abord activer « staged users » avant d'activer ce paramètre."
       reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
@@ -2129,10 +2175,12 @@ fr:
         leading_trailing_slash: "L'expression régulière ne doit pas commencer et se terminer par une barre oblique."
       unicode_usernames_avatars: "Les avatars du système n'acceptent pas les noms d'utilisateurs contenant des caractères Unicode."
       list_value_count: "La liste doit contenir exactement %{count} valeurs."
-      markdown_linkify_tlds: "Vous ne pouvez pas inclure la valeur '*'."
-      search_tokenize_chinese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver 'search_tokenize_chinese'."
-      search_tokenize_japanese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver 'search_tokenize_japanese'."
-      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Vous ne pouvez pas activer DiscourseConnect si le 2FA est obligatoire."
+      markdown_linkify_tlds: "Vous ne pouvez pas inclure la valeur « * »."
+      google_oauth2_hd_groups: "Vous devez configurer tous les paramètres « google oauth2 HD » avant d'activer ce paramètre."
+      search_tokenize_chinese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver « search_tokenize_chinese »."
+      search_tokenize_japanese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver « search_tokenize_japanese »."
+      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Vous ne pouvez pas activer DiscourseConnect si la 2FA est obligatoire."
+      delete_rejected_email_after_days: "Ce paramètre ne peut pas être inférieur au paramètre delete_email_logs_after_days ou supérieur à %{max}"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2261,7 +2309,7 @@ fr:
     reset_not_allowed_from_ip_address: "Vous ne pouvez pas réinitialiser le mot de passe depuis cette adresse IP."
     suspended: "Vous ne pouvez pas vous connecter jusqu'au %{date}."
     suspended_with_reason: "Compte suspendu jusqu'au %{date} : %{reason}"
-    suspended_with_reason_forever: "Compte supsendu&nbsp;: %{reason}"
+    suspended_with_reason_forever: "Compte supsendu : %{reason}"
     errors: "%{errors}"
     not_available: "Indisponible. Essayer %{suggestion} ?"
     something_already_taken: "Un problème est survenu. Votre nom d'utilisateur ou votre adresse courriel est peut-être déjà enregistré(e). Essayez le lien d'oubli du mot de passe."
@@ -2295,14 +2343,14 @@ fr:
       totp: "Utiliser une application d'authentification ou une clé de sécurité"
       backup_code: "Utiliser un code de secours à la place"
   second_factor_auth:
-    challenge_not_found: "Un défi d'authentification par 2FA n'a pas pu être trouvé dans le contexte de votre session actuelle."
-    challenge_expired: "Le délai d'expiration de l'authentification par 2FA s'est écoulé. Veuillez réessayer."
-    challenge_not_completed: "Vous n'avez pas effectué l'authentification par 2FA requise pour accomplir cette tâche. Veuillez vous authentifier par 2FA et réessayer."
+    challenge_not_found: "Un défi d'authentification à deux facteurs (2FA) n'a pas pu être trouvé dans le contexte de votre session actuelle."
+    challenge_expired: "Le délai d'expiration de l'authentification 2FA est écoulé. Veuillez réessayer."
+    challenge_not_completed: "Vous n'avez pas effectué l'authentification 2FA requise pour accomplir cette tâche. Veuillez vous authentifier (2FA) et réessayer."
     actions:
       grant_admin:
-        description: "Par mesure de sécurité, vous devez vous authentifier par 2FA avant que l'accès administrateur ne soit accordé à %{username}."
+        description: "Par mesure de sécurité, vous devez vous authentifier via l'authentification 2FA avant que l'accès administrateur soit accordé à %{username}."
       discourse_connect_provider:
-        description: "%{hostname} requiert la confirmation de votre 2FA. Vous serez redirigé vers le site après avoir confirmé votre 2FA."
+        description: "%{hostname} requiert la confirmation de votre 2FA. Vous serez redirigé(e) vers le site après avoir confirmé votre 2FA."
   admin:
     email:
       sent_test: "envoyé !"
@@ -2484,13 +2532,13 @@ fr:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité du courriel"
     text_body_template: |
-      Ceci est un courriel de test expédié par
+      Ceci est un e-mail de test expédié par
 
       [**%{base_url}**][0]
 
-      Nous espérons que ce test de remise du courriel vous sera parvenu correctement !
+      Nous espérons que ce test d'envoi d'e-mail vous sera parvenu correctement !
 
-      Voici une [liste de points à vérifier pour assurer la bonne remise de vos courriels][1].
+      Voici une [liste de points à vérifier pour assurer la bonne remise de vos e-mails][1].
 
       Bonne chance,
 
@@ -2502,10 +2550,10 @@ fr:
     title: "Nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
     text_body_template: |
-      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible&nbsp;!
+      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible !
 
-      Votre version&nbsp;: %{installed_version}
-      Nouvelle version&nbsp;: **%{new_version}**
+      Votre version : %{installed_version}
+      Nouvelle version : **%{new_version}**
 
       - Effectuez facilement la mise à jour depuis votre navigateur en utilisant la **[mise à jour en 1 clic](%{base_url}/admin/upgrade)**
 
@@ -2516,10 +2564,10 @@ fr:
     title: "Nouvelle version avec notes de modifications"
     subject_template: "[%{email_prefix}] Mise à jour disponible"
     text_body_template: |
-      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible&nbsp;!
+      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible !
 
-      Votre version&nbsp;: %{installed_version}
-      Nouvelle version&nbsp;: **%{new_version}**
+      Votre version : %{installed_version}
+      Nouvelle version : **%{new_version}**
 
       - Effectuez facilement la mise à jour depuis votre navigateur en utilisant la **[mise à jour en 1 clic](%{base_url}/admin/upgrade)**
 
@@ -2536,10 +2584,10 @@ fr:
     spam: "Votre message a été signalé comme étant du **spam** : la communauté considère qu'il s'agit d'une publicité ou du contenu trop promotionnel au lieu d'être utile et pertinent au regard du sujet."
     notify_moderators: "Votre message a été **signalé aux modérateurs** : la communauté considère qu'il nécessite l'intervention d'un responsable."
     responder:
-      off_topic: "Ce message a été signalé comme étant **hors sujet**&nbsp;: la communauté considère qu'il ne correspond pas au sujet en question tel que défini par son titre et son premier message."
-      inappropriate: "Ce message a été signalé comme étant **répréhensible**&nbsp;: la communauté a estimé que son contenu était offensant, injurieux, violent ou qu'il enfreignait notre [charte communautaire](%{base_path}/guidelines)."
-      spam: "Ce message a été signalé comme étant du **spam**&nbsp;: la communauté considère qu'il s'agit d'une publicité, c'est-à-dire d'un message nature trop promotionnelle au lieu d'être utile et pertinent au regard du sujet."
-      notify_moderators: "Ce message a été **signalé aux modérateurs**&nbsp;: la communauté considère qu'il nécessite l'intervention d'un responsable."
+      off_topic: "Ce message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond pas au sujet en question tel que défini par son titre et son premier message."
+      inappropriate: "Ce message a été signalé comme étant **répréhensible** : la communauté a estimé que son contenu était offensant, injurieux, violent ou qu'il enfreignait notre [charte communautaire](%{base_path}/guidelines)."
+      spam: "Ce message a été signalé comme étant du **courrier indésirable** : la communauté considère qu'il s'agit d'une publicité, c'est-à-dire d'un message de nature trop promotionnelle au lieu d'être utile et pertinent au regard du sujet."
+      notify_moderators: "Ce message a été **signalé aux modérateurs** : la communauté considère qu'il nécessite l'intervention d'un responsable."
   flags_dispositions:
     agreed: "Merci de nous en informer. Nous sommes en accord avec votre signalement et nous travaillons à sa résolution."
     agreed_and_deleted: "Merci de nous en informer. Nous sommes en accord avec votre signalement et avons supprimé le message."
@@ -2640,7 +2688,7 @@ fr:
       text_body_template: |
         Bonjour,
 
-        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer qu'un [post](%{base_url}%{url}) auquel vous aviez répondu, a été supprimé.
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer qu'un [post](%{base_url}%{url}) auquel vous aviez répondu a été supprimé.
 
         %{flag_reason}
 
@@ -2656,7 +2704,7 @@ fr:
         %{flagged_post_response_raw_content}
         ```
 
-        Pour plus d'informations, nous vous invitons à consulter notre [community guidelines](%{base_url}/guidelines).
+        Pour plus d'informations, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Pour connaître quelques astuces qui vous aideront à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
@@ -2709,22 +2757,22 @@ fr:
     tl2_promotion_message:
       subject_template: "Félicitations pour votre promotion de niveau de confiance !"
       text_body_template: |
-        Nous vous avons promu à un nouveau [niveau de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)&nbsp;!
+        Nous vous avons promu à un nouveau [niveau de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) !
 
-        Atteindre le niveau de confiance 2 signifie que vous avez assez lu et participé activement pour être considéré comme membre de la communauté.
+        Atteindre le niveau de confiance 2 signifie que vous avez suffisamment lu et participé activement pour être considéré(e) comme membre de la communauté.
 
-        En tant qu'utilisateur expérimenté, vous pourrez apprécier [cette liste de trucs et astuces (anglais)](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+        En tant qu'utilisateur ou utilisatrice expérimenté(e), vous pourrez apprécier [cette liste de trucs et astuces](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
-        Nous vous encourageons à continuer votre participation – nous apprécions vous avoir parmi nous.
+        Nous vous encourageons à continuer votre participation. Nous sommes heureux de vous compter parmi nous.
     backup_succeeded:
       title: "Sauvegarde effectuée"
       subject_template: "Sauvegarde terminée avec succès"
       text_body_template: |
-        La sauvegarde s'est terminée avec succès.
+        La sauvegarde a été effectuée avec succès.
 
-        Pour la télécharger, rendez-vous dans la section [Administration > Sauvegardes](%{base_url}/admin/backups) du site.
+        Accédez à la section [admin > sauvegarde] (%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde.
 
-        Voici les détails journalisés&nbsp;:
+        Voici le journal :
 
         %{logs}
     backup_failed:
@@ -2733,33 +2781,47 @@ fr:
       text_body_template: |
         La sauvegarde a échoué.
 
-        Voici les détails journalisés&nbsp;:
+        Voici le journal :
 
         %{logs}
     restore_succeeded:
       title: "Restauration réussie"
       subject_template: "Restauration terminée avec succès"
       text_body_template: |
-        La restauration de données s'est terminée avec succès.
+        La restauration a été effectuée avec succès.
 
-        Voici les détails journalisés&nbsp;:
+        Voici le journal :
 
         %{logs}
     restore_failed:
       title: "Restauration échouée"
       subject_template: "Échec de la restauration"
       text_body_template: |
-        La restauration de données a échoué.
+        La restauration a échoué.
 
-        Voici les détails journalisés&nbsp;:
+        Voici le journal :
 
         %{logs}
     bulk_invite_succeeded:
       title: "Invitation en masse réussie"
       subject_template: "Envoi des invitations en masse réussi"
+      text_body_template: |
+        Votre fichier d'invitation d'utilisateurs en masse a été traité, %{sent} invitations ont été envoyées, %{skipped} ont été ignorées et %{warnings} avertissement(s) ont été émis.
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "Invitation en masse échouée"
       subject_template: "Envoi des invitations en masse effectué avec des erreurs"
+      text_body_template: |
+        Votre fichier d'invitation d'utilisateurs en masse a été traité, %{sent} invitations ont été envoyées, %{skipped} ont été ignorées, %{warnings} avertissement(s) ont été émis et %{failed} erreur(s) ont été reçues.
+
+        Voici le journal :
+
+        ``` text
+        %{logs}
+        ```
     user_added_to_group_as_owner:
       title: "Désigné(e) comme propriétaire du groupe"
       subject_template: "Vous avez été désigné(e) comme l'un(e) des propriétaire du groupe %{group_name}"
@@ -2980,6 +3042,15 @@ fr:
         Vous avez répondu à un courriel de résumé, ce qui n'est pas accepté.
 
         Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
+    email_reject_too_many_recipients:
+      title: "Rejeter un e-mail avec trop de destinataires"
+      subject_template: "[%{email_prefix}] Problème d'e-mail -- Trop de destinataires"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre e-mail à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Vous avez essayé d'envoyer un e-mail à plus de %{max_recipients_count} personnes et notre système a automatiquement marqué votre e-mail comme étant un courrier indésirable.
+
+        Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable] (%{base_url}/about).
     email_error_notification:
       title: "Notification d'erreur courriel"
       subject_template: "[%{email_prefix}] Problème de courriel - Erreur d'authentification POP3"
@@ -3143,8 +3214,8 @@ fr:
     posted_by: "Publié par %{username} le %{post_date}"
     pm_participants: "Participants : %{participants}"
     more_pm_participants:
-      one: "%{participants} et %{count} autre"
-      other: "%{participants} et %{count} autres"
+      one: "%{participants} et %{count} autre participant"
+      other: "%{participants} et %{count} autres participants"
     invited_group_to_private_message_body: |
       %{username} a invité @%{group_name} à un message
 
@@ -3301,6 +3372,7 @@ fr:
 
         %{respond_instructions}
     user_group_mentioned_pm:
+      title: "Groupe d'utilisateurs a mentionné un MD"
       subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3311,6 +3383,7 @@ fr:
 
         %{respond_instructions}
     user_group_mentioned_pm_group:
+      title: "Groupe d'utilisateurs a mentionné un MD"
       subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3370,9 +3443,9 @@ fr:
       title: "Compte suspendu"
       subject_template: "[%{email_prefix}] Votre compte a été suspendu"
       text_body_template: |
-        Votre compte sur le forum a été suspendu.
+        Votre compte a été suspendu du forum.
 
-        Motif&nbsp;: %{reason}
+        Motif : %{reason}
     account_silenced:
       title: "Compte mis en sourdine"
       subject_template: "[%{email_prefix}] Votre compte a été mis en sourdine"
@@ -3384,9 +3457,9 @@ fr:
       title: "Compte mis en sourdine"
       subject_template: "[%{email_prefix}] Votre compte a été mis en sourdine"
       text_body_template: |
-        Votre compte sur le forum a été mis en sourdine.
+        Votre compte a été mis en sourdine sur le forum.
 
-        Motif&nbsp;: %{reason}
+        Motif : %{reason}
     account_exists:
       title: "Le compte existe déjà"
       subject_template: "[%{email_prefix}] Le compte existe déjà"
@@ -3586,6 +3659,18 @@ fr:
     suspicious_login:
       title: "Notification de nouvelle connexion"
       subject_template: "[%{site_name}] Nouvelle connexion depuis %{location}"
+      text_body_template: |
+        Bonjour,
+
+        Nous avons remarqué une connexion provenant d'un lieu ou d'un appareil que vous n'utilisez pas d'habitude. Était-ce bien vous ?
+
+         - Lieu : %{location} (%{client_ip})
+         - Navigateur : %{browser}
+         - Appareil : %{device} – %{os}
+
+        Si c'était bien vous, tant mieux ! Rien à signaler.
+
+        Si ce n'est pas vous, nous vous prions d'[examiner les connexions établies récemment](%{base_url}/my/preferences/security) et d'envisager un changement de votre mot de passe.
     post_approved:
       title: "La publication de votre message a été autorisée"
       subject_template: "[%{site_name}] La publication de votre message a été autorisée"
@@ -3623,29 +3708,29 @@ fr:
     store_failure: "Erreur lors du stockage du fichier numéro %{upload_id} pour l'utilisateur %{user_id}."
     file_missing: "Nous sommes désolés, vous devez fournir un fichier à envoyer."
     empty: "Nous sommes désolés, mais le fichier que vous avez fourni est vide."
-    failed: "Navré, l'envoi de fichier a échoué. Nous vous prions de réessayer."
+    failed: "Le téléversement a échoué. Nous vous prions de réessayer."
     png_to_jpg_conversion_failure_message: "Une erreur est survenue lors de la conversion du format PNG en JPG."
     optimize_failure_message: "Une erreur est survenue lors de l'optimisation de l'image envoyée."
     download_failure: "Le téléchargement du fichier depuis la source externe a échoué."
     size_mismatch_failure: "La taille du fichier envoyé vers S3 ne correspondait pas à la taille attendue. %{additional_detail}"
-    create_multipart_failure: "L'initiation du chargement partionné dans l'espace de stockage externe a échoué."
-    abort_multipart_failure: "L'annulation du chargement partitionné dans l'espace de stockage externe a échoué."
-    complete_multipart_failure: "Le chargement partionné dans l'espace de stockage externe a échoué."
-    external_upload_not_found: "L'objet ou le fichier n'a pas été trouvé dans l'espace de stockage externe. %{additional_detail}"
-    checksum_mismatch_failure: "La vérification d'intégrité du fichier que vous avez envoyé a échoué. Le contenu du fichier a possiblement été modifié pendant son envoi. Nous vous prions de réessayer."
-    cannot_promote_failure: "L'envoi n'a pas pu être effectué. Il avait peut-être déjà été effectué avec succès une première fois, ou avait peut-être déjà échoué une première fois."
-    size_zero_failure: "Navré, un problème est survenu&nbsp;: le fichier reçu semble être vide. Nous vous prions de réessayer l'envoi."
+    create_multipart_failure: "Impossible de créer un téléversement partitionné dans la boutique externe."
+    abort_multipart_failure: "Impossible d'interrompre le téléversement partitionné dans la boutique externe."
+    complete_multipart_failure: "Impossible de terminer le téléversement partitionné dans la boutique externe."
+    external_upload_not_found: "Le téléversement n'a pas été trouvé dans la boutique externe. %{additional_detail}"
+    checksum_mismatch_failure: "La somme de contrôle du fichier que vous avez téléversé ne correspond pas. Le contenu du fichier a peut-être changé lors du téléversement. Veuillez réessayer."
+    cannot_promote_failure: "Le téléversement n'a pas pu être effectué. Il avait peut-être déjà été effectué ou échoué une première fois."
+    size_zero_failure: "Un problème semble être survenu, la taille du fichier que vous tentez d'importer est de 0 octet. Veuillez réessayer."
     attachments:
       too_large: "Nous sommes désolés, le fichier que vous essayez d'envoyer est trop volumineux (la taille maximale autorisée est de %{max_size_kb} Ko)."
-      too_large_humanized: "Navré, le fichier que vous souhaitez joindre est trop lourd. (La taille maximale permise est de %{max_size}.)"
+      too_large_humanized: "Nous sommes désolés, le fichier que vous essayez d'envoyer est trop volumineux (la taille maximale autorisée est de %{max_size})."
     images:
       too_large: "Nous sommes désolés, l'image que vous essayez d'envoyer est trop grande (la taille maximale autorisée est de %{max_size_kb} Ko). Veuillez la redimensionner puis réessayez."
-      too_large_humanized: "Navré, les dimensions de l'image que vous souhaitez joindre sont trop grandes. (Les dimensions maximales permises sont de %{max_size}.) Nous vous prions de redimensionner cette image avant de réessayer."
+      too_large_humanized: "Nous sommes désolés, l'image que vous essayez d'envoyer est trop grande (la taille maximale autorisée est de %{max_size}). Veuillez la redimensionner, puis réessayez."
       larger_than_x_megapixels: "Nous sommes désolés, l'image que vous essayez d'envoyer est trop grande (la dimension maximale est de %{max_image_megapixels} mégapixels). Veuillez la redimensionner puis réessayez."
       size_not_found: "Nous sommes désolés, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?"
     placeholders:
       too_large: "(image plus grande que %{max_size_kb} Ko)"
-      too_large_humanized: "(image supérieure à %{max_size})"
+      too_large_humanized: "(taille de l'image supérieure à %{max_size})"
   avatar:
     missing: "Nous sommes désolés, nous ne parvenons pas à trouver un avatar associé à cette adresse courriel. Pouvez-vous essayer de l'envoyer à nouveau ?"
   flag_reason:
@@ -3690,6 +3775,12 @@ fr:
     dark_rose: "Rose foncé"
     wcag: "WCAG Clair"
     wcag_theme_name: "WCAG Clair"
+    dracula: "Dracula"
+    dracula_theme_name: "Dracula"
+    solarized_light: "Lumière solarisée"
+    solarized_light_theme_name: "Lumière solarisée"
+    solarized_dark: "Sombre solarisé"
+    solarized_dark_theme_name: "Sombre solarisé"
     wcag_dark: "WCAG Sombre"
     wcag_dark_theme_name: "WCAG Sombre"
     default_theme_name: "Par défaut"
@@ -4072,7 +4163,7 @@ fr:
         invalid_csv: Une erreur s'est produite à la ligne %{line_number}. Veuillez confirmer que le fichier CSV contient une adresse courriel par ligne.
         too_many_csv_entries: Trop de lignes dans le fichier CSV. Veuillez fournir un fichier CSV contenant un maximum de %{count} lignes.
         badge_disabled: Veuillez préalablement activer le badge %{badge_name}.
-        cant_grant_multiple_times: Impossible d'attribuer plusieurs fois à un seul utilisateur le badge %{badge_name}.
+        cant_grant_multiple_times: Impossible d'attribuer le badge %{badge_name} plusieurs fois à un même utilisateur.
     editor:
       name: Éditeur
       description: Première modification d'un message
@@ -4321,6 +4412,7 @@ fr:
       invalid_token: "Jeton invalide."
     email_input: "Courriel de l'administrateur"
     submit_button: "Envoyer un courriel"
+    safe_mode: "Mode sans échec : désactivez tous les thèmes ou extensions lors de la connexion"
   performance_report:
     initial_post_raw: Ce sujet comprend des rapports de performance journaliers concernant votre site.
     initial_topic_title: Rapports de performances du site
@@ -4343,11 +4435,11 @@ fr:
       synonym: 'Les synonymes ne sont pas autorisés. Utilisez « %{tag_name} ».'
       has_synonyms: 'L''étiquette « %{tag_name} » ne peut pas être utilisée car elle a des synonymes.'
       restricted_tags_cannot_be_used_in_category:
-        one: 'La balise "%{tags}" ne peut pas être utilisée dans la catégorie "%{category}". Veuillez la supprimer.'
-        other: 'Les balises suivantes ne peuvent pas être utilisées dans la catégorie "%{category}" : %{tags}. Veuillez les supprimer.'
+        one: 'L''étiquette « %{tags} » ne peut pas être utilisée dans la catégorie « %{category} ». Veuillez la supprimer.'
+        other: 'Les étiquettes suivantes ne peuvent pas être utilisées dans la catégorie « %{category} » : %{tags}. Veuillez les supprimer.'
       category_does_not_allow_tags:
-        one: 'La catégorie "%{category}" n''autorise pas la balise "%{tags}". Veuillez la supprimer.'
-        other: 'La catégorie "%{category}" n''autorise pas les balises suivantes : "%{tags}". Veuillez les supprimer.'
+        one: 'La catégorie « %{category} » n''autorise pas l''étiquette « %{tags} ». Veuillez la supprimer.'
+        other: 'La catégorie « %{category} » n''autorise pas les étiquettes suivantes : « %{tags} ». Veuillez les supprimer.'
     required_tags_from_group:
       one: "Vous devez inclure au moins %{count} étiquette %{tag_group_name}. Les étiquettes associées à ce groupe sont : %{tags}"
       other: "Vous devez inclure au moins %{count} étiquettes %{tag_group_name}. Les étiquettes associées à ce groupe sont : %{tags}"
@@ -4359,6 +4451,7 @@ fr:
     register:
       button: "Créer"
       title: "Créer un compte administrateur"
+      help: "Créez un nouveau compte pour commencer."
       no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration. Veuillez ajouter un courriel de développeur dans le fichier de configuration ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>créer un compte administrateur depuis la console</a>."
     confirm_email:
       title: "Confirmer votre adresse courriel"
@@ -4381,23 +4474,34 @@ fr:
         title: "Parlez-nous de votre communauté"
         fields:
           title:
-            placeholder: "Le repaire de Jeanne"
+            label: "Nom de la communauté"
+            placeholder: "Le lieu de rencontre de Jane"
           site_description:
-            placeholder: "Un endroit de discussion pour Jeanne et ses amis"
+            label: "Décrivez votre communauté en une phrase"
+            placeholder: "Un lieu de discussion pour Jane et ses amis"
           contact_email:
+            label: "Point de contact"
             placeholder: "exemple@utilisateur.com"
+            description: "Personne ou groupe responsable de cette communauté. Utilisé pour les mises à jour critiques et répertorié sur <a href='%{base_path}/about' target='_blank'>votre page à propos</a> en cas de besoin de contact urgent."
           default_locale:
             label: "Langue "
       privacy:
+        title: "Expérience des membres"
         fields:
           login_required:
             placeholder: "Privé"
             extra_description: "Seuls les utilisateurs connectés peuvent accéder à cette communauté"
+          invite_only:
+            placeholder: "Sur invitation uniquement"
+            extra_description: "Les utilisateurs doivent être invités par des utilisateurs ou des responsables de confiance, autrement les utilisateurs peuvent s'inscrire par eux-mêmes"
           must_approve_users:
             placeholder: "Nécessiter l'approbation"
+            extra_description: "Les utilisateurs doivent être approuvés par un responsable"
       ready:
         title: "Votre Discourse est prêt !"
+        description: "C'est ça ! Vous avez terminé les bases pour configurer votre communauté. Vous pouvez maintenant vous lancer et jeter un coup d'œil, écrire un sujet de bienvenue et envoyer des invitations !<br><br>Amusez-vous bien !"
       styling:
+        title: "Apparence et sensation"
         fields:
           color_scheme:
             label: "Jeu de couleurs"
@@ -4413,7 +4517,7 @@ fr:
               latest:
                 label: "Sujets récents"
               categories_only:
-                label: "Catégories seules"
+                label: "Catégories uniquement"
               categories_with_featured_topics:
                 label: "Catégories avec sujets à la une"
               categories_and_latest_topics:
@@ -4423,29 +4527,37 @@ fr:
               categories_and_top_topics:
                 label: "Catégories et meilleurs sujets"
               categories_boxes:
-                label: "Boites de catégories"
+                label: "Boîtes de catégories"
               categories_boxes_with_topics:
-                label: "Boites de catégories et sujets"
+                label: "Boîtes de catégories avec sujets"
               subcategories_with_featured_topics:
                 label: "Sous-catégories avec sujets en vedette"
       branding:
+        title: "Personnaliser les logos"
         fields:
           logo:
             label: "Logo principal"
+            description: "Le logo en haut à gauche de votre site. Utilisez une image rectangulaire large d'une hauteur de 120 et d'un rapport hauteur/largeur supérieur à 3:1"
           logo_small:
             label: "Logo carré"
+            description: "Une version carrée de votre logo. Affiché en haut à gauche lors du défilement vers le bas et lors du partage sur les réseaux sociaux. Idéalement, au moins 512 x 512."
           favicon:
             label: "Icône du navigateur"
+            description: "Icône utilisée pour représenter votre site dans les navigateurs Web qui s'affiche bien dans de petites tailles. Le format PNG ou JPG est recommandé. Le logo carré est utilisé par défaut."
           large_icon:
             label: "Grande icône"
+            description: "Icône utilisée pour représenter votre site sur les appareils mobiles et qui s'affiche bien dans des tailles plus grandes. Idéalement supérieure à 512 x 512. Logo carré utilisé par défaut."
       corporate:
+        title: "Votre organisation"
         fields:
           company_name:
             label: "Nom de société"
             placeholder: "Société exemple"
+            description: "Saisi dans votre page de Conditions d'utilisation. N'hésitez pas à ignorer si aucune entreprise n'existe."
           governing_law:
             label: "Droit applicable"
             placeholder: "Loi californienne"
+            description: "Saisi dans votre page de Conditions d'utilisation. N'hésitez pas à ignorer si aucune entreprise n'existe."
           contact_url:
             label: "Page Web"
             placeholder: "https://www.example.com/contact-us"
@@ -4453,6 +4565,7 @@ fr:
           city_for_disputes:
             label: "Ville pour les litiges"
             placeholder: "San Francisco, Californie"
+            description: "Saisi dans votre page de Conditions d'utilisation. N'hésitez pas à ignorer si aucune entreprise n'existe."
           site_contact:
             label: "Messages automatiques"
             description: "Tous les messages directs émis par Discourse, tels que les signalements ou les notifications de sauvegarde, seront envoyés par cet utilisateur."
@@ -4512,9 +4625,9 @@ fr:
     conflict: "Un conflit de mise à jour vous empêche de faire cette action."
     reasons:
       post_count: "Les premiers messages de chaque utilisateur doivent être approuvés par un responsable. Voir %{link}."
-      trust_level: "Les réponses des utilisateurs dont le niveau de confiance est bas doivent être approuvées par un responsable. Voir %{link}."
-      new_topics_unless_trust_level: "Les sujets créés par des utilisateurs dont le niveau de confiance est bas doivent être approuvés par un responsable. Voir %{link}."
-      fast_typer: "Le nouvel utilisateur a écrit son premier message avec une rapidité suspecte, comportement typique des bots et des spammeurs. Voir%{link}."
+      trust_level: "Les réponses des utilisateurs dont le niveau de confiance est faible doivent être approuvées par un responsable. Voir %{link}."
+      new_topics_unless_trust_level: "Les sujets créés par des utilisateurs dont le niveau de confiance est faible doivent être approuvés par un responsable. Voir %{link}."
+      fast_typer: "Un nouvel utilisateur a écrit son premier message avec une rapidité suspecte, comportement typique des bots et des spammeurs. Voir %{link}."
       auto_silence_regex: "Nouvel utilisateur dont le premier message contient le motif textuel défini par le paramètre %{link}."
       watched_word: "Ce message contient un mot surveillé. Voir votre %{link}."
       staged: "Tout nouveau sujet ou message pour les utilisateurs distants doit être approuvé par les responsables. Voir %{link}."
@@ -4522,13 +4635,13 @@ fr:
       must_approve_users: "Tous les nouveaux utilisateurs doivent être approuvés par un responsable. Voir %{link}."
       invite_only: "Tous les nouveaux utilisateurs doivent être invités. Voir %{link}."
       email_auth_res_enqueue: "Ce courriel n'a pas passé une vérification DMARC, il est fort probable qu'il ne provienne pas de l'expéditeur annoncé. Vérifiez les en-têtes du courriel brut pour plus d'informations."
-      email_spam: "Ce courriel a été identifié comme un spam d'après l'en-tête défini dans %{link}."
-      suspect_user: "Ce nouvel utilisateur a renseigné son profil sans lire de sujets ni de messages, comportement typique d'un spammeur. Voir %{link}."
-      contains_media: "Ce message contient un ou plusieurs médias audio ou vidéo. Voir %{link}."
+      email_spam: "Cette adresse e-mail a été identifiée comme un courrier indésirable d'après l'en-tête défini dans %{link}."
+      suspect_user: "Ce nouvel utilisateur a saisi les informations de son profil sans lire aucun sujet ou article, ce qui suggère fortement qu'il s'agit peut-être d'un spammeur. Voir %{link}."
+      contains_media: "Ce message contient un ou plusieurs contenus multimédias ou vidéo. Voir %{link}."
       queued_by_staff: "Un responsable a estimé que ce message devait être examiné avant sa publication. Il restera masqué jusqu'à son approbation par un modérateur."
       links:
         watched_word: liste des mots surveillés
-        category: réglages de la catégorie
+        category: paramètres de la catégorie
     actions:
       agree:
         title: "Accepter…"
@@ -4612,8 +4725,8 @@ fr:
   notification_level:
     ignore_error: "Nous sommes désolés, vous ne pouvez pas ignorer cet utilisateur."
     mute_error: "Nous sommes désolés, vous ne pouvez pas mettre cet utilisateur en sourdine."
-    error: "Désolé, vous ne pouvez pas modifier le niveau de notification pour cet utilisateur."
-    invalid_value: '"%{value}" n''est pas un niveau de notification valide.'
+    error: "Vous ne pouvez pas modifier le niveau de notification de cet utilisateur."
+    invalid_value: '« %{value} » n''est pas un niveau de notification valide.'
   discord:
     not_in_allowed_guild: "L'authentification a échoué. Vous n'êtes membre d'aucune guilde Discord autorisée."
   old_keys_reminder:
@@ -4635,7 +4748,7 @@ fr:
   fallback_username: "utilisateur"
   user_status:
     errors:
-      ends_at_should_be_greater_than_set_at: "La fin doit être supérieure à l'enregistrement"
+      ends_at_should_be_greater_than_set_at: "ends_at doit être supérieur à set_at"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7c996b8a47..326efdd2fb 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -2942,6 +2942,13 @@ he:
     bulk_invite_failed:
       title: "הזמנה קבוצתית נכשלה"
       subject_template: "ההזמנה המרוכזת עובדה עם שגיאות"
+      text_body_template: |
+        ההזמנה הקבוצתית שלך עברה עיבוד, %{sent} הזמנות נשלחו בדוא״ל, %{skipped} דולגו, %{warnings} אזהרות ו־%{failed} שגיאות.
+
+        הנה התיעוד:
+        ``` text
+        %{logs}
+        ```
     user_added_to_group_as_owner:
       title: "נוסף לקבוצה כבעלים"
       subject_template: "נוספת לקבוצה %{group_name} כבעלים"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 62d4e5f0b7..384a791e71 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -16,6 +16,7 @@ ja:
       date_only: "%Y 年 %B %-d 日"
       long: "%Y 年 %B %-d 日%P %l:%M"
       no_day: "%Y 年 %B"
+      calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
     - null
@@ -60,6 +61,7 @@ ja:
     ember_selector_error: "#ember または .ember-view CSS セレクタは使用できません。これらの名前はランタイムに動的に生成されるため、時間の経過とともに変化し、最終的には CSS が破損するためです。別のセレクタを試してください。"
     import_error:
       generic: テーマをインポート中にエラーが発生しました
+      upload: "アップロードアセットの作成中にエラーが発生しました: %{name}。%{errors}"
       about_json: "インポートエラー: about.json が存在しないか無効です。これは Discourseテーマですか？"
       about_json_values: "about.json に無効な値が含まれます: %{errors}"
       modifier_values: "about.json 修飾子に無効な値が含まれます: %{errors}"
@@ -69,6 +71,7 @@ ja:
       file_too_big: "解凍されたファイルが大きすぎます。"
       unknown_file_type: "アップロードしたファイルは、有効な Discourse テーマではないようです。"
       not_allowed_theme: "`%{repo}` は許可されたテーマのリストにありません (`allowed_theme_repos` グローバル設定を確認してください)。"
+      ssh_key_gone: "テーマのインストールに時間がかかり過ぎたため、SSH キーが期限切れになりました。もう一度お試しください。"
     errors:
       component_no_user_selectable: "テーマコンポーネントをユーザー選択可能にできません"
       component_no_default: "テーマコンポーネントをデフォルトテーマにできません"
@@ -124,6 +127,7 @@ ja:
         unsubscribe_not_allowed: "このユーザーがメール経由で購読を解除できない場合に発生します。"
         email_not_allowed: "メールリストがホワイトリストにないか、ブラックリストに含まれている場合に発生します。"
       unrecognized_error: "不明なエラー"
+    secure_uploads_placeholder: "編集済み: このサイトでは安全なアップロードが有効になっています。添付されたアップロードを確認するには、トピックにアクセスするか「メディアを表示」をクリックしてください。"
     view_redacted_media: "メディアを表示"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -187,6 +191,7 @@ ja:
       page_publishing_requirements: "セキュリティで保護されているメディアが有効である場合、ページの公開を有効にできません。"
       s3_backup_requires_s3_settings: "'%{setting_name}' が入力されていない場合、S3 をバックアップとして使用することはできません。"
       s3_bucket_reused: "'s3_upload_bucket' and 's3_backup_bucket' に同じバケットを使用することはできません。別のバケットを選択するか、バケットごとに異なるパスを使用してください。"
+      secure_uploads_requirements: "安全なアップロードを有効にする前に、S3 アップロードを有効にする必要があります。"
       share_quote_facebook_requirements: "Facebook に引用を共有できるようにするには、Facebook アプリの ID を設定する必要があります。"
       second_factor_cannot_enforce_with_socials: "ソーシャルログインが有効になっている状態で 2FA を適用することはできません。先に、%{auth_provider_names} でログインを無効にする必要があります。"
       second_factor_cannot_be_enforced_with_disabled_local_login: "ログインが無効になっている場合、2FA を適用することはできません。"
@@ -194,6 +199,10 @@ ja:
       local_login_cannot_be_disabled_if_second_factor_enforced: "2FA が適用されている場合、ローカルログインを無効にすることはできません。ローカルログインを無効にする前に、適用されている 2FA を無効にしてください。"
       cannot_enable_s3_uploads_when_s3_enabled_globally: "S3 アップロードはすでにグローバルに有効になっているため、S3 アップロードを有効にできません。サイトレベルでこれを有効にすると、アップロードで重大な問題が発生する可能性があります。"
       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}。"
+      strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "'composer media optimization image enabled' が有効である場合、画像メタデータの削除を無効にすることはできません。画像メタデータの削除を無効にする前に、'composer media optimization image enabled' を無効にしてください。"
+      twitter_summary_large_image_no_svg: "twitter:image メタデータに使用される Twitter の要約画像に .svg 画像を使用できません。"
     conflicting_google_user_id: 'このアカウントの Google アカウント ID が変更されました。セキュリティの理由により、スタッフによる介入が必要です。スタッフに連絡し、<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a> を示してください。'
     onebox:
       invalid_address: "サーバー '%{hostname}' が見つからなかったため、プレビューを生成できませんでした。投稿には、プレビューの代わりにリンクのみが表示されます。:cry:"
@@ -213,6 +222,9 @@ ja:
       <p>パスワードを覚えている場合は、<a href="%{base_url}/login">ログイン</a>してください。</p>
 
       <p>そうでない場合は、<a href="%{base_url}/password-reset">パスワードをリセット</a>してください。</p>
+    not_found_template_link: |
+      <p>この <a href="%{base_url}">%{site_name}</a> への招待を引き換えられなくなりました。あなたを招待した人に新しい招待を送るようリクエストしてください。</p>
+    user_exists: "<b>%{email}</b> を招待する必要はありません。すでにアカウントを持っています！"
     invite_exists: "<b>%{email}</b> はすでに招待済みです。"
     invalid_email: "%{email} は有効なメールアドレスではありません。"
     rate_limit:
@@ -222,6 +234,11 @@ ja:
     disabled_errors:
       discourse_connect_enabled: "DiscourseConnect が有効であるため、招待は無効です。"
       invalid_access: "リクエストしたリソースの閲覧が許可されていません。"
+    requires_groups: "指定されたトピックにアクセスできないため、招待は保存されませんでした。次のいずれかのグループを追加してください: %{groups}。"
+    domain_not_allowed: "あなたのメールアドレスは、この招待の引き換えに使用できません。"
+    max_redemptions_allowed_one: "招待メールは 1 である必要があります。"
+    redemption_count_less_than_max: "は %{max_redemptions_allowed} より小さい値である必要があります。"
+    email_xor_domain: "メールアドレスとドメインのフィールドを同時に使用できません"
   bulk_invite:
     file_should_be_csv: "アップロードファイルは csv 形式である必要があります。"
     max_rows: "最初の %{max_bulk_invites} 件の招待が送信されました。ファイルをより小さく分割してください。"
@@ -231,6 +248,7 @@ ja:
     max_redemptions_limit: "は、2 と %{max_limit} の間である必要があります。"
   topic_invite:
     failed_to_invite: "次のいずれかのグループのグループメンバーシップがない場合、ユーザーをこのトピックに招待できません: %{group_names}。"
+    not_pm: "プライベートメッセージにのみ招待できます。"
     user_exists: "そのユーザーはすでに招待されています。ユーザーを一度しかトピックに招待できません。"
     muted_topic: "そのユーザーはこのトピックをミュートしています。"
     receiver_does_not_allow_pm: "そのユーザーは、あなたがプライベートメッセージを送信することを許可していません。"
@@ -247,6 +265,7 @@ ja:
   not_found: "リクエストされた URL またはリソースは見つかりませんでした。"
   invalid_access: "リクエストしたリソースの閲覧が許可されていません。"
   authenticator_not_found: "認証方法は存在しないか無効になっています。"
+  authenticator_no_connect: "この認証プロバイダーは、既存のフォーラムアカウントへの接続を許可していません。"
   invalid_api_credentials: "リクエストされたリソースを表示することは許可されていません。API ユーザー名またはキーが無効です。"
   provider_not_enabled: "リクエストされたリソースを表示することは許可されていません。認証サービスプロバイダーが有効になっていません。"
   provider_not_found: "リクエストされたリソースを表示することは許可されていません。認証サービスプロバイダーが存在しません。"
@@ -306,6 +325,8 @@ ja:
   links_require_trust: "投稿にリンクを含めることはできません。"
   too_many_links:
     other: "新規ユーザーは投稿につき %{count} 件のリンクしか追加できません。"
+  contains_blocked_word: "'%{word}' という語を投稿できません。許可されていません。"
+  contains_blocked_words: "投稿できません。禁止: %{words}。"
   spamming_host: "このホストへのリンクを投稿できません。"
   user_is_suspended: "凍結中のユーザーは投稿できません。"
   topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。"
@@ -358,9 +379,14 @@ ja:
   bookmarks:
     errors:
       already_bookmarked_post: "同じ投稿を 2 回ブックマークすることはできません。"
+      already_bookmarked: "同じ %{type} を 2 回ブックマークすることはできません。"
       too_many: "ブックマークを %{limit} 件以上追加できません。<a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a>にアクセスして、いくつか削除してください。"
       cannot_set_past_reminder: "ブックマークリマインダーを過去の時間に設定できません。"
       cannot_set_reminder_in_distant_future: "ブックマークリマインダーは 10 年以上先の日時に設定できません。"
+      time_must_be_provided: "すべてのリマインダーには時間の指定が必要です。"
+      for_topic_must_use_first_post: "トピックのブックマークには、最初の投稿のみを使用できます。"
+      bookmarkable_id_type_required: "ブックマークするにはレコードの名前と種類は必須です。"
+      invalid_bookmarkable: "%{type} をブックマークできません。"
     reminders:
       at_desktop: "次にデスクトップに戻ったとき"
       later_today: "今日の後程"
@@ -444,6 +470,8 @@ ja:
       前の返信を編集する際に、テキストをハイライトして<b>引用して返信</b>ボタンを選択すると、返信に引用を追加することができます。
 
       短い個別の返信を多数読むよりも、詳細な返信を数件読む方が、トピックをフォローしやすくなります。
+    dominating_topic: 返信の %{percent}% 以上はあなたが投稿したものです。他にあなたが意見を聞きたい人はいませんか？
+    get_a_room: '@%{reply_username} に %{count} 回返信しましたが、個人メッセージを送信できることをご存知ですか？'
     too_many_replies: |
       ### このトピックへの返信数の制限に達しました
 
@@ -539,14 +567,21 @@ ja:
               too_many: "その操作には語が多すぎます"
             base:
               invalid_url: "置換 URL は無効です"
+              invalid_tag_list: "置換タグリストは無効です"
+        sidebar_section_link:
+          attributes:
+            linkable_type:
+              invalid: "は有効ではありあません"
       <<: *errors
   uncategorized_category_name: "未分類"
   general_category_name: "一般"
+  general_category_description: "他の既存のカテゴリに当てはまらないトピックをここに作成します。"
   meta_category_name: "サイトに関する意見"
   meta_category_description: "このサイト、組織、仕組み、および改善に関するディスカッションです。"
   staff_category_name: "スタッフ"
   staff_category_description: "スタッフディスカッション用の非公開カテゴリです。トピックは管理者とモデレーターのみが閲覧できます。"
   discourse_welcome_topic:
+    title: "コミュニティへようこそ！"
     body: |2
 
       この固定トピックの最初の写真は、ようこそメッセージとしてホームページを初めて訪問するすべてのユーザーに表示されるものであるため、重要です！
@@ -578,6 +613,7 @@ ja:
       permission_conflict: "サブカテゴリにアクセスできるグループは、その親カテゴリにもアクセスできます。次のグループは、サブカテゴリの 1 つにアクセスできますが、親カテゴリにはアクセスできません: %{group_names}"
       disallowed_topic_tags: "このトピックにはこのカテゴリで許可されていないタグがあります: '%{tags}'"
       disallowed_tags_generic: "このトピックはタグを許可していません。"
+      slug_contains_non_ascii_chars: "に非 ASCII 文字が含まれます"
     cannot_delete:
       uncategorized: "このカテゴリは特殊です。カテゴリのないトピックを保存するために用意されているため、削除できません。"
       has_subcategories: "サブカテゴリがあるためこのカテゴリを削除できません。"
@@ -592,8 +628,17 @@ ja:
   post:
     image_placeholder:
       broken: "この画像は破損しています"
+      blocked_hotlinked_title: "別のサイトにホストされている画像です。クリックすると新しいタブで開きます。"
+      blocked_hotlinked: "外部画像"
+    media_placeholder:
+      blocked_hotlinked_title: "別のサイトにホストされているメディアです。クリックすると新しいタブで開きます。"
+      blocked_hotlinked: "外部メディア"
+    hidden_bidi_character: "双方向テキストは、テキストがレンダリングされる順序を変更できます。これは、悪意のあるコードを隠すために使用される可能性があります。"
     has_likes:
       other: "「いいね！」 %{count}"
+    cannot_permanently_delete:
+      many_posts: "他の投稿があるため、このトピックを永久に削除することはできません。"
+      wait_or_different_admin: "%{time_left} 待ってからこの投稿を永久に削除するか、別の管理者が削除する必要があります。"
   rate_limiter:
     slow_down: "この操作の実行回数が多すぎます。後でもう一度お試しください。"
     too_many_requests: "この操作の実行回数が多すぎます。%{time_left}経ってからもう一度お試しください。"
@@ -606,6 +651,7 @@ ja:
       public_group_membership: "グループへの参加/退出を頻繁に行い過ぎているようです。%{time_left}経ってから、もう一度お試しください。"
       topics_per_day: "1 日に作成できる新規トピックの上限に達しました。%{time_left}後に新しいトピックを作成できるようになります。"
       pms_per_day: "1 日に作成できるメッセージの上限に達しました。%{time_left}後に新しいメッセージを作成できるようになります。"
+      create_like: "ポジティブバイブがあふれているようですね！24 時間以内に送信できる「いいね！」の上限に達しました。信頼レベルが高まると、さらに多くの「いいね！」を 1 日に送信できるようになります。%{time_left}経ったら、また投稿に「いいね！」できるようになります。"
       create_bookmark: "1 日のブックマークの上限に達しました。%{time_left}経ってから、ブックマークを設定してください。"
       edit_post: "1 日に編集できる回数の上限に達しました。%{time_left}経ってから、編集を送信してください。"
       live_post_counts: "ライブ投稿の件数を短時間で尋ねています。%{time_left}経ってから、もう一度お試しください。"
@@ -792,6 +838,8 @@ ja:
   draft_backup:
     pm_title: "進行中のトピックのバックアップ下書き"
     pm_body: "バックアップの下書きを含むトピック"
+  user_activity:
+    no_log_search_queries: "検索ログクエリは現在無効になっています (管理者はサイト設定で有効にできます)。"
   email_settings:
     pop3_authentication_error: "指定された POP3 の資格情報に問題がありました。ユーザー名とパスワードを確認して、もう一度お試しください。"
     imap_authentication_error: "指定された IMAP の資格情報に問題がありました。ユーザー名とパスワードを確認して、もう一度お試しください。"
@@ -852,6 +900,7 @@ ja:
         remove: "このトピックはバナーではなくなりました。各ページの上部に表示されなくなります。"
   unsubscribed:
     title: "メールの設定を更新しました！"
+    description: "<b>%{email}</b> のメールの設定が更新されました。変更するには<a href='%{url}'>あなたのユーザー設定にアクセス</a>してください。"
     topic_description: "%{link} を購読し直すには、トピックの下または右にある通知の管理を使用してください。"
     private_topic_description: "購読し直すには、トピックの下か右にある通知の管理を使用してください。"
   uploads:
@@ -1231,18 +1280,26 @@ ja:
         mutes_count: ミュート数
       description: "多数のユーザーによってミュートまたは無視されたユーザー。"
     top_users_by_likes_received:
+      title: "受け取った「いいね！」数のトップユーザー"
       labels:
         user: ユーザー
         qtt_like: '「いいね！」された数'
+      description: "「いいね！」を受け取った上位 10 人のユーザーです。"
     top_users_by_likes_received_from_inferior_trust_level:
+      title: "信頼レベルの低いユーザーから受け取った「いいね！」数別トップユーザー"
       labels:
         user: ユーザー
+        trust_level: 信頼レベル
         qtt_like: '「いいね！」された数'
+      description: "信頼レベルが高いユーザーが低いユーザーから受け取った「いいね！」の数の上位 10 人です。"
     top_users_by_likes_received_from_a_variety_of_people:
+      title: "さまざまな人から受け取った「いいね！」の数の上位ユーザー"
       labels:
         user: ユーザー
         qtt_like: '「いいね！」された数'
+      description: "広範な人から「いいね！」を受け取った上位 10 人のユーザーです。"
   dashboard:
+    group_email_credentials_warning: 'グループ <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> のメールの資格情報に問題がありました。この問題が解決されるまで、このグループの受信トレイからメールを送信できません。%{error}'
     rails_env_warning: "サーバーは %{env} モードで実行中です。"
     host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
     sidekiq_warning: 'Sidekiq が実行していません。メール送信などの多くのタスクは sidekiq により非同期に実行されます。少なくとも 1 つの sidekiq プロセスが実行していることを確認してください。<a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq についてはこちらをご覧ください</a>。'
@@ -1269,6 +1326,7 @@ ja:
     unreachable_themes: "次のテーマの更新を確認できませんでした:"
     watched_word_regexp_error: "'%{action}' のウォッチ語の正規表現は無効です。<a href='%{base_path}/admin/customize/watched_words'>ウォッチ語の設定</a>を確認するか、'ウォッチ語の正規表現' サイト設定を無効にしてください。"
   site_settings:
+    allow_bulk_invite: "CSV ファイルのアップロードによる一括招待を許可する"
     disabled: "無効"
     display_local_time_in_user_card: "ユーザーカードが開いたときのユーザーのタイムゾーンに基づいて現地時間を表示します。"
     censored_words: "自動的に &#9632;&#9632;&#9632;&#9632; に置換される語"
@@ -1289,6 +1347,8 @@ ja:
     min_personal_message_title_length: "メッセージのタイトルの最小文字数"
     max_emojis_in_title: "トピックタイトルに許可される最大絵文字数"
     min_search_term_length: "有効な検索語の最小文字数"
+    search_tokenize_chinese: "中国語以外のサイトでも、中国語をトークン化するように検索を強制する"
+    search_tokenize_japanese: "日本語以外のサイトでも、日本語をトークン化するように検索を強制する"
     search_prefer_recent_posts: "大規模なフォーラムの検索が遅い場合、このオプションは先により直近の投稿のインデックスを試す"
     search_recent_posts_size: "インデックスに保持する直近の投稿の数"
     log_search_queries: "ユーザーが実行した検索クエリをログに記録する"
@@ -1308,8 +1368,11 @@ ja:
     contact_email: "このサイトの責任者の主要連絡先のメールアドレス。重要な通知に使用され、緊急事項の <a href='%{base_path}/about' target='_blank'>/about</a> にも表示されます。"
     contact_url: "このサイトの連絡先 URL。緊急事項の <a href='%{base_path}/about' target='_blank'>/about</a> ページに表示されます。"
     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) 秒間は、編集しても投稿履歴に新しいバージョンを作成しない。"
     editing_grace_period_max_diff: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 0 および 1)"
     editing_grace_period_max_diff_high_trust: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 2 以上 )"
@@ -1318,6 +1381,7 @@ ja:
     tl2_post_edit_time_limit: "TL2 以上の作成者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
     edit_history_visible_to_public: "編集した投稿の前のバージョンをすべてのユーザーが閲覧することを許可する。無効である場合、スタッフメンバーのみが閲覧できます。"
     delete_removed_posts_after: "作成者が削除した投稿は (n) 時間後に自動的に削除される。0 に設置すると、投稿は直ちに削除されます。"
+    notify_users_after_responses_deleted_on_flagged_post: "投稿にフラグが立てられてから削除されると、投稿に返信した後にそれが削除されたすべてのユーザーに通知されます。"
     max_image_width: "投稿内のサムネイル画像の最大幅"
     max_image_height: "投稿内のサムネイル画像の最大高"
     responsive_post_image_sizes: "ライトボックスのプレビュー画像のサイズを変更して、次のピクセル比の DPI の高いスクリーンを可能にします。レスポンシブ画像を無効にするには、すべての値を削除します。"
@@ -1330,6 +1394,8 @@ ja:
     show_pinned_excerpt_mobile: "モバイルビューで固定トピックの抜粋を表示する。"
     show_pinned_excerpt_desktop: "デスクトップビューで固定トピックの抜粋を表示する。"
     post_onebox_maxlength: "Discourse OneBox 投稿の最大文字数。"
+    blocked_onebox_domains: "wikipedia.org など、ワンボックスに表示されないドメインのリスト\n(ワイルドカード記号 * ? はサポートされていません)"
+    block_onebox_on_redirect: "リダイレクトする URL のワンボックスをブロックします。"
     allowed_inline_onebox_domains: "タイトルなしでリンクされた場合、ミニチュア形式でワンボックス化されるドメインのリスト"
     enable_inline_onebox_on_all_domains: "inline_onebox_domain_allowlist サイト設定を無視し、すべてのドメインでインラインのワンボックスを許可する。"
     force_custom_user_agent_hosts: "すべてのリクエストでカスタムワンボックスユーザーエージェントを使用するホスト (特にユーザーエージェントごとにアクセスを制限するホストで役立ちます)。"
@@ -1348,17 +1414,22 @@ ja:
     favicon: "サイトのファビコン。<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> をご覧ください。CDN で正しく動作させるには、png である必要があります。32 x 32 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
     apple_touch_icon: "Apple タッチデバイスに使用されるアイコン。自動的に 180x180 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
     opengraph_image: "デフォルトの opengraph 画像。ページにほかの適切な画像がない場合に使用されます。空のままにすると、large_icon が使用されます"
+    twitter_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/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a> をご覧ください"
     detailed_404: "特定のトピックにアクセスできない詳細な理由をユーザーに提供します。注意: URL が有効なトピックにリンクしているかどうかがユーザーにわかるため、安全性が低くなります。"
     enforce_second_factor: "ユーザーが二要素認証を有効にするように強制します。すべてのユーザーに適用する場合は 'すべて' を選択します。スタッフユーザーのみに適用する場合は 'スタッフ' を選択します。"
     force_https: "サイトが HTTPS のみを使用するように強制する。警告: HTTPS が完全にセットアップ済みであり、すべての場所で機能していることを確認するまで、これを有効にしないでください！CDN、すべてのソーシャルログイン、および外部ロゴ/依存関係がすべて HTTPS 対応であることを確認しましたか？"
+    same_site_cookies: "同じサイト Cookie を使用する。サポートされているブラウザですべてのクロスサイトリクエストフォージェリ攻撃を排除します (Lax または Strict)。Strict は、ログインと外部認証方式の使用を強制するサイトでのみ動作します。"
     summary_score_threshold: "「このトピックを要約」に含まれるために必要な投稿の最低スコア"
     summary_posts_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の投稿数。この設定を変更すると、1 週間以内で遡って適用されます。"
     summary_likes_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の「いいね！」数。この設定を変更すると、1 週間以内で遡って適用されます。"
     summary_percent_filter: "「このトピックを要約」をクリックしたとき表示される上位投稿の割合%"
     summary_max_results: "'このトピックを要約' が返す最大投稿数"
+    summary_timeline_button: "タイムラインに '要約' ボタンを表示する"
+    enable_personal_messages: "非推奨。代わりに 'personal message enabled groups' 設定を使用してください。信頼レベル 1 (メッセージを送信できる最低信頼レベルで構成可能) ユーザーに、メッセージの作成とメッセージへの返信を許可します。それにも関わらず、スタッフは常にメッセージを送信できることに注意してください。"
+    personal_message_enabled_groups: "これらのグループ内のユーザーに、メッセージの作成とメッセージへの返信を許可します。信頼レベルグループには、その数値を超えるすべての信頼レベルが含まれます。たとえば、trust_level_1 を選択すると、rust_level_2、3、4 のユーザーにも、個人メッセージの送信が許可されます。それにも関わらず、スタッフは常にメッセージを送信できることに注意してください。"
     enable_system_message_replies: "個人メッセージが無効である場合でも、ユーザーによるシステムメッセージへの返信を許可する"
     enable_chunked_encoding: "サーバーによるチャンク形式エンコーディング応答を有効にする。この機能はほとんどのセットアップで動作しますが、一部のプロキシではバッファリングが生じ、応答が遅延する可能性があります。"
     long_polling_base_url: "ロングポーリングのベース URL (CDN が動的コンテンツを配信している場合、これを origin pull に指定してください) 例: http://origin.site.com"
@@ -1377,6 +1448,9 @@ ja:
     tl2_additional_edits_per_day_multiplier: "TL2 (メンバー) の 1 日あたりの編集数の上限をこの数を倍数として増加する"
     tl3_additional_edits_per_day_multiplier: "TL3 (レギュラー) の 1 日あたりの編集数の上限をこの数を倍数として増加する"
     tl4_additional_edits_per_day_multiplier: "TL4 (リーダー) の 1 日あたりの編集数の上限をこの数を倍数として増加する"
+    tl2_additional_flags_per_day_multiplier: "TL2 (メンバー) の 1 日あたりのフラグ数の上限をこの数を倍数として増加する"
+    tl3_additional_flags_per_day_multiplier: "TL3 (レギュラー) の 1 日あたりのフラグ数の上限をこの数を倍数として増加する"
+    tl4_additional_flags_per_day_multiplier: "TL4 (リーダー) の 1 日あたりのフラグ数の上限をこの数を倍数として増加する"
     num_users_to_silence_new_user: "新しいユーザーの投稿がこの数のユーザーから num_spam_flags_to_silence_new_user 件の迷惑通報を受けると、そのユーザーのすべての投稿を非表示にして、以降で投稿できないようにします。0 を指定すると無効になります。"
     num_tl3_flags_to_silence_new_user: "新しいユーザーの投稿が num_tl3_users_to_silence_new_user 人の信頼レベル 3 ユーザーからこの件数の通報を受けると、そのユーザーのすべての投稿を非表示にして、以降で投稿できないようにします。0 を指定すると、無効になります。"
     num_tl3_users_to_silence_new_user: "新しいユーザーの投稿がこの数の信頼レベル 3 ユーザーから num_tl3_flags_to_silence_new_user 件の迷惑通報を受けると、そのユーザーのすべての投稿を非表示にして、以降で投稿できないようにします。0 を指定すると無効になります。"
@@ -1401,6 +1475,7 @@ ja:
     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-ABCDEF。<br/>注意: GTM が読み込むサードパーティスクリプトは、'content security policy script src' のホワイトリストに追加されている必要がある場合があります。"
     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_and_groups: "モデレーターによるカテゴリとグループの作成と管理を許可する"
     moderators_change_post_ownership: "モデレーターによる投稿の所有権の変更を許可する"
     cors_origins: "CORS を許可。オリジンは http:// か https:// を含む必要があります。CORS を有効にするには、環境変数　DISCOURSE_ENABLE_CORS に true を設定する必要があります。"
     use_admin_ip_allowlist: "管理者はスクリーン対象 IP リスト (管理者 > ログ > スクリーン対象 IP) に定義されている IP アドレスからのみログインできる。"
@@ -1410,6 +1485,7 @@ ja:
     allowed_iframes: "Discourse が投稿で安全に許可できる iframe src ドメインプレフィックスのリスト"
     allowed_crawler_user_agents: "サイトへのアクセスを許可する必要のあるウェブクローラーのユーザーエージェント。警告！これを設定すると、ここにリストされていないすべてのクローラーが拒否されます！"
     blocked_crawler_user_agents: "サイトへのアクセスを許可してはいけないウェブクローラーを識別する、ユーザーエージェント文字列の大文字と小文字を区別しない一意の語。ホワイトリストが定義されている場合は適用されません。"
+    slow_down_crawler_user_agents: '""slow down crawler rate" 設定の構成のとおりに速度の制限が必要なウェブクローラーのユーザーエージェント。各値の長さは 3 文字以上です。'
     slow_down_crawler_rate: "このレートに slow_down_crawler_user_agents が指定されている場合、このレートはすべてのクローラーに適用されます (リクエスト間の遅延秒数)"
     content_security_policy: "Content-Security-Policy を有効にする"
     content_security_policy_report_only: "Content-Security-Policy-Report-Only を有効にする"
@@ -1421,6 +1497,7 @@ ja:
     post_menu: "投稿メニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "展開ボタンがクリックされるまで、デフォルトで非表示にする投稿のメニュー項目。"
     share_links: "共有ダイアログに表示する項目、表示順を指定。"
+    allow_username_in_share_links: "ユーザー名を共有リンクに含めることを許可します。これは、ユニークビジター数に応じてバッジを与えるのに役立ちます。"
     site_contact_username: "自動送信メールの from に使用される有効なスタッフのユーザー名。空欄の場合デフォルトのシステムアカウントが使用されます。"
     site_contact_group_name: "すべての自動メッセージに招待される有効なグループ名。"
     send_welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのようこそメッセージを送信する。"
@@ -1428,6 +1505,7 @@ ja:
     send_tl2_promotion_message: "新しい信頼レベル 2 ユーザーに昇格に関するメッセージを送信します。"
     suppress_reply_directly_below: "投稿に返信が 1 つしかない場合、投稿の展開可能な返信数を表示しない。"
     suppress_reply_directly_above: "投稿に返信が 1 つしかない場合、投稿の展開可能な in-reply-to を表示しない。"
+    remove_full_quote: "次の場合、引用符は自動的に削除されます: (a) 投稿の最初に出現する場合、(b) 投稿全体である場合、(c) 直前の投稿の引用符である場合。詳細については、「<a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>ダイレクト返信の引用全文の削除</a>」をご覧ください。"
     suppress_reply_when_quoting: "投稿が引用返信だった場合、投稿の展開可能な in-reply-to を表示しない。"
     max_reply_history: "in-reply-toを展開するときに展開する返信の最大数"
     topics_per_period_in_top_summary: "デフォルトの人気トピックの要約に表示される人気トピックの数"
@@ -1442,10 +1520,13 @@ ja:
     enable_badges: "バッジ機能を有効にする"
     max_favorite_badges: "ユーザーが選択できるバッジの最大数"
     enable_whispers: "トピック内でのスタッフの非公開コミュニケーションを許可する。"
+    whispers_allowed_groups: "特定のグループのメンバーに、トピック内での非公開コミュニケーションを許可します。"
     allow_index_in_robots_txt: "このサイトがウェブ検索エンジンによるインデックス作成を許可していることを robots.txt に指定します。例外的なケースでは、永続的に <a href='%{base_path}/admin/customize/robots'>robots.txt をオーバーライド</a>できます。"
     blocked_email_domains: "ユーザーがアカウント登録をすることができないメールドメインの、パイプ区切りのリスト。例: mailinator.com|trashmail.net"
     allowed_email_domains: "ユーザー登録に必要なメールドメインのパイプ区切りのリスト。警告: 指定したメールドメイン以外のユーザーの登録は許可されません！"
+    normalize_emails: "正規化されたメールアドレスが一意であるかをチェックします。正規化されたメールアドレスでは、ユーザー名のすべてのドットと、+ と @ 記号の間のすべてが削除されます。"
     auto_approve_email_domains: "このドメインリストのメールアドレスを持つユーザーは自動的に承認されます。"
+    hide_email_address_taken: "サインアップ中やパスワード忘れのフローの際に、指定したメールアドレスでアカウントが存在することをユーザーに知らせません。'パスワード忘れ' のリクエストでは、完全なメールアドレスが必要です。"
     log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトする"
     version_checks: "Discourse に Ping してバージョン更新を確認し、<a href='%{base_path}/admin' target='_blank'>/admin</a> ダッシュボードに新しいバージョンに関するメッセージを表示する"
     new_version_emails: "Discourse の新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する"
@@ -1490,6 +1571,9 @@ ja:
     google_oauth2_client_secret: "あなたの Google アプリケーションのクライアントシークレット"
     google_oauth2_prompt: "認証サーバーがユーザーに再認証と同意を促すかどうかを指定する文字列のスペース区切りリスト (オプション)。使用できる値については、<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> をご覧ください。"
     google_oauth2_hd: "サインインが制限される Google Apps Hosted ドメイン (オプション)。詳細については、<a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> をご覧ください。"
+    google_oauth2_hd_groups: "(実験的) 認証時に、ホストされたドメイン上のユーザーの Google グループを取得します。取得された Google グループを使って、Discourse の自動グループメンバーシップを付与することができます (グループ設定を参照)。詳細については、https://meta.discourse.org/t/226850 をご覧ください。"
+    google_oauth2_hd_groups_service_account_admin_email: "Google Workspace 管理者アカウントに属するメールアドレス。グループ情報を取得するために、サービスアカウントの資格情報とともに使用されます。"
+    google_oauth2_hd_groups_service_account_json: "サービスアカウントの JSON 形式のキー情報。グループ情報の取得に使用されます。"
     enable_twitter_logins: "Twitter 認証を有効にする。twitter_consumer_key と twitter_consumer_secret が必要です。「<a href='https://meta.discourse.org/t/13395' target='_blank'>Discourse で Twitter ログイン (およびリッチの埋め込み) を構成する</a>」をご覧ください。"
     twitter_consumer_key: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> で登録されている Twitter 認証のコンシューマーキー。"
     twitter_consumer_secret: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> で登録されている Twitter 認証のコンシューマーシークレット。"
@@ -1525,6 +1609,8 @@ ja:
     top_topics_formula_first_post_likes_multiplier: "人気のトピックの計算式に使用する最初の投稿の「いいね！」の乗数 (n) の値: `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: "人気のトピックの計算式に使用する最小「いいね！」率の乗数 (n) の値: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     enable_safe_mode: "プラグインをデバッグするためにユーザーによる安全モードの開始を許可する。"
+    enable_experimental_sidebar_hamburger: "実験的サイドバーとユーザーのハンバーガードロップダウンメニューを有効にできます。"
+    enable_sidebar: "実験的サイドバーを有効にします。"
     rate_limit_create_topic: "トピック作成後、ユーザーは (n) 秒待ってから次のトピックを作成する必要があります。"
     rate_limit_create_post: "投稿後、ユーザーは (n) 秒待ってから次の投稿を作成する必要があります。"
     rate_limit_new_user_create_topic: "トピック作成後、新規ユーザーは (n) 秒待ってから次のトピックを作成する必要があります。"
@@ -1537,6 +1623,7 @@ ja:
     max_personal_messages_per_day: "ユーザーが 1 日に作成できる新しい個人メッセージのトピックの最大数"
     max_invites_per_day: "ユーザーが 1 日に招待できる最大数"
     max_topic_invitations_per_day: "ユーザーが 1 日にトピックに招待できる最大数"
+    max_topic_invitations_per_minute: "ユーザーが 1 分間に送信できるトピック招待の最大数。"
     max_logins_per_ip_per_hour: "1 時間あたりに IP アドレスごとに許可する最大ログイン数"
     max_logins_per_ip_per_minute: "1 分あたりに IP アドレスごとに許可する最大ログイン数"
     max_post_deletions_per_minute: "1 分あたりにユーザーが削除できる最大投稿数。0 に設定すると、投稿の削除を無効にします。"
@@ -1567,6 +1654,8 @@ ja:
     external_emoji_url: "絵文字画像の外部サービスの URL。無効にするには空のままにします。"
     use_site_small_logo_as_system_avatar: "システムユーザーのアバターの代わりにサイトの small logo を使用する。ロゴが存在する必要があります。"
     restrict_letter_avatar_colors: "文字アバターの背景に使用される 6 桁の 16 進数の色値のリスト。"
+    enable_listing_suspended_users_on_search: "レギュラーユーザーが凍結中のユーザーを検索できるようにします。"
+    selectable_avatars_mode: "ユーザーが selectable_avatars リストからアバターを選択できるようにし、カスタムアバターのアップロードを選択した信頼レベルに制限できるようにします。"
     selectable_avatars: "ユーザーが選択できるアバターのリスト。"
     allow_all_attachments_for_group_messages: "グループメッセージのメールの添付ファイルをすべて許可する。"
     png_to_jpg_quality: "変換された JPG ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
@@ -1613,6 +1702,7 @@ ja:
     min_trust_to_edit_wiki_post: "ウィキとしてマークされた投稿を編集するために必要な最低信頼レベル。"
     min_trust_to_edit_post: "投稿を編集するために必要な最低信頼レベル。"
     min_trust_to_allow_self_wiki: "ユーザー自身の投稿をウィキにするために必要な最低信頼レベル。"
+    min_trust_to_send_messages: "非推奨。代わりに '個人メッセージが有効なグループ' 設定を使用してください。新しい個人メッセージを作成するのに必要な最低限の信頼レベルです。"
     min_trust_to_send_email_messages: "メールで個人メッセージを送信するために必要な最低信頼レベル。"
     min_trust_to_flag_posts: "投稿を通報するために必要な最低信頼レベル"
     min_trust_to_post_links: "投稿にリンクを含めるために必要な最低信頼レベル"
@@ -1630,6 +1720,9 @@ ja:
     max_mentions_per_post: "すべてのユーザーが投稿内で @name 通知を行える最大数"
     max_users_notified_per_group_mention: "グループがメンションされたときに通知を受信するユーザーの最大数 (しきい値に達した場合、通知は発生しません)"
     enable_mentions: "ユーザーによるほかのユーザーのメンションを許可する。"
+    here_mention: "特権ユーザーが最大 'max_here_mentioned' 人のトピック参加者に通知できるようにする、@メンションに使用される名前。既存のユーザー名は使用できません。"
+    max_here_mentioned: "@here でメンションされるユーザーの最大数です。"
+    min_trust_level_for_here_mention: "@here をメンションできる最低信頼レベルです。"
     create_thumbnails: "大きすぎて投稿に収まらないが画像のサムネイルを作成し、ライトボックスにします。"
     email_time_window_mins: "ユーザーに最終編集の機会を与えられるよう、通知メールを送信するまで (n) 分待機する。"
     personal_email_time_window_seconds: "ユーザーがメッセージの最終編集を行えるよう、 (n) 秒待ってから個人メッセージの通知メールを送信する。"
@@ -1680,6 +1773,7 @@ ja:
     topic_view_duration_hours: "N 時間ごとに IP/ユーザーあたりの新規トピックビューを 1 回カウントする"
     user_profile_view_duration_hours: "N 時間ごとに IP/ユーザーあたりの新規ユーザープロフィールビューを 1 回カウントする"
     levenshtein_distance_spammer_emails: "迷惑メールのアドレスを照合する場合、あいまい一致を許可する文字数の差。"
+    max_new_accounts_per_registration_ip: "この IP でアクセスする信頼レベル 0 のアカウントが (n) 個存在する場合 (さらにこれらがスタッフメンバーや TL2 以上のメンバーでない場合)、この IP から新たに登録できないようにします。制限を無効にするには 0 に設定します。"
     min_ban_entries_for_roll_up: "ロールアップボタンをクリックする際に少なくとも (N) 個のエントリーがある場合、新しいサブネット禁止エントリーを作成します。"
     max_age_unmatched_emails: "(N) 日間一致しなかったスクリーン対象メールアドレスを削除します。"
     max_age_unmatched_ips: "(N) 日間一致しなかったスクリーン対象 IP アドレスを削除します。"
@@ -1713,6 +1807,7 @@ ja:
     max_emails_per_day_per_user: "1 日にユーザーに送信されるメールの最大数。0 を設定すると、制限が無効になります"
     enable_staged_users: "受信メールを処理するときにステージングユーザーを自動的に作成する。"
     maximum_staged_users_per_email: "受信メールを処理するときに作成されるステージングユーザーの最大数。"
+    maximum_recipients_per_new_group_email: "受信者が多すぎるメールの受信をブロックします。"
     auto_generated_allowlist: "自動生成コンテンツがチェックされないメールアドレスのリスト。例: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "自動生成として識別された受信メールをブロックする。"
     ignore_by_title: "件名に基づいて受信メールを無視する。"
@@ -1732,6 +1827,7 @@ ja:
     raw_email_max_length: "受信メールに格納される必要のある文字数。"
     raw_rejected_email_max_length: "拒否された受信メールに格納される必要のある文字数。"
     delete_rejected_email_after_days: "(n) 日間経過した拒否メールを削除する。"
+    require_change_email_confirmation: "スタッフ以外のユーザーは、古いメールアドレスを変更する前にそれを確認する必要があります。スタッフユーザーには適用されません。常に古いメールアドレスを確認する必要があります。"
     manual_polling_enabled: "メール返信用の API を使用してメールをプッシュする。"
     pop3_polling_enabled: "メール返信のために POP3 をポーリングします。"
     pop3_polling_ssl: "POP3 サーバーへ SSL 接続します (推奨)。"
@@ -1810,11 +1906,14 @@ ja:
     enable_mobile_theme: "モバイルデバイスにモバイル対応のテーマを使用します (デスクトップサイトに切り替え可能)。完全にレスポンシブなカスタムスタイルシートを使用する場合はこの設定を無効にしてください。"
     dominating_topic_minimum_percent: "ユーザーがトピックを過度に占領していることを通知する、トピック内のユーザーの投稿率。"
     disable_avatar_education_message: "アバターを変更するためのチュートリアルメッセージを無効にする。"
+    pm_warn_user_last_seen_months_ago: "新しい PM を作成するときに、対象の受信者 n か月以上もアクセスしていないことをユーザーに警告します。"
     suppress_uncategorized_badge: "トピックリストに未分類のトピックのバッジを表示しない"
     header_dropdown_category_count: "ヘッダードロップダウンメニューに表示できるカテゴリ数。"
     permalink_normalizations: "パーマリンクを照合する前に、次の正規表現を適用する。例: /(topic.*)\\?.*/\\1 はトピックルートからクエリ文字列を削除します。形式は正規表現+文字列です。キャプチャにアクセスするには \\1 などを使用します"
     global_notice: "すべての訪問者に緊急で非常の閉じられないグローバルバナー通知を表示する。空白にすると非表示になります (HTML 可)。"
     disable_system_edit_notifications: "download_remote_images_to_local' が有効である場合、システムユーザーによる編集の通知を無効にします。"
+    disable_category_edit_notifications: "トピックのカテゴリ編集通知を無効にします。"
+    disable_tags_edit_notifications: "トピックのタグ編集通知を無効にします。"
     notification_consolidation_threshold: "複数の通知が 1 つの通知に統合される前に受信した「いいね！」またはメンバーシップリクエストの通知の数。"
     likes_notification_consolidation_window_mins: "しきい値に達すると「いいね！」された複数の通知が 1 つの通知に統合される期間 (分)。しきい値は `SiteSetting.notification_consolidation_threshold` で構成できます。"
     automatically_unpin_topics: "ユーザーが最後に達したら、自動的にトピックの固定表示を解除する。"
@@ -1834,9 +1933,11 @@ ja:
     display_name_on_posts: "投稿に、@username に加えてユーザーのフルネームを表示します。"
     show_time_gap_days: "2 つの投稿の作成日の間が指定された日数以上の場合、トピックに時間の差を表示します。"
     short_progress_text_threshold: "トピック内の投稿数が指定された数字を超えると、プログレスバーに現在の投稿番号のみを表示します。プログレスバーの幅を変更すると、この値を変更する必要がある場合があります。"
+    default_code_lang: "コードブロックに適用されるデフォルトのプログラミング言語シンタックスハイライト (auto、nohighlight、ruby、python など)。この値は、`highlighted languages` サイト設定にも含まれている必要があります。"
     warn_reviving_old_topic_age: "最後の返信が指定された日数より古いトピックに返信し始めると、警告を表示します。0 に設定すると無効になります。"
     autohighlight_all_code: "明示的に言語を指定しなくても、すべての整形済みのコードブロックにコードハイライトを強制的に適用します。"
     highlighted_languages: "シンタックスハイライトルールが含まれる。(警告: 多くの言語を含めすぎると、パフォーマンスに影響を与える可能性があります) デモは、<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> をご覧ください。"
+    show_copy_button_on_codeblocks: "コードブロックに、ブロックのコンテンツをユーザーのクリップボードにコピーするボタンを追加します。"
     embed_any_origin: "オリジンに関係なく、埋め込み可能なコンテンツを許可する。これは静的 HTML を使用するモバイルアプリに必要です。"
     embed_topics_list: "トピックリストの HTML 埋め込みをサポートする"
     embed_set_canonical_url: "埋め込みトピックの正規 URL を埋め込みコンテンツの URL に設定する。"
@@ -1853,6 +1954,12 @@ ja:
     delete_merged_stub_topics_after_days: "完全にマージされたスタブトピックを自動的に削除するまで待機する日数。0 に設定すると、スタブトピックは削除されません。"
     bootstrap_mode_min_users: "ブートストラップモードを無効にするために必要な最低ユーザー数 (0 に設定すると無効になります)"
     prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードできないようにする。"
+    secure_media: '非推奨: 代わりに secure_uploads を使用してください。Discourse 3.0 で削除されます。'
+    secure_uploads: 'すべてのアップロード (画像、動画、音声、テキスト、pdf、zip など) へのアクセスを制限する。“login required” が有効である場合、ログイン済みのユーザーのみがアップロードにアクセスできます。そうでない場合は、個人メッセージと非公開カテゴリのメディアアップロードのアクセスのみが制限されます。警告: この設定は複雑であるため、管理を十分に理解している必要があります。詳細については、<a target="_blank" href="https://meta.discourse.org/t/-/140017">メタに関するセキュリティで保護されたアップロードのトピック</a>をご覧ください。'
+    secure_media_allow_embed_images_in_emails: "非推奨: secure_uploads_allow_embed_images_in_emails を使用してください。Discourse 3.0 で削除されます。"
+    secure_uploads_allow_embed_images_in_emails: "通常はメールで編集されるセキュリティで保護された画像のサイズが 'secure uploads max email embed image size kb' 設定よりも小さい場合、その埋め込みを許可します。"
+    secure_media_max_email_embed_image_size_kb: "非推奨: secure_uploads_max_email_embed_image_size_kb を使用してください。Discourse 3.0 で削除されます。"
+    secure_uploads_max_email_embed_image_size_kb: "'secure uploads allow embed in emails' 設定が有効である場合にメールに埋め込まれるセキュリティで保護された画像のサイズのカットオフ。その設定が有効でない場合、この設定の効果はありません。"
     slug_generation_method: "スラッグ生成方法を選択します。'encode' はパーセントエンコード文字列を生成します。'none'は、スラッグを無効にします。"
     enable_emoji: "絵文字を有効にする"
     enable_emoji_shortcuts: ":) :p :( などの一般的なスマイリーテキストは絵文字に変換されます"
@@ -1871,6 +1978,7 @@ ja:
     max_allowed_message_recipients: "メッセージに許可される最大受信者数。"
     watched_words_regular_expressions: "ウォッチ語は正規表現です。"
     enable_diffhtml_preview: "完全な再レンダリングの代わりに diffHTML を使ってプレビューを同期する実験的機能"
+    enable_fast_edit: "投稿文の一部の選択範囲をインラインで編集できるようにします。"
     old_post_notice_days: "投稿の通知が古くなるまでの日数"
     new_user_notice_tl: "新しいユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
     returning_user_notice_tl: "リピートユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
@@ -1929,6 +2037,7 @@ ja:
     tags_sort_alphabetically: "タグをアルファベット順に表示する。デフォルトでは人気順に表示されます。"
     tags_listed_by_group: "<a href='%{base_path}/tags' target='_blank'>タグページ</a>にタググループごとにタグをリストする。"
     tag_style: "タグバッジの視覚的スタイル"
+    pm_tags_allowed_for_groups: "グループ内のメンバーが任意の個人メッセージにタグ付けすることを許可する"
     min_trust_level_to_tag_topics: "トピックのタグ付けに必要な最低信頼レベル"
     suppress_overlapping_tags_in_list: "タグがトピックタイトルの語に完全に一致する場合、タグを表示しない"
     remove_muted_tags_from_latest: "ミュートされたタグのみがタグ付けされたトピックを最新のトピックリストに表示しない。"
@@ -1942,6 +2051,10 @@ ja:
     push_notifications_icon: "通知コーナーに表示されるバッジアイコン。透明度が適用された 96x96 のモノクロ PNG が推奨されます。"
     base_font: "サイトのほとんどのテキストに使用されるベースフォント。テーマは `--font-family` CSS カスタムプロパティを介してオーバーライドできます。"
     heading_font: "サイトの見出しに使用されるフォント。テーマは `--heading-font-family` CSS カスタムプロパティを介してオーバーライドできます。"
+    enable_sitemap: "サイトのサイトマップを生成し、robots.txt ファイルに含めます。"
+    sitemap_page_size: "各サイトマップページに含める URL の数。最大 50,000"
+    enable_user_status: "(実験的) ユーザーがカスタムステータスメッセージ (絵文字 + 説明) を設定できるようにします。"
+    enable_onboarding_popups: "(実験的) 重要な機能をユーザーに説明する教育用ポップアップを有効にする"
     short_title: "短いタイトルはユーザーのホーム画面、ランチャー、またはスペースが限られている場所に使用されます。12 文字に制限する必要があります。"
     dashboard_hidden_reports: "ダッシュボードから指定されたレポートを非表示にすることを許可する。"
     dashboard_visible_tabs: "表示するダッシュボードのタブを選択します。"
@@ -1953,9 +2066,18 @@ ja:
     share_quote_visibility: "引用の共有ボタンをいつ表示するかを決定する: 表示しない、匿名ユーザーのみ、またはすべてのユーザー。 "
     create_revision_on_bulk_topic_moves: "トピックが新しいカテゴリに一括して移動されたときに、最初の投稿のリビジョンを作成する。"
     allow_changing_staged_user_tracking: "ステージングユーザーのカテゴリとタグの通知設定を管理者ユーザーが変更することを許可する。"
+    use_email_for_username_and_name_suggestions: "メールアドレスの最初の部分をユーザー名と名前の提案に使用します。これにより、完全なメールアドレスが簡単に推測できるようになることに注意してください (大半の人が `gmail.com` などの一般的なサービスを使用しているため)。"
+    use_name_for_username_suggestions: "ユーザー名を提案する際に、ユーザーの氏名を使用します。"
+    suggest_weekends_in_date_pickers: "日付ピッカーの候補に週末 (土曜日と日曜日) を含めます (月曜日から金曜日の平日にのみ Discourse を使用する場合は、これを無効にします)。"
+    splash_screen: "サイトアセットの読み込み中に一時的なローディング画面を表示します"
+    default_sidebar_categories: "選択されたカテゴリは、デフォルトでサイドバーのカテゴリセクションに表示されます。"
+    default_sidebar_tags: "選択されたタグは、デフォルトでサイドバーのタグセクションに表示されます。"
+    enable_new_user_profile_nav_groups: "実験的: 選択されたグループのユーザーは、新しいユーザープロファイルナビゲーションメニューに表示されます。"
     errors:
+      invalid_css_color: "無効な色です。色名または 16 進数値を入力してください。"
       invalid_email: "無効なメールアドレスです。"
       invalid_username: "そのユーザー名のユーザは存在しません。"
+      valid_username: "そのユーザー名のユーザーが存在します。"
       invalid_group: "その名前のグループは存在しません。"
       invalid_integer_min_max: "値は %{min} から %{max} の間である必要があります。"
       invalid_integer_min: "値は %{min} 以上である必要があります。"
@@ -1970,6 +2092,7 @@ ja:
       invalid_json: "無効な JSON。"
       invalid_reply_by_email_address: "値に '%{reply_key}' を含める必要があり、通知メールとは異なる必要があります。"
       invalid_alternative_reply_by_email_addresses: "すべての値には '%{reply_key}' が含まれている必要があり、通知メールとは異なるものである必要があります。"
+      invalid_domain_hostname: "* または ? 文字は使用できません。"
       pop3_polling_host_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling host' を設定する必要があります。"
       pop3_polling_username_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling username' を設定する必要があります。"
       pop3_polling_password_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling password' を設定する必要があります。"
@@ -1977,7 +2100,9 @@ ja:
       reply_by_email_address_is_empty: "メールによる返信を有効にする前に、'reply by email address' を設定する必要があります。"
       email_polling_disabled: "メールによる返信を有効にする前に、手動または POP3 ポーリングのいずれかを有効にする必要があります。"
       user_locale_not_enabled: "この設定を有効にする前に 'allow user locale' を有効にする必要があります。"
+      personal_message_enabled_groups_invalid: "この設定には、少なくとも 1 つのグループを指定する必要があります。スタッフ以外の人が PM を送信できないようにするには、スタッフグループを選択してください。"
       invalid_regex: "正規表現が無効であるか、許可されていません。"
+      invalid_regex_with_message: "正規表現 '%{regex}' にエラーがあります: %{message}"
       email_editable_enabled: "この設定を有効にする前に 'email editable' を無効にする必要があります。"
       staged_users_disabled: "この設定を有効にする前に 'staged users' を有効にする必要があります。"
       reply_by_email_disabled: "この設定を有効にする前に 'reply by email' を有効にする必要があります。"
@@ -1998,6 +2123,12 @@ ja:
         leading_trailing_slash: "正規表現の開始と終了にスラッシュを使用してはいけません。"
       unicode_usernames_avatars: "内部システムのアバターは Unicode のユーザー名をサポートしていません。"
       list_value_count: "リストには正確に %{count} この値が含まれている必要があります。"
+      markdown_linkify_tlds: "値 '*' を含めることはできません。"
+      google_oauth2_hd_groups: "この設定を有効にする前に、すべての 'google oauth2 hd' 設定を構成する必要があります。"
+      search_tokenize_chinese_enabled: "この設定を有効にする前に 'search_tokenize_chinese' を無効にする必要があります。"
+      search_tokenize_japanese_enabled: "この設定を有効にする前に 'search_tokenize_japanese' を無効にする必要があります。"
+      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "2FA が適用されている場合、DiscourseConnect を有効にできません。"
+      delete_rejected_email_after_days: "この設定は delete_email_logs_after_days 設定より小さいか %{max} より大きく設定することはできません。"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2107,6 +2238,7 @@ ja:
     reset_not_allowed_from_ip_address: "その IP アドレスからパスワードリセットをリクエストできません。"
     suspended: "%{date} までログインできません。"
     suspended_with_reason: "%{date} までアカウントが凍結されました: %{reason}"
+    suspended_with_reason_forever: "アカウントが凍結されました: %{reason}"
     errors: "%{errors}"
     not_available: "利用できません。%{suggestion}を試しますか？"
     something_already_taken: "エラーが発生しました。ユーザー名またはメールアドレスがすでに登録されている可能性があります。パスワードリセットを行ってください。"
@@ -2139,6 +2271,15 @@ ja:
     second_factor_toggle:
       totp: "代わりに認証アプリまたはセキュリティキーを使用してください"
       backup_code: "代わりにバックアップコードを使用する"
+  second_factor_auth:
+    challenge_not_found: "現在のセッションで 2FA チャレンジが見つかりませんでした。"
+    challenge_expired: "2FA チャレンジが実施されてから長い時間が経過したため、有効ではなくなりました。もう一度お試しください。"
+    challenge_not_completed: "この操作を実行するための 2FA チャレンジを完了していません。2FA チャレンジを完了してから、もう一度お試しください。"
+    actions:
+      grant_admin:
+        description: "追加のセキュリティ対策として、%{username} に管理者アクセスを付与する前に、2FA を確認する必要があります。"
+      discourse_connect_provider:
+        description: "%{hostname} が 2FA の確認を要求しています。2FA を確認すると、サイトにリダイレクトされます。"
   admin:
     email:
       sent_test: "送信完了！"
@@ -2302,17 +2443,63 @@ ja:
   test_mailer:
     title: "テストメーラー"
     subject_template: "[%{email_prefix}] メール配信可能性テスト"
+    text_body_template: |
+      これは、以下から送信されたテストメールです
+
+      [**%{base_url}**][0]
+
+      このメール配信テストを正しく受信できたでしょうか
+
+      [メール配信構成を確認するためのチェックリスト][1]をご覧ください。
+
+      よろしくお願いいたします。
+
+      [Discourse](https://www.discourse.org) の友人より
+
+      [0]: %{base_url}
+      [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839
   new_version_mailer:
     title: "新しいバージョンメーラー"
     subject_template: "[%{email_prefix}] 新しい Discourse バージョン、更新が利用可能になりました"
+    text_body_template: |
+      やったー！新バージョンの [Discourse](https://www.discourse.org) が公開されました！
+
+      あなたのバージョン: %{installed_version}
+      新しいバージョン: **%{new_version}**
+
+      - **[ワンクリックのブラウザアップデート](%{base_url}/admin/upgrade)**で簡単にアップグレード
+
+      - 新機能については、[リリースノート](https://meta.discourse.org/tag/release-notes)か[生の GitHub 変更ログ](https://github.com/discourse/discourse/commits/main)をご覧ください。
+
+      - Discourse のニュース、ディスカッション、およびサポートは、[meta.discourse.org](https://meta.discourse.org)にアクセス！
   new_version_mailer_with_notes:
     title: "注意付きの新しいバージョンメーラー"
     subject_template: "[%{email_prefix}] 更新が利用可能になりました"
+    text_body_template: |
+      やったー！新バージョンの [Discourse](https://www.discourse.org) が公開されました！
+
+      あなたのバージョン: %{installed_version}
+      新しいバージョン: **%{new_version}**
+
+      - **[ワンクリックのブラウザアップデート](%{base_url}/admin/upgrade)**で簡単にアップグレード
+
+      - 新機能については、[リリースノート](https://meta.discourse.org/tag/release-notes)か[生の GitHub 変更ログ](https://github.com/discourse/discourse/commits/main)をご覧ください。
+
+      - Discourse のニュース、ディスカッション、およびサポートは、[meta.discourse.org](https://meta.discourse.org)にアクセス！
+
+      ### リリースノート
+
+      %{notes}
   flag_reasons:
     off_topic: "あなたの投稿は「話題に関係ない」として通報されました。コミュニティはあなたの投稿がタイトルと最初の投稿で定義されているトピックにふさわしくないと判断しました。"
     inappropriate: "あなたの投稿は**不適切**として通報されました。コミュニティは投稿が攻撃的、虐待的、または[コミュニティガイドライン](%{base_path}/guidelines)に違反すると感じています。"
     spam: "あなたの投稿は「迷惑」として通報されました。コミュニティはあなたの投稿に営利目的、宣伝目的の性質があり、トピックに意図される有用性または関連性がないと判断しました。"
     notify_moderators: "あなたの投稿は「モデレーターの注意要」として通報されました。コミュニティはあなたの投稿にスタッフメンバーによる手動介入が必要であると判断しました。"
+    responder:
+      off_topic: "投稿は**話題に関係ない**として通報されました。コミュニティはあなたの投稿がタイトルと最初の投稿で定義されているトピックにふさわしくないと判断しました。"
+      inappropriate: "投稿は**不適切**として通報されました。コミュニティは投稿が攻撃的、虐待的、または[コミュニティガイドライン](%{base_path}/guidelines)に違反すると感じています。"
+      spam: "投稿は**迷惑**として通報されました。コミュニティはあなたの投稿に営利目的、宣伝目的の性質があり、トピックに意図される有用性または関連性がないと判断しました。"
+      notify_moderators: "投稿は**モデレーターの注意要**として通報されました。コミュニティはあなたの投稿にスタッフメンバーによる手動介入が必要であると判断しました。"
   flags_dispositions:
     agreed: "ご連絡いただきありがとうございます。問題があることを認め、現在調査しています。"
     agreed_and_deleted: "ご連絡いただきありがとうございます。問題があることを認め、投稿を削除しました。"
@@ -2322,6 +2509,10 @@ ja:
   temporarily_closed_due_to_flags:
     other: "このトピックは、大量のコミュニティ通報が寄せられたため、一時的に %{count} 時間以上クローズされています。"
   system_messages:
+    reviewables_reminder:
+      subject_template: "レビューキューにレビューが必要な項目があります"
+      text_body_template:
+        other: "%{count} 時間前に %{mentions} 項目が送信されました。[レビューしてください](%{base_url}/review)。"
     private_topic_title: "トピック #%{id}"
     contents_hidden: "コンテンツを見るには投稿にアクセスしてください。"
     post_hidden:
@@ -2401,6 +2592,29 @@ ja:
         ```
 
         詳細については、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    flags_agreed_and_post_deleted_for_responders:
+      title: "スタッフにより、通報された投稿から返信が削除されました"
+      subject_template: "スタッフにより、通報された投稿から返信が削除されました"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。あなたが返信した[投稿](%{base_url}%{url})が削除されたことをお知らせします。
+
+        %{flag_reason}
+
+        この投稿はコミュニティによって通報され、スタッフメンバーが削除することを選択しました。
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        返信先
+
+        ``` markdown
+        %{flagged_post_response_raw_content}
+        ```
+
+        削除の理由に関する詳細については、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
     usage_tips:
       text_body_template: |
         新規ユーザーとして開始するための簡単なヒントについては、[こちらのブログ記事をご覧ください](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
@@ -2452,24 +2666,72 @@ ja:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "信頼レベルの昇格おめでとうございます！"
+      text_body_template: |
+        あなたの[信頼レベル](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)をもう 1 つ昇格しました！
+
+        信頼レベル 2 に達したということは、このコミュニティのメンバーとして見なされるのに十分な閲覧と積極的な参加を行ったということです。
+
+        経験豊富なユーザーとして、[便利なヒントとコツ](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)が役に立つことと思います。
+
+        ぜひ参加し続けてください。あなたの投稿を楽しみにしています。
     backup_succeeded:
       title: "バックアップに成功しました"
       subject_template: "バックアップは正常に完了しました"
+      text_body_template: |
+        バックアップに成功しました。
+
+        [管理者 > バックアップセクション](%{base_url}/admin/backups)にアクセスして、新しいバックアップをダウンロードしてください。
+
+        こちらはログです。
+
+        %{logs}
     backup_failed:
       title: "バックアップに失敗しました"
       subject_template: "バックアップに失敗しました"
+      text_body_template: |
+        バックアップに失敗しました。
+
+        こちらがログです。
+
+        %{logs}
     restore_succeeded:
       title: "復元に成功しました"
       subject_template: "復元は正常に完了しました"
+      text_body_template: |
+        復元に成功しました。
+
+        こちらがログです。
+
+        %{logs}
     restore_failed:
       title: "復元に失敗しました"
       subject_template: "復元に失敗しました"
+      text_body_template: |
+        復元に失敗しました。
+
+        こちらがログです。
+
+        %{logs}
     bulk_invite_succeeded:
       title: "一括招待に成功しました"
       subject_template: "ユーザーの一括招待に成功しました"
+      text_body_template: |
+        あなたの一括ユーザー招待ファイルは処理されました。招待を %{sent} 通メール送信し、%{skipped} 通をスキップし、%{warnings} 件の警告が発生しました。
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "一括招待に失敗しました"
       subject_template: "ユーザーの一括招待中にエラーが発生しました"
+      text_body_template: |
+        あなたの一括ユーザー招待ファイルは処理されました。招待を %{sent} 通メール送信し、%{skipped} 通をスキップし、%{warnings} 件の警告と %{failed} 個のエラーが発生しました。
+
+        こちらがログです。
+
+        ``` text
+        %{logs}
+        ```
     user_added_to_group_as_owner:
       title: "オーナーとしてグループに追加しました"
       subject_template: "%{group_name} グループのオーナーとして追加されました"
@@ -2689,6 +2951,15 @@ ja:
 
         要約メールに返信したため、受領されていません。
 
+        これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
+    email_reject_too_many_recipients:
+      title: "受信者が多すぎるメールを拒否"
+      subject_template: "%{email_prefix} メールの問題 -- 受信者が多すぎます"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
+
+        %{max_recipients_count} 人以上にメールを送信しようとしたため、システムによって自動的に迷惑メールとしてタグ付けされました。
+
         これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_error_notification:
       title: "メールエラー通知"
@@ -2838,6 +3109,7 @@ ja:
   subject_re: "Re: "
   subject_pm: "[PM] "
   email_from: "%{site_name} 経由の %{user_name}"
+  email_from_without_site: "%{group_name}"
   user_notifications:
     previous_discussion: "以前の返信"
     reached_limit:
@@ -2855,6 +3127,8 @@ ja:
     reply_above_line: "## このラインより上に返信を入力してください。 ##"
     posted_by: "%{post_date} に %{username} が投稿"
     pm_participants: "参加者: %{participants}"
+    more_pm_participants:
+      other: "%{participants}、他 %{count} 人"
     invited_group_to_private_message_body: |
       %{username} が @%{group_name} をメッセージに招待しました
 
@@ -3011,6 +3285,7 @@ ja:
 
         %{respond_instructions}
     user_group_mentioned_pm:
+      title: "ユーザーグループが PM をメンションしました"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3021,6 +3296,7 @@ ja:
 
         %{respond_instructions}
     user_group_mentioned_pm_group:
+      title: "ユーザーグループが PM をメンションしました"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3079,6 +3355,10 @@ ja:
     account_suspended_forever:
       title: "アカウントが凍結されました"
       subject_template: "[%{email_prefix}] あなたのアカウントは凍結されました"
+      text_body_template: |
+        あなたはフォーラムから凍結されました。
+
+        理由 - %{reason}
     account_silenced:
       title: "アカウントが投稿禁止にされました"
       subject_template: "[%{email_prefix}] あなたのアカウントは投稿禁止にされました"
@@ -3089,6 +3369,10 @@ ja:
     account_silenced_forever:
       title: "アカウントが投稿禁止にされました"
       subject_template: "[%{email_prefix}] あなたのアカウントは投稿禁止にされました"
+      text_body_template: |
+        あなたはフォーラムから投稿禁止にされました。
+
+        理由 - %{reason}
     account_exists:
       title: "アカウントはすでに存在します"
       subject_template: "[%{email_prefix}] アカウントはすでに存在します"
@@ -3270,6 +3554,18 @@ ja:
     suspicious_login:
       title: "新しいログインのアラート"
       subject_template: "[%{site_name}] %{location} からの新しいログイン"
+      text_body_template: |
+        こんにちは
+
+        通常使用されていないデバイスまたは場所からのログインがありました。これはあなたですか？
+
+         - 場所: %{location} (%{client_ip})
+         - ブラウザ: %{browser}
+         - デバイス: %{device} – %{os}
+
+        これがあなたなら、問題ありません！ほかに必要な操作はありません。
+
+        これがあなたでないなら、[既存のセッションを確認](%{base_url}/my/preferences/security)し、パスワードを変更することを検討してください。
     post_approved:
       title: "あなたの投稿は承認されました"
       subject_template: "[%{site_name}] あなたの投稿は承認されました"
@@ -3307,16 +3603,29 @@ ja:
     store_failure: "ユーザー #%{user_id} のアップロード #%{upload_id} の保存に失敗しました。"
     file_missing: "アップロードするファイルを指定する必要があります。"
     empty: "指定されたファイルは空です。"
+    failed: "アップロードに失敗しました。もう一度お試しください。"
     png_to_jpg_conversion_failure_message: "PNG から JPG への変換中にエラーが発生しました。"
     optimize_failure_message: "アップロードされた画像を最適化中にエラーが発生しました。"
+    download_failure: "外部プロバイダーからのファイルのダウンロードに失敗しました。"
+    size_mismatch_failure: "S3 にアップロードされたファイルのサイズが、外部アップロードスタブの意図したサイズに一致しませんでした。%{additional_detail}"
+    create_multipart_failure: "外部ストアでのマルチパートアップロードの作成に失敗しました。"
+    abort_multipart_failure: "外部ストアでのマルチパートアップロードの中止に失敗しました。"
+    complete_multipart_failure: "外部ストアでのマルチパートアップロードを完了できませんでした。"
+    external_upload_not_found: "アップロードが外部ストアで見つかりませんでした。%{additional_detail}"
+    checksum_mismatch_failure: "アップロードしたファイルのチェックサムが一致しません。アップロード時にファイルのコンテンツが変更されている可能性があります。もう一度お試しください。"
+    cannot_promote_failure: "アップロードを完了できません。すでに完了しているか、以前に失敗した可能性があります。"
+    size_zero_failure: "問題が発生したようです。アップロードしようとしているファイルは 0 バイトです。もう一度お試しください。"
     attachments:
       too_large: "アップロードしようとしているファイルが大きすぎます (最大サイズは %{max_size_kb} KB です)。"
+      too_large_humanized: "アップロードしようとしているファイルが大きすぎます (最大サイズは %{max_size} です)。"
     images:
       too_large: "アップロードしようとしている画像が大きすぎます (最大サイズは %{max_size_kb} KB です)。サイズを変更してもう一度お試しください。"
+      too_large_humanized: "アップロードしようとしている画像が大きすぎます (最大サイズは %{max_size} です)。サイズを変更してもう一度お試しください。"
       larger_than_x_megapixels: "アップロードしようとしている画像が大きすぎます (最大サイズは %{max_image_megapixels} メガピクセルです)。サイズを変更してもう一度お試しください。"
       size_not_found: "画像のサイズを判定できませんでした。画像が破損している可能性があります。"
     placeholders:
       too_large: "(%{max_size_kb}KB を超える画像)"
+      too_large_humanized: "(%{max_size} を超える画像)"
   avatar:
     missing: "そのメールアドレスに関連付けられたアバターが見つかりません。もう一度アップロードしてください。"
   flag_reason:
@@ -3361,6 +3670,12 @@ ja:
     dark_rose: "ダークローズ"
     wcag: "WCAG ライト"
     wcag_theme_name: "WCAG ライト"
+    dracula: "Dracula"
+    dracula_theme_name: "Dracula"
+    solarized_light: "Solarized ライト"
+    solarized_light_theme_name: "Solarized ライト"
+    solarized_dark: "Solarized ダーク"
+    solarized_dark_theme_name: "Solarized ダーク"
     wcag_dark: "WCAG ダーク"
     wcag_dark_theme_name: "WCAG ダーク"
     default_theme_name: "デフォルト"
@@ -3992,6 +4307,7 @@ ja:
       invalid_token: "無効なトークンです。"
     email_input: "管理者メール"
     submit_button: "メールを送信"
+    safe_mode: "セーフモード: ログイン時にすべてのテーマ/プラグインを無効にする"
   performance_report:
     initial_post_raw: このトピックには、サイトの毎日のパフォーマンスレポートが含まれています。
     initial_topic_title: ウェブサイトパフォーマンスレポート
@@ -4010,6 +4326,10 @@ ja:
         other: '"%{tag_name}" は次のカテゴリに制限されています: %{category_names}'
       synonym: '同義語は許可されていません。代わりに "%{tag_name}" を使用してください。'
       has_synonyms: '"%{tag_name}" は同義語が含まれるため使用できません。'
+      restricted_tags_cannot_be_used_in_category:
+        other: '次のタグは "%{category}" カテゴリで使用できません: %{tags}。削除してください。'
+      category_does_not_allow_tags:
+        other: '"%{category}" カテゴリでは、次のタグを使用できません: "%{tags}"。削除してください。'
     required_tags_from_group:
       other: "少なくとも %{count} 個の %{tag_group_name} タグを含める必要があります。このグループのタグ: %{tags}。"
     invalid_target_tag: "同義語の同義語にすることはできません"
@@ -4020,6 +4340,7 @@ ja:
     register:
       button: "登録"
       title: "管理者アカウントの登録"
+      help: "まず、新しいアカウントを登録してください。"
       no_emails: "残念ながら、セットアップ中に管理者メールが定義されなかったため、構成を完了するのが困難です。構成ファイルに開発者のメールアドレスを追加するか、<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>コンソールから管理者アカウントを作成</a>してください。"
     confirm_email:
       title: "メールの確認"
@@ -4029,6 +4350,8 @@ ja:
       message: "<p><b>%{email}</b> にアクティベーションメールを再送信しました"
   safe_mode:
     title: "セーフモードを開始"
+    description: "セーフモードでは、プラグインやテーマを読み込まずにサイトをテストすることができます。"
+    no_themes: "テーマとテーマのコンポーネントを無効にする"
     no_unofficial_plugins: "非公式のプラグインを無効にする"
     no_plugins: "すべてのプラグインを無効にする"
     enter: "セーフモードを開始"
@@ -4037,24 +4360,40 @@ ja:
     title: "Discourse のセットアップ"
     step:
       introduction:
+        title: "コミュニティーについて教えてください"
         fields:
           title:
+            label: "コミュニティー名"
             placeholder: "純子のたまり場"
           site_description:
+            label: "コミュニティーについて一文で説明してください"
             placeholder: "純子と純子の仲間がワイワイする場所"
+          contact_email:
+            label: "連絡先"
+            placeholder: "example@user.com"
+            description: "このコミュニティの責任者またはグループ。重要な更新に使用され、緊急連絡先として<a href='%{base_path}/about' target='_blank'>あなたの紹介ページ</a>に表示されます。"
           default_locale:
             label: "言語"
       privacy:
+        title: "メンバーのエクスペリエンス"
         fields:
           login_required:
             placeholder: "非公開"
-            extra_description: "ログインユーザーのみがこのコミュニティにアクセスできる"
+            extra_description: "ログインユーザーのみがこのコミュニティーにアクセスできる"
+          invite_only:
+            placeholder: "招待のみ"
+            extra_description: "ユーザーは信頼できるユーザーまたはスタッフから招待される必要がありますが、そうでない場合は、ユーザー自身が登録できます。"
           must_approve_users:
             placeholder: "要承認"
+            extra_description: "ユーザーはスタッフの承認が必要です"
       ready:
         title: "あなたの Discourse の準備が整いました！"
+        description: "以上です！コミュニティを設定するための基本を完了しました。後は、コミュニティにアクセスして見て回り、ウェルカムトピックを書いて招待状を送信しましょう！<br><br>お楽しみください！"
       styling:
+        title: "外観"
         fields:
+          color_scheme:
+            label: "色スキーム"
           body_font:
             label: "本文のフォント"
           heading_font:
@@ -4062,6 +4401,7 @@ ja:
           styling_preview:
             label: "プレビュー"
           homepage_style:
+            label: "ホームページのスタイル"
             choices:
               latest:
                 label: "最新のトピック"
@@ -4071,33 +4411,50 @@ ja:
                 label: "注目のトピックのカテゴリ"
               categories_and_latest_topics:
                 label: "カテゴリと最新トピック"
+              categories_and_latest_topics_created_date:
+                label: "カテゴリと最新のトピック (トピック作成日順)"
               categories_and_top_topics:
                 label: "カテゴリと人気トピック"
+              categories_boxes:
+                label: "カテゴリボックス"
+              categories_boxes_with_topics:
+                label: "トピック付きのカテゴリボックス"
+              subcategories_with_featured_topics:
+                label: "注目のトピックを含むサブカテゴリ"
       branding:
+        title: "ロゴのカスタマイズ"
         fields:
           logo:
             label: "プライマリーロゴ"
+            description: "サイトの左上にあるロゴです。高さ 120、縦横比 3:1を超える広幅の長方形の画像を使用してください。"
           logo_small:
             label: "正方形のロゴ"
+            description: "正方形バージョンのロゴ。下にスクロールしたときに左上に、またソーシャルプラットフォームで共有したときに表示されます。512x512 以上のサイズが最適です。"
           favicon:
             label: "ブラウザアイコン"
+            description: "ウェブブラウザでサイトを表現するために使用される、小さなサイズで見栄えのするアイコン。PNG または JPG が推奨されます。デフォルトでは正方形のロゴが使用されます。"
           large_icon:
             label: "大きなアイコン"
+            description: "モバイルデバイスでサイトを表現するために使用される、大きなサイズで見栄えのするアイコン。512x512 より大きいサイズが最適です。デフォルトでは正方形のロゴが使用されます。"
       corporate:
+        title: "あなたの組織"
         fields:
           company_name:
             label: "会社名"
             placeholder: "組織の例"
+            description: "利用規約ページに使用されます。会社が存在しない場合はスキップしてください。"
           governing_law:
             label: "準拠法"
             placeholder: "カリフォルニア州法"
+            description: "利用規約ページに使用されます。会社が存在しない場合はスキップしてください。"
           contact_url:
             label: "ウェブページ"
             placeholder: "https://www.example.com/contact-us"
-            description: "あなたまたは組織の一般的な連絡先ウェブページ。<a href='%{base_path}/about' target='_blank'>あなたの自己紹介ページ</a>に表示されます。"
+            description: "あなたまたは組織の代表連絡先ウェブページ。<a href='%{base_path}/about' target='_blank'>あなたの自己紹介ページ</a>に表示されます。"
           city_for_disputes:
             label: "紛争都市"
             placeholder: "カリフォルニア州サンフランシスコ"
+            description: "利用規約ページに使用されます。会社が存在しない場合はスキップしてください。"
           site_contact:
             label: "自動メッセージ"
             description: "通報の警告やバックアップ完了の通知など、Discourse のすべての自動個人メッセージはこのユーザーから送信されます。"
@@ -4155,8 +4512,24 @@ ja:
     missing_version: "バージョンパラメーターを指定する必要があります"
     conflict: "更新の競合があるため、それを行えませんでした。"
     reasons:
+      post_count: "すべてのユーザーの最初の数件の投稿はスタッフによって承認される必要があります。%{link} をご覧ください。"
+      trust_level: "信頼レベルが低いユーザーはその返信をスタッフが承認する必要があります。%{link} をご覧ください。"
+      new_topics_unless_trust_level: "信頼レベルが低いユーザーはそのトピックをスタッフが承認する必要があります。%{link} をご覧ください。"
+      fast_typer: "新規ユーザーは、最初の投稿を、ボットまたは迷惑行為者と疑われる速さで入力しました。%{link} をご覧ください。"
+      auto_silence_regex: "最初の投稿が %{link} 設定に一致する新規ユーザー。"
+      watched_word: "この投稿にはウォッチ語が含まれています。%{link} をご覧ください。"
+      staged: "ステージングユーザーの新しいトピックと投稿はスタッフによる承認が必要です。%{link} をご覧ください。"
+      category: "このカテゴリの投稿には、スタッフによる手動の承認が必要です。%{link} をご覧ください。"
+      must_approve_users: "すべての新しいユーザーは、スタッフによる承認が必要です。%{link} をご覧ください。"
+      invite_only: "すべての新規ユーザーは招待される必要があります。%{link} をご覧ください。"
       email_auth_res_enqueue: "このメールは DMARC チェックに失敗しました。これは誰からのものでもないようです。詳細については、生のメールヘッダーを確認してください。"
+      email_spam: "このメールは、%{link} に定義されているヘッダーによって、迷惑として通報されました。"
+      suspect_user: "この新規ユーザーは、トピックまたは投稿を一切読まずにプロフィール情報を入力しました。これは、迷惑行為者であることを強く示唆しています。%{link} をご覧ください。"
+      contains_media: "この投稿には埋め込みメディアが含まれています。%{link} をご覧ください。"
       queued_by_staff: "スタッフメンバーは、この投稿にレビューが必要だと考えています。それまで非表示のままになります。"
+      links:
+        watched_word: ウォッチ語のリスト
+        category: カテゴリ設定
     actions:
       agree:
         title: "合意…"
@@ -4240,6 +4613,8 @@ ja:
   notification_level:
     ignore_error: "そのユーザーを無視できません。"
     mute_error: "そのユーザーをミュートできません。"
+    error: "そのユーザーの通知レベルを変更できません。"
+    invalid_value: '"%{value}" は有効な通知レベルではありません。'
   discord:
     not_in_allowed_guild: "認証に失敗しました。許可された Discord ギルドのメンバーではありません。"
   old_keys_reminder:
@@ -4258,6 +4633,9 @@ ja:
     post_raw: "%{parent_url} のディスカッションを継続中です。\n\n前のディスカッション:\n\n%{previous_topics}"
     small_action_post_raw: "%{new_title} でディスカッションを続けます。"
   fallback_username: "ユーザー"
+  user_status:
+    errors:
+      ends_at_should_be_greater_than_set_at: "ends_at は set_at より大きい必要があります"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 7b9f1ab0ec..942d0c98f6 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -635,6 +635,7 @@ pl_PL:
               too_many: "Za długi opis akcji"
             base:
               invalid_url: "Adres URL zamiany jest nieprawidłowy"
+              invalid_tag_list: "Zastępcza lista tagów jest nieprawidłowa"
         sidebar_section_link:
           attributes:
             linkable_type:
@@ -647,6 +648,7 @@ pl_PL:
   staff_category_name: "Zespół"
   staff_category_description: "Ukryta kategoria dla rozmów zespołu. Tematy są widoczne tylko dla adminów i moderatorów."
   discourse_welcome_topic:
+    title: "Witamy w naszej społeczności!"
     body: |2
 
       Pierwszy paragraf tego przypiętego tematu będzie widoczny jako wiadomość powitalna dla wszystkich odwiedzających stronę główną. Jest bardzo ważny!
@@ -4532,6 +4534,7 @@ pl_PL:
     register:
       button: "Zarejestruj"
       title: "Zarejestrowano konto administratora"
+      help: "Zarejestruj nowe konto, aby rozpocząć."
       no_emails: "Niestety, podczas instalacji nie zdefiniowano żadnych e-maili administratora, więc finalizacja konfiguracji może być trudna. Dodaj adres e-mail programisty w pliku konfiguracyjnym lub <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>utwórz konto administratora z konsoli</a>."
     confirm_email:
       title: "Potwierdzenie przez email"
@@ -4627,6 +4630,7 @@ pl_PL:
             label: "Duża ikona"
             description: "Ikona używana do reprezentowania Twojej witryny na urządzeniach mobilnych, która dobrze wygląda w większych rozmiarach. Najlepiej, jeśli jest większa niż 512x512. Domyślnie używane jest logo kwadratowe."
       corporate:
+        title: "Twoja organizacja"
         fields:
           company_name:
             label: "Nazwa firmy"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index f81ef59e73..c9c99fddb2 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -128,6 +128,7 @@ pt_BR:
         unsubscribe_not_allowed: "Ocorre quando não é permitido cancelar a associação por e-mail para este(a) usuário(a)"
         email_not_allowed: "Acontece quando o endereço de e-mail não está na lista de permissões ou está na lista de proibições."
       unrecognized_error: "Erro desconhecido"
+    secure_uploads_placeholder: "Redigido: este site tem mídias seguras ativadas, acesse o tópico ou clique em Visualizar Mídias para exibir as mídias anexas."
     view_redacted_media: "Exibir mídias"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -197,6 +198,7 @@ pt_BR:
       page_publishing_requirements: "A publicação da página não pode ser ativada se houver mídias seguras ativadas."
       s3_backup_requires_s3_settings: "Você não pode usar o S3 como local de backup, a não ser que você tenha informado o \"%{setting_name}\"."
       s3_bucket_reused: "Você não pode usar o mesmo bucket para \"s3_upload_bucket\" e \"s3_backup_bucke\"'. Escolha um bucket diferente ou use um caminho diferente para cada bucket."
+      secure_uploads_requirements: "Envios S3 devem ser ativados antes dos envios seguros."
       share_quote_facebook_requirements: "É preciso definir uma id do app Facebook para permitir o compartilhamento de citação para Facebook."
       second_factor_cannot_enforce_with_socials: "Você não pode aplicar 2FA com entrada com contas de redes sociais ativada. Primeiro você deve desativar a entrada com conta via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Você não pode impor a 2FA se a autenticação local estiver desativada."
@@ -206,6 +208,8 @@ pt_BR:
       cors_origins_should_not_have_trailing_slash: "Você não deve adicionar a barra à direita (/) às origens CORS."
       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 incorreta de usuários(as) humanos(as)."
       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 desabilitar a remoção de metadados de imagem se 'a imagem de otimização de mídia do compositor habilitada' estiver habilitada. Desative a 'imagem de otimização de mídia do compositor habilitada' antes de desativar a remoção dos metadados da imagem."
+      twitter_summary_large_image_no_svg: "Imagens de resumo do Twitter usadas para metadados twitter:image não podem ser uma imagem .svg."
     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>'
     onebox:
       invalid_address: "Desculpe, não foi possível gerar uma pré-visualização desta página, porque o servidor \"%{hostname}\" não pôde ser encontrado. Em vez da pré-visualização, apenas um link aparecerá na sua postagem. :cry:"
@@ -241,6 +245,9 @@ pt_BR:
       invalid_access: "Você não tem permissão para visualizar o recurso solicitado."
     requires_groups: "O convite não foi salvo porque o tópico especificado está inacessível. Adicione um dos seguintes grupos: %{groups}."
     domain_not_allowed: "Seu e-mail não pode ser usado para resgatar este convite."
+    max_redemptions_allowed_one: "para convites por e-mail, deve ser 1."
+    redemption_count_less_than_max: "deve ser menor que %{max_redemptions_allowed}."
+    email_xor_domain: "Campos de e-mail e domínio não são permitidos ao mesmo tempo"
   bulk_invite:
     file_should_be_csv: "O arquivo atualizado deve ter o formato csv."
     max_rows: "Os primeiros %{max_bulk_invites} convites foram enviados. Tente dividir o arquivo em partes menores."
@@ -250,6 +257,7 @@ pt_BR:
     max_redemptions_limit: "deve estar entre 2 e %{max_limit}."
   topic_invite:
     failed_to_invite: "O(a) usuário(a) não pode ser convidado(a) para este tópico sem uma associação de grupo em um dos seguintes grupos: %{group_names}."
+    not_pm: "Você só pode convidar para mensagens privadas."
     user_exists: "Desculpe, este(a) usuário(a) já foi convidado(a). Você pode convidar um(a) usuário(a) para um tópico apenas uma vez."
     muted_topic: "Desculpe, este(a) usuário(a) silenciou este tópico."
     receiver_does_not_allow_pm: "Desculpe, esse usuário não permite que você envie mensagens privadas."
@@ -584,6 +592,7 @@ pt_BR:
               too_many: "Muitas palavras para esta ação"
             base:
               invalid_url: "A URL de substituição não é válida"
+              invalid_tag_list: "A lista de etiquetas de substituição é inválida"
         sidebar_section_link:
           attributes:
             linkable_type:
@@ -597,6 +606,7 @@ pt_BR:
   staff_category_name: "Equipe"
   staff_category_description: "Categoria particular para discussões da equipe. Tópicos só são visíveis para administradores(as) e moderadores(as)."
   discourse_welcome_topic:
+    title: "Boas-vindas à nossa comunidade!"
     body: |2
 
       O primeiro parágrafo deste tópico fixado será visto como uma mensagem de boas-vindas a todos(as) os(as) novos(as) visitantes em sua página inicial. É muito importante!
@@ -668,6 +678,7 @@ pt_BR:
       public_group_membership: "Você está entrando/saindo de grupos com frequência. Aguarde %{time_left} antes de tentar novamente."
       topics_per_day: "Você alcançou a quantidade máxima de novos tópicos permitidos por dia. Crie mais tópicos novos em %{time_left}."
       pms_per_day: "Você alcançou a quantidade máxima de mensagens novas permitidas por dia. Crie mais mensagens novas em %{time_left}."
+      create_like: "Uau! Você tem compartilhado muito amor! Você atingiu o número máximo de curtidas em um período de 24 horas, mas à medida que ganha níveis de confiança, você ganha mais curtidas diárias. Você poderá curtir as postagens novamente em %{time_left}."
       create_bookmark: "Você alcançou a quantidade máxima de favoritos por dia. Crie mais favoritos em %{time_left}."
       edit_post: "Você alcançou a quantidade máxima de edições por dia. Envie mais edições em %{time_left}."
       live_post_counts: "Você está pedindo contagens de postagens em tempo real muito rápido. Espere %{time_left} antes de tentar novamente."
@@ -1324,6 +1335,7 @@ pt_BR:
       labels:
         user: Usuário(a)
         qtt_like: Curtidas recebidas
+      description: "Melhores 10 usuários(as) que receberram curtidas."
     top_users_by_likes_received_from_inferior_trust_level:
       title: "Melhores usuários(as) por curtidas recebidas de usuário(a) com nível de confiança mais baixo"
       labels:
@@ -1336,6 +1348,7 @@ pt_BR:
       labels:
         user: Usuário(a)
         qtt_like: Curtidas recebidas
+      description: "Melhores 10 usuários(as) que receberam curtidas de uma ampla variedade de pessoas."
   dashboard:
     group_email_credentials_warning: 'Houve um problema nas credenciais do e-mail do grupo <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. Nenhum e-mail será enviado a partir da caixa de entrada do grupo até este problema ser resolvido. %{error}'
     rails_env_warning: "Seu servidor está rodando no modo %{env}."
@@ -1434,6 +1447,7 @@ pt_BR:
     show_pinned_excerpt_desktop: "Mostrar trecho de tópicos fixados na visualização para desktop."
     post_onebox_maxlength: "Tamanho máximo para uma postagem do Discourse no Onebox."
     blocked_onebox_domains: "Uma lista de domínios que nunca serão \"oneboxed\", por exemplo, wikipedia.org\n(símbolos coringas como \"*\" e \"?\" não são suportados)"
+    block_onebox_on_redirect: "Bloqueie o onebox para URLs que redirecionam."
     allowed_inline_onebox_domains: "Uma lista de domínios que serão colocados em miniatura no Onebox se forem vinculados sem um título"
     enable_inline_onebox_on_all_domains: "Ignore a configuração do site inline_onebox_domain_whitelist e permita inclusões de Onebox em todos os domínios."
     force_custom_user_agent_hosts: "Hosts para os quais usar um agente do(a) usuário(a) do Onebox em todos os pedidos. (Especialmente útil para hosts que limitam acesso do agente do(a) usuário(a).)"
@@ -1452,6 +1466,7 @@ pt_BR:
     favicon: "Um favicon para o seu site, consulte <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar corretamente em um CDN, precisa ser um png, que será redimensionado para 32x32. Se for deixado em branco, large_icon será usado."
     apple_touch_icon: "Ícone usado para dispositivos Apple touch, que será automaticamente redimensionado para 180x180. Se for deixado em branco, large_icon será usado."
     opengraph_image: "Imagem opengraph padrão, usada quando a página não tiver outra imagem adequada. Se for deixada em branco, large_icon será usado."
+    twitter_summary_large_image: "Cartão do Twitter 'resumo de imagem grande' (deve ter pelo menos 280 de largura e pelo menos 150 de altura, não pode ser .svg). Se for deixado em branco, os metadados comuns do cartão são gerados usando o opengraph_image, desde que também não sejam um .svg."
     notification_email: "O endereço de e-mail utilizado ao enviar e-mails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR devidamente configurados para que os e-mails funcionem corretamente."
     email_custom_headers: "Uma lista delimitada por barras de cabeçalhos de e-mail personalizados"
     email_subject: "Formato de assunto personalizável para e-mails padrão. Acesse <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
@@ -1465,6 +1480,8 @@ pt_BR:
     summary_percent_filter: "Quando um(a) usuário(a) clicar em \"Resuma este tópico\", exiba as % melhores postagens"
     summary_max_results: "Quantidade máxima de postagens retornadas por \"Resumir este tópico\""
     summary_timeline_button: "Exibir um botão \"Resumir\" na linha do tempo"
+    enable_personal_messages: "PRETERIDO, use a configuração 'grupos habilitados para mensagens pessoais'. Permitir que usuários de nível de confiança 1 (configurável por meio de confiança mínima para enviar mensagens) criem e respondam a mensagens. Observe que a equipe sempre pode enviar mensagens, não importa como."
+    personal_message_enabled_groups: "Permitir que os usuários desses grupos criem e respondam a mensagens. Os grupos de nível de confiança incluem todos os níveis de confiança acima desse número, por exemplo, escolher trust_level_1 também permite que os usuários trust_level_2, 3, 4 enviem PMs. Observe que a equipe sempre pode enviar mensagens, não importa como."
     enable_system_message_replies: "Permite que os(as) usuários(as) respondam às mensagens do sistema, mesmo se as mensagens pessoais estiverem desativadas"
     enable_chunked_encoding: "Ative respostas de codificação em bloco no servidor. Esse recurso funciona na maioria das configurações, mas alguns proxies podem ser armazenados em buffer, atrasando as respostas"
     long_polling_base_url: "URL de base utilizada para \"sondagem longa\" (auando um CDN for configurado, verifique se essa configuração é a padrão). Por exemplo: http://origin.site.com"
@@ -1483,6 +1500,9 @@ pt_BR:
     tl2_additional_edits_per_day_multiplier: "Aumente o limite de edições por dia para tl2 (membro) ao multiplicar por este número"
     tl3_additional_edits_per_day_multiplier: "Aumentar o limite de edições por dia para tl3 (regular) ao multiplicar por este número"
     tl4_additional_edits_per_day_multiplier: "Aumentar o limite de edições por dia para tl4 (líder) ao multiplicar por este número"
+    tl2_additional_flags_per_day_multiplier: "Aumente o limite de etiquetas por dia para tl2 (membro) ao multiplicar por este número"
+    tl3_additional_flags_per_day_multiplier: "Aumente o limite de edições por dia para tl3 (regular) ao multiplicar por este número"
+    tl4_additional_flags_per_day_multiplier: "Aumente o limite de etiquetas por dia para tl4 (líder) ao multiplicar por este número"
     num_users_to_silence_new_user: "Se as postagens de um(a) novo(a) usuário(a) receberem num_spam_flags_to_silence_new_user spam sinalizador(es) de usuários(as) diferentes, oculte todas as suas postagens e evite postagens futuras. 0 para desativar."
     num_tl3_flags_to_silence_new_user: "Se as postagens do(a) novo(a) usuário(a) obtiverem muitos sinalizadores de num_tl3_users_to_silence_new_user usuários(as) diferentes do nível de confiança 3, oculte todos as publicações e evite postagens futuras. 0 para desativar."
     num_tl3_users_to_silence_new_user: "Se as postagens de um(a) novo(a) usuário(a) receberem num_tl3_flags_to_silence_new_user sinalizador(es) de usuários(as) de nível de confiança 3, oculte todas as suas postagens e evite postagens futuras. 0 para desativar."
@@ -1507,6 +1527,7 @@ pt_BR:
     ga_universal_auto_link_domains: "Ative o monitoramento de domínio cruzado do Google Universal Analytics. Os links de saída para estes domínios conterão a ID de cliente. Consulte <a href='https://support.google.com/analytics/answer/1034342?hl=pt-BR' target='_blank'>Guia de acompanhamento de vários domínios do Google.</a>"
     gtm_container_id: "ID do contêiner do Google Tag Manager. Por exemplo: GTM-ABCDEF. <br/>Observação: talvez os scripts de terceiros carregados pelo GTM precisem estar na lista de permissões no \"src de script de política de segurança de conteúdo\"."
     enable_escaped_fragments: "Voltar para a API do Google Ajax-Crawling se um webcrawler não for encontrado. Consulte <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_and_groups: "Permitir que moderadores criem e gerenciem grupos e categorias"
     moderators_change_post_ownership: "Permitirem que moderadores(as) alterem a propriedade da postagem"
     cors_origins: "Origens permitidas para pedidos de origem cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como verdadeira para ativar CORS."
     use_admin_ip_allowlist: "Administradores(as) só podem entrar com a conta se estiverem na lista de IPs filtrados (Administração > Registros > IPs filtrados)."
@@ -1528,6 +1549,7 @@ pt_BR:
     post_menu: "Determine os itens e a ordem em que aparecem no menu de postagens. Por exemplo: curtir|editar|sinalizar|excluir|compartilhar|favorito|responder"
     post_menu_hidden_items: "Os items de menu para ocultar por padrão no menu de postagem, a menos que cliquem em uma elipse de expansão."
     share_links: "Determine quais itens aparecem na caixa de diálogo de compartilhamento e em qual ordem."
+    allow_username_in_share_links: "Permitir que nomes de usuário sejam incluídos em links de compartilhamento. Isso é útil para recompensar emblemas com base em visitantes únicos."
     site_contact_username: "Um nome de usuário(a) válido da equipe do qual enviar todas as mensagens automáticas. Se for deixado em branco, a conta padrão do sistema será utilizada."
     site_contact_group_name: "Um nome de grupo válido para ser convidado para todas as mensagens automáticas."
     send_welcome_message: "Envie aos(às) novos(as) usuários(as) uma mensagem de boas-vindas com um guia de início rápido."
@@ -1535,6 +1557,7 @@ pt_BR:
     send_tl2_promotion_message: "Envie a usuários(as) de nível de confiança 2 uma mensagem sobre promoção."
     suppress_reply_directly_below: "Não exiba a contagem de respostas expansível em um postagem quando há apenas uma única resposta direto abaixo desta postagem."
     suppress_reply_directly_above: "Não exiba a \"em resposta a\" expansível em uma postagem quando há apenas uma única resposta direto acima desta postagem."
+    remove_full_quote: "Remover cotação automaticamente se (a) aparecer no início de uma postagem, (b) for de uma postagem inteira e (c) for da postagem imediatamente anterior. Para mais detalhes, consulte <a href='https://meta.discourse.org/t/removal-of-full-quotes-from-direct-replies/106857' target='_blank'>Remoção de citações completas de respostas diretas</a>"
     suppress_reply_when_quoting: "Não exiba a \"em resposta a\" expansível em uma postagem quando a postagem citar a resposta."
     max_reply_history: "Quantidade máxima de respostas para expandir ao expandir \"em resposta a\""
     topics_per_period_in_top_summary: "Quantidade de melhores tópicos exibidos no resumo de melhores tópicos padrão."
@@ -1549,6 +1572,7 @@ pt_BR:
     enable_badges: "Ativar o sistema de emblemas"
     max_favorite_badges: "Quantidade máxima de emblemas que o(a) usuário(a) pode selecionar"
     enable_whispers: "Permitir a comunicação pessoal da equipe nos tópicos."
+    whispers_allowed_groups: "Permitir comunicação privada dentro de tópicos para membros de grupos especificados."
     allow_index_in_robots_txt: "Especifique em robots.txt que este site tem permissão para ser indexado por mecanismos de busca da web. Em casos excepcionais, é possível <a href='%{base_path}/admin/customize/robots'>substituir robots.txt</a>."
     blocked_email_domains: "Lista delimitada por barras de domínios de e-mail que não são permitidos para registrar contas. Por exemplo: mailinator.com|trashmail.net"
     allowed_email_domains: "Lista delimitada por barras de domínios de e-mail que os(as) usuários(as) DEVEM usar para registrar contas. AVISO: usuários(as) com domínios de e-mail que não estão na lista não terão permissão!"
@@ -1599,6 +1623,9 @@ pt_BR:
     google_oauth2_client_secret: "Segredo de cliente do seu app Google."
     google_oauth2_prompt: "Uma lista opcional delimitada por espaço de valores de linhas que especifica se o servidor de autorização solicita ao(à) usuário(a) reautenticação e consentimento. Acesse <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> para consultar os valores possíveis."
     google_oauth2_hd: "Um domínio opcional hospedado pelo Google Apps ao qual a entrada com conta será limitada. Acesse <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> para obter mais detalhes."
+    google_oauth2_hd_groups: "(experimental) Recupere os grupos do Google dos(as) usuários(as) no domínio ou autenticação hospedada. Grupos do Google recuperados podem ser usados para conceder associação automática ao grupo do Discourse. Para mais informações, consulte: https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups_service_account_admin_email: "Um endereço de e-mail pertencente a uma conta de administrador do Google Workspace. Será usado com as credenciais da conta de serviço para buscar informações do grupo."
+    google_oauth2_hd_groups_service_account_json: "Informações de chave formatadas em JSON para a Conta de Serviço. Serão usadas para buscar informações do grupo."
     enable_twitter_logins: "Ative a autenticação do Twitter, requer twitter_consumer_key e twitter_consumer_secret. Acesse <a href='https://meta.discourse.org/t/13395' target='_blank'>Configurando a entrada com conta Twitter (e muitas inserções) para o Discourse</a>."
     twitter_consumer_key: "Chave do(a) consumidor(a) para autenticação do Twitter, registrada em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Segredo do(a) consumidor(a) para autenticação do Twitter, registrado em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
@@ -1634,6 +1661,8 @@ pt_BR:
     top_topics_formula_first_post_likes_multiplier: "valor do multiplicador de curtidas da primeira postagem (n) na fórmula dos melhores tópicos: \"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: "valor do multiplicador da menor quantidade de curtidas por publicação (n) na fórmula de melhores tópicos: \"log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)\""
     enable_safe_mode: "Permitir que os(as) usuários(as) insiram o modo de segurança para depurar plug-ins."
+    enable_experimental_sidebar_hamburger: "Permite que a barra lateral experimental e o menu hambúrguer suspenso do usuário sejam ativados."
+    enable_sidebar: "Ativar barra lateral experimental."
     rate_limit_create_topic: "Após criar um tópico, os(as) usuários(as) devem aguardar (n) segundos antes de criar um outro tópico."
     rate_limit_create_post: "Após postar, os(as) usuários(as) devem aguardar (n) segundos antes de criar outra postagem."
     rate_limit_new_user_create_topic: "Após criar um tópico, novos(as) usuários(as) devem aguardar (n) segundos antes de criar outro tópico."
@@ -1646,6 +1675,7 @@ pt_BR:
     max_personal_messages_per_day: "Quantidade máxima de novos tópicos de mensagens pessoais que um(a) usuário(a) pode criar a cada dia."
     max_invites_per_day: "Quantidade máxima de convites que um(a) usuário(a) pode enviar por dia."
     max_topic_invitations_per_day: "Quantidade máxima de convites para tópicos que um(a) usuário(a) pode enviar por dia."
+    max_topic_invitations_per_minute: "Quantidade máxima de convites para tópicos que alguém pode enviar por dia."
     max_logins_per_ip_per_hour: "Quantidade máxima de entradas com a conta permitidas por endereço IP a cada hora"
     max_logins_per_ip_per_minute: "Quantidade máxima de entradas com a conta permitidas por endereço IP a cada minuto"
     max_post_deletions_per_minute: "Quantidade máxima de postagens que um(a) usuário(a) pode excluir por minuto. Defina como 0 para desativar exclusões de postagens."
@@ -1677,6 +1707,7 @@ pt_BR:
     use_site_small_logo_as_system_avatar: "Use o logotipo pequeno do site em vez do avatar do(a) usuário(a) do sistema. Requer que o logo esteja presente."
     restrict_letter_avatar_colors: "Uma lista de valores de cor hexadecimais de 6 dígitos para serem usados no plano de fundo do avatar da letra."
     enable_listing_suspended_users_on_search: "Ative usuários(as) regulares para encontrar usuários(as) suspensos(as)."
+    selectable_avatars_mode: "Permitir que os usuários selecionem um avatar da lista selectable_avatars e limitem os envios de avatares personalizados ao nível de confiança selecionado."
     selectable_avatars: "Lista de avatares que os(as) usuários(as) podem escolher."
     allow_all_attachments_for_group_messages: "Permitir todos os anexos de e-mail para mensagens de grupo."
     png_to_jpg_quality: "Qualidade do arquivo JPG convertido (1 é a qualidade mais baixa, 99 é a melhor qualidade, 100 para desativar)."
@@ -1723,6 +1754,7 @@ pt_BR:
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
     min_trust_to_edit_post: "O nível mínimo de confiança necessário para editar postagens."
     min_trust_to_allow_self_wiki: "O nível de confiança mínimo necessário para criar o próprio wiki do(a) usuário(a)."
+    min_trust_to_send_messages: "PRETERIDO, use a configuração 'grupos habilitados para mensagens pessoais'. O nível mínimo de confiança necessário para criar novas mensagens pessoais."
     min_trust_to_send_email_messages: "O nível mínimo de confiança necessário para enviar mensagens pessoais via e-mail."
     min_trust_to_flag_posts: "O nível de confiança mínimo necessário para sinalizar postagens"
     min_trust_to_post_links: "O nível de confiança mínimo necessário para incluir links em postagens"
@@ -1740,6 +1772,7 @@ pt_BR:
     max_mentions_per_post: "Quantidade máxima de notificações de @nome que alguém pode usar em uma postagem."
     max_users_notified_per_group_mention: "Quantidade máxima de usuários(as) que podem receber uma notificação se um grupo for mencionado (se o limite for atingido, nenhuma notificação será gerada)"
     enable_mentions: "Permitir que os(as) usuários(as) mencionem outros(as) usuários(as)."
+    here_mention: "Nome usado para @mention para permitir que usuários privilegiados notifiquem até 'max_here_mention' pessoas que participam do tópico. Não deve ser um nome de usuário existente."
     max_here_mentioned: "Número máximo de pessoas mencionadas por @here."
     min_trust_level_for_here_mention: "O nível de confiança mínimo permitido mencioar @here."
     create_thumbnails: "Criar miniaturas e imagens lightbox que são muito grandes para caber em uma postagem."
@@ -1826,6 +1859,7 @@ pt_BR:
     max_emails_per_day_per_user: "Quantidade máxima de e-mails para enviar a usuários(as) por dia. 0 para desativar o limite"
     enable_staged_users: "Crie automaticamente usuários(as) encenados(as) ao processar os e-mails recebidos."
     maximum_staged_users_per_email: "Quantidade máxima de usuários(as) encenados(as) criados(as) ao processar um e-mail recebido."
+    maximum_recipients_per_new_group_email: "Bloquear e-mails recebidos com muitos destinatários."
     auto_generated_allowlist: "Lista de endereços de e-mail que não serão verificados em busca de conteúdo gerado automaticamente. Por exemplo: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloqueie os e-mails recebidos identificados como gerados automaticamente."
     ignore_by_title: "Ignore os e-mails recebidos com base no título."
@@ -1845,6 +1879,7 @@ pt_BR:
     raw_email_max_length: "Quantidade de caracteres que devem ser armazenados para e-mails recebidos."
     raw_rejected_email_max_length: "Quantidade de caracteres que devem ser armazenados para e-mails rejeitados."
     delete_rejected_email_after_days: "Exclua rascunhos recusado anteriores a (n) dias."
+    require_change_email_confirmation: "Solicite que os usuários que não fazem parte da equipe confirmem o endereço de e-mail antigo antes de alterá-lo. Não se aplica aos usuários da equipe, eles sempre precisam confirmar seu endereço de e-mail antigo."
     manual_polling_enabled: "Envie e-mails usando a API para respostas via e-mail."
     pop3_polling_enabled: "Sondar via POP3 para respostas de e-mail."
     pop3_polling_ssl: "Use SSL ao conectar-se com o servidor POP3. (Recomendado)"
@@ -1923,6 +1958,7 @@ pt_BR:
     enable_mobile_theme: "Os dispositivos móveis usam um tema compatível com dispositivos móveis, com a possibilidade de mudar para o site completo. Desative isso se quiser usar um estilo personalizado totalmente responsivo."
     dominating_topic_minimum_percent: "Percentual de postagens que um(a) usuário(a) precisa fazer em um tópico antes de ser relembrado(a) de ser excessivamente dominante em um tópico."
     disable_avatar_education_message: "Desative mensagem de instrução para mudar de avatar."
+    pm_warn_user_last_seen_months_ago: "Ao criar uma nova PM, avise aos usuários quando o destinatário de destino não foi visto há mais de n meses."
     suppress_uncategorized_badge: "Não exiba o emblema para assuntos não categorizados em listas de tópicos."
     header_dropdown_category_count: "Quantidade de categorias que podem ser exibidas no menu suspenso do cabeçalho."
     permalink_normalizations: "Aplique o seguinte regex antes de combinar permalinks, por exemplo: /(topic.*)\\?.*/\\1 irá retirar as linhas de consulta das rotas de tópicos. O formato é regex + string use \\ 1 etc. para acessar capturas"
@@ -1949,6 +1985,7 @@ pt_BR:
     display_name_on_posts: "Exibir o nome completo do(a) usuário(a) em suas postagens, além de seu(sua) @username."
     show_time_gap_days: "Se duas postagens forem feitas com tantos dias de intervalo, mostre o intervalo de tempo no tópico."
     short_progress_text_threshold: "Após a quantidade de mensagens em um tópico ultrapassar este número, a barra de progresso exibirá apenas o número da postagem atual. Se você alterar a largura da barra de progresso, talvez seja necessário alterar este valor."
+    default_code_lang: "Destaque a sintaxe de linguagem de programação padrão aplicado a blocos de código (auto, nohighlight, ruby, python etc.). Esse valor também deve estar presente na configuração do site 'idiomas destacados'."
     warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico anterior a esta quantidade de dias, um aviso será exibido. Desative ao definir como 0."
     autohighlight_all_code: "Aplicar código destacando todos os blocos de código pré-formatados, mesmo quando não especificarem o idioma"
     highlighted_languages: "Regras de destaque de sintaxe incluídas. (Atenção: incluir muitos idiomas pode afetar o desempenho) consulte: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para ver uma demonstração"
@@ -1969,6 +2006,12 @@ pt_BR:
     delete_merged_stub_topics_after_days: "Quantidade de dias para aguardar antes de excluir automaticamente tópicos de stub totalmente mesclados. Defina para 0 para nunca excluir tópicos de stub."
     bootstrap_mode_min_users: "Quantidade mínima de usuários(as) necessários(as) para desativar o modo de inicialização (defina como 0 para desativar)"
     prevent_anons_from_downloading_files: "Impeça que usuários(as) anônimos(as) baixem anexos."
+    secure_media: 'PRETERIDO: use a configuração secure_uploads, será removido no Discourse 3.0.'
+    secure_uploads: 'Limita acesso a TODOS os envios (imagens, vídeo, áudio, texto, pdfs, zips e muito mais). Se “É necessário entrar com a conta” estiver ativado, apenas usuários(as) que entraram com a conta podem acessar os envios. Caso contrário, o acesso será limitado apenas a envios de mídias em mensagens e categorias privadas. AVISO: esta configuração é complexa e requer conhecimento de administração. Para mais detalhes, consulte <a target="_blank" href="https://meta.discourse.org/t/-/140017">o tópico de envios seguros em Meta</a>.'
+    secure_media_allow_embed_images_in_emails: "PRETERIDO: use secure_uploads_allow_embed_images_in_emails, será removido no Discourse 3.0."
+    secure_uploads_allow_embed_images_in_emails: "Permite incorporação de imagens seguras que geralmente seriam escritas em e-mails, caso o tamanho seja menor do que a configuração 'tamanho máx. de imagem de envio incorporada no e-mail, em KB\"."
+    secure_media_max_email_embed_image_size_kb: "PRETERIDO: Use secure_uploads_max_email_embed_image_size_kb, será removido no Discourse 3.0."
+    secure_uploads_max_email_embed_image_size_kb: "A redução de tamanho para imagens seguras que serão incorporadas nos e-mails se a configuração 'Permissão de incorporação de envios seguros no e-mail'. Caso não esteja ativada, esta configuração não terá efeito."
     slug_generation_method: "Escolha um método para geração de slug. \"Codificado\" irá gerar linhas com \"%\". 'Nenhum\" irá desativar a geração de slugs."
     enable_emoji: "Ativar emoji"
     enable_emoji_shortcuts: "Texto com carinhas comuns como :): p :( será convertido em emojis"
@@ -2046,6 +2089,7 @@ pt_BR:
     tags_sort_alphabetically: "Exiba as etiquetas em ordem alfabética. O padrão é mostrar em ordem de popularidade."
     tags_listed_by_group: "Listar etiquetas por grupo de etiquetas na <a href='%{base_path}/tags' target='_blank'>página de etiquetas</a>."
     tag_style: "Estilo de visual para emblemas de etiquetas."
+    pm_tags_allowed_for_groups: "Permitir que os membros dos grupos incluídos marquem em qualquer mensagem pessoal"
     min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para etiquetar tópicos"
     suppress_overlapping_tags_in_list: "Se as etiquetas corresponderem a palavras exatas em títulos de tópicos, não mostrar a etiqueta"
     remove_muted_tags_from_latest: "Não mostrar tópicos etiquetados apenas com etiquetas silenciadas na lista de tópicos mais recentes."
@@ -2059,6 +2103,10 @@ pt_BR:
     push_notifications_icon: "O ícone do emblema que é exibido no canto de notificações. É recomendável um PNG monocromático de 96×96."
     base_font: "Fonte básica para usar nos textos mais importantes do site. É possível substituir os temas pela propriedade personalizada de CSS \"--font-family\"."
     heading_font: "Fonte para usar nos cabeçalhos do site. É possível substituir os temas pela propriedade personalizada de CSS \"--heading-font-family\"."
+    enable_sitemap: "Gerar um mapa para o seu site e incluí-lo no arquivo robots.txt."
+    sitemap_page_size: "Número de URLs a serem incluídas em cada página de mapa do site. Máx: 50.000"
+    enable_user_status: "(experimental) Permitir que os usuários definam uma mensagem de status personalizada (emoji + descrição)."
+    enable_onboarding_popups: "(experimental) Ativar pop-ups educacionais que descrevem os principais recursos para os usuários"
     short_title: "O título abreviado será usado na tela inicial do(a) usuário(a), no inicializador ou em outros locais com espaço limitado. Deveria ser limitado a 12 caracteres."
     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."
@@ -2070,8 +2118,13 @@ pt_BR:
     share_quote_visibility: "Determine quando exibir botões de compartilhamento de citações: nunca, apenas para usuários(as) anônimos(as) ou todos(as) os(as) usuários(as). "
     create_revision_on_bulk_topic_moves: "Crie revisão para as primeiras postagens quando os tópicos forem movidos em massa para uma nova categoria."
     allow_changing_staged_user_tracking: "Permitir a alteração das preferências de notificação de etiquetas e categoria do(a) usuário(a) por parte de um(a) usuário(a) administrador(a)."
+    use_email_for_username_and_name_suggestions: "Use a primeira parte dos endereços de e-mail para sugestões de nome de usuário e nome. Observe que isso facilita que o público adivinhe os endereços de e-mail completos dos usuários (porque uma grande proporção de pessoas compartilha serviços comuns como `gmail.com`)."
+    use_name_for_username_suggestions: "Use o nome completo de um usuário ao sugerir nomes de usuário."
     suggest_weekends_in_date_pickers: "Inclua fins de semana (sábado e domingo) nas sugestões do seletor de datas (desative isso se você usar o Discourse apenas durante a semana, de segunda a sexta)."
+    splash_screen: "Exibe uma tela de carregamento temporária enquanto os ativos do site são carregados"
+    default_sidebar_categories: "As categorias selecionadas serão exibidas abaixo da seção de Categorias do Painel Lateral por padrão."
     default_sidebar_tags: "As etiquetas selecionadas serão exibidas na seção de Etiquetas da barra lateral por padrão."
+    enable_new_user_profile_nav_groups: "EXPERIMENTAL: os usuários dos grupos selecionados verão o novo menu de navegação do perfil de usuário"
     errors:
       invalid_css_color: "Cor inválida. Digite o nome da cor ou valor hexadecimal."
       invalid_email: "Endereço de e-mail inválido"
@@ -2091,6 +2144,7 @@ pt_BR:
       invalid_json: "JSON inválido."
       invalid_reply_by_email_address: "O valor deve conter \"%{reply_key}\" e ser diferente do e-mail de notificação."
       invalid_alternative_reply_by_email_addresses: "Todos os valores devem conter \"%{reply_key}\" e ser diferente do e-mail de notificação."
+      invalid_domain_hostname: "Não deve incluir os caracteres * ou ?."
       pop3_polling_host_is_empty: "Você deve definir um \"host de pesquisa POP3\"' antes de ativar a consulta POP3."
       pop3_polling_username_is_empty: "Você deve definir um \"nome de usuário(as) de pesquisa POP3\" antes de ativar a sondagem POP3."
       pop3_polling_password_is_empty: "Você deve definir uma \"senha de sondagem POP3\" antes de ativar a sondagem POP3."
@@ -2098,7 +2152,9 @@ pt_BR:
       reply_by_email_address_is_empty: "Você deve definir uma \"resposta por endereço de e-mail\" antes de ativar a resposta por e-mail."
       email_polling_disabled: "Você deve ativar a pesquisa manual ou POP3 antes de ativar a resposta por e-mail."
       user_locale_not_enabled: "Você deve primeiro ativar \"permitir localidade do(a) usuário(a)\" antes de ativar esta configuração."
+      personal_message_enabled_groups_invalid: "Você deve especificar pelo menos um grupo para esta configuração. Se você não quiser que ninguém, exceto a equipe, envie PMs, escolha o grupo da equipe."
       invalid_regex: "Regex não é inválida ou permitida."
+      invalid_regex_with_message: "A regex '%{regex}' tem um erro: %{message}"
       email_editable_enabled: "Você deve desativar o \"e-mail editável\" antes de ativar esta configuração."
       staged_users_disabled: "Primeiro você deve ativar os \"usuários(as) encenados(as)\" antes de ativar esta configuração."
       reply_by_email_disabled: "Você deve ativar \"responder por e-mail\" antes de ativar esta configuração primeiro."
@@ -2119,6 +2175,12 @@ pt_BR:
         leading_trailing_slash: "A expressão regular não deve começar e terminar com uma barra."
       unicode_usernames_avatars: "Os avatares internos do sistema não são compatíveis com nomes de usuário(as) Unicode."
       list_value_count: "A lista deve conter exatamente %{count} valores."
+      markdown_linkify_tlds: "Você não pode incluir um valor de '*'."
+      google_oauth2_hd_groups: "Você deve configurar \"google oauth2 hd\" antes de ativar esta configuração."
+      search_tokenize_chinese_enabled: "Você deve desativar o 'search_tokenize_chinese' antes de ativar esta configuração."
+      search_tokenize_japanese_enabled: "Você deve desativar o 'search_tokenize_japanese' antes de ativar esta configuração."
+      discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Você não pode ativar o DiscourseConnect se o 2FA for aplicado."
+      delete_rejected_email_after_days: "Esta configuração não pode ser inferior à configuração delete_email_logs_after_days ou superior a %{max}"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.exemplo.com.br"
@@ -2280,6 +2342,15 @@ pt_BR:
     second_factor_toggle:
       totp: "Usar um aplicativo autenticador ou chave de segurança"
       backup_code: "Usar um código de backup"
+  second_factor_auth:
+    challenge_not_found: "Não foi possível encontrar um desafio 2FA na sua sessão atual."
+    challenge_expired: "Muito tempo se passou desde que o desafio 2FA foi encenado e não é mais válido. Tente novamente."
+    challenge_not_completed: "Você não concluiu o desafio 2FA para realizar esta ação. Complete o desafio 2FA e tente novamente."
+    actions:
+      grant_admin:
+        description: "Para medidas de segurança adicionais, você precisa confirmar seu 2FA antes que %{username} receba acesso de administrador."
+      discourse_connect_provider:
+        description: "%{hostname} solicitou que você confirme seu 2FA. Você será redirecionado(a) de volta ao site assim que confirmar seu 2FA."
   admin:
     email:
       sent_test: "enviou!"
@@ -2672,6 +2743,14 @@ pt_BR:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "Parabéns pela sua promoção de nível de confiança!"
+      text_body_template: |
+        Promovemos você para outro [nível de confiança](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Alcançar o nível de confiança 2 significa que você leu e participou ativamente o suficiente para ser um membro desta comunidade.
+
+        Como um usuário experiente, você pode apreciar [esta lista de dicas e truques úteis](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Convidamos você a continuar participando – gostamos de ter você por perto.
     backup_succeeded:
       title: "Backup realizado com êxito"
       subject_template: "Backup concluído com êxito"
@@ -2716,9 +2795,23 @@ pt_BR:
     bulk_invite_succeeded:
       title: "Convites em massa realizados"
       subject_template: "Seus convites foram enviados com êxito."
+      text_body_template: |
+        Seu arquivo de convite de usuário em massa foi processado, %{sent} convites enviados, %{skipped} ignorado(s) e %{warnings} aviso(s).
+
+        ``` texto
+        %{logs}
+        ```
     bulk_invite_failed:
       title: "Os convites em massa falharam"
       subject_template: "Seus convites em massa não foram enviados, entre em contato com os(as) moderadores(as)."
+      text_body_template: |
+        Seu arquivo de convite de usuário em massa foi processado, %{sent} convites enviados, %{skipped} ignorado(s), %{warnings} aviso(s) e %{failed} erro(s).
+
+        Aqui está o log:
+
+        ``` texto
+        %{logs}
+        ```
     user_added_to_group_as_owner:
       title: "Adicionado ao grupo como proprietário(a)"
       subject_template: "Você foi adicionado(a) como um(a) dos(as) proprietários(as) do grupo %{group_name}"
@@ -2938,6 +3031,15 @@ pt_BR:
         Você respondeu ao e-mail de resumo, o que não é permitido.
 
         Se acha que é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
+    email_reject_too_many_recipients:
+      title: "O e-mail rejeita excesso de destinatários"
+      subject_template: "[%{email_prefix}] Problema no e-mail -- muitos destinatários"
+      text_body_template: |
+        Desculpe, mas a sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Você tentou enviar e-mail para mais de %{max_recipients_count} pessoas e nosso sistema marcou automaticamente seu e-mail como spam.
+
+        Se você acredita que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_error_notification:
       title: "Notificação de erro por e-mail"
       subject_template: "[%{email_prefix}] Problema no e-mail, erro de autenticação do POP"
@@ -3533,6 +3635,17 @@ pt_BR:
     suspicious_login:
       title: "Alerta de nova entrada com conta"
       subject_template: "[%{site_name}] Nova entrada com conta em %{location}"
+      text_body_template: |
+        Olá,
+
+        Notamos que a sua conta foi usada para entrar em um dispositivo ou local que você não costuma usar. Foi você?
+
+         - Localização: %{location} (%{client_ip})
+         - Navegador: %{browser}
+         - Dispositivo: %{device} -- %{os}
+
+        Se tiver sido você, ótimo! Não há mais nada que precise ser feito.
+        Caso contrário, [revise suas sessões existentes](%{base_url}/my/preferences/security) e considere alterar sua senha.
     post_approved:
       title: "Sua postagem foi aprovada"
       subject_template: "[%{site_name}] Sua postagem foi aprovada"
@@ -3581,6 +3694,7 @@ pt_BR:
     external_upload_not_found: "O envio não foi encontrado no armazenamento externo. %{additional_detail}"
     checksum_mismatch_failure: "A soma de verificação do arquivo enviado não corresponde. O conteúdo do arquivo pode ter sido alterado no envio. Tente novamente."
     cannot_promote_failure: "Este envio não pode ser concluído, talvez já tenha sido concluído ou fracassado anteriormente."
+    size_zero_failure: "Desculpe, parece que algo deu errado, o arquivo que você está tentando enviar tem 0 bytes. Tente novamente."
     attachments:
       too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é de %{max_size_kb} KB)."
       too_large_humanized: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é de %{max_size})."
@@ -4394,6 +4508,7 @@ pt_BR:
               subcategories_with_featured_topics:
                 label: "Sub-Categorias com tópicos em destaque"
       branding:
+        title: "Personalizar logos"
         fields:
           logo:
             label: "Logotipo primário"
@@ -4408,6 +4523,7 @@ pt_BR:
             label: "Ícone grande"
             description: "Ícone usado para representar seu site em dispositivos móveis e fique bem em tamanhos maiores. Idealmente maior que 512x512. O logo quadrado é usado por padrão."
       corporate:
+        title: "Sua organização"
         fields:
           company_name:
             label: "Nome da empresa"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 50f3dfb79c..086aeed9eb 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1250,6 +1250,9 @@ ro:
     email_too_long: "Adresa de email pe care ai introdus-o este prea lungă. Numele de căsuțe poștale nu trebuie să depășească 254 de caractere, și numele de domenii nu trebuie să depășească 253 de caractere."
     reserved_username: "Acest nume utilizator nu este permis."
     missing_user_field: "Nu ai completat toate câmpurile utilizatorului"
+    second_factor_title: "Autentificare în doi pași (2FA)"
+    second_factor_description: "Introdu codul de autentificare din aplicația 2FA"
+    invalid_second_factor_code: "Cod de autentificare invalid. Fiecare cod poate fi utilizat o singură dată."
   admin:
     email:
       sent_test: "trimis!"
@@ -1596,6 +1599,9 @@ ro:
       text_body_template: |2
 
         %{message}
+    account_second_factor_disabled:
+      title: "Autentificarea în doi pași (2FA) este dezactivată"
+      subject_template: "[%{email_prefix}] Autentificare în doi pași (2FA) dezactivată"
     digest:
       why: "Un rezumat scurt al %{site_link} de la ultima ta vizită din %{last_seen_at}."
       since_last_visit: "De la ultima ta vizită"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 65b6a6669d..70478903ff 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -46,7 +46,7 @@ ru:
   sign_up: "Зарегистрироваться"
   log_in: "Войти"
   submit: "Подтвердить"
-  purge_reason: "Аккаунт удалён автоматически как заброшенный, деактивированный."
+  purge_reason: "Учётная запись удалена автоматически как заброшенная, выключенная."
   disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостатка места на диске."
   anonymous: "Анонимный"
   remove_posts_deleted_by_author: "Удалено автором"
@@ -243,7 +243,7 @@ ru:
     not_found_template: |
       <p>Ваше приглашение на сайт <a href="%{base_url}">%{site_name}</a> уже использовано.</p>
 
-      <p>Если вы помните ваш пароль, вы можете <a href="%{base_url}/login">Войти в аккаунт</a>.</p>
+      <p>Если вы помните ваш пароль, вы можете <a href="%{base_url}/login">Войти в учётную запись</a>.</p>
 
       <p>В противном случае <a href="%{base_url}/password-reset">восстановите пароль</a>.</p>
     not_found_template_link: |
@@ -581,7 +581,7 @@ ru:
               too_many_users: "Можно отправлять предупреждения только одному пользователю за раз."
               cant_send_pm: "Извините, но вы не можете отправить личное сообщение этому пользователю."
               no_user_selected: "Вы должны выбрать пользователя."
-              reply_by_email_disabled: "Ответ по Email был отключён."
+              reply_by_email_disabled: "Ответ по эл. почте был отключён."
               send_to_email_disabled: "Извините, но вы не можете отправить личное сообщение на электронную почту."
               target_user_not_found: "Не удалось найти одного из пользователей, которым вы отправляете это сообщение."
               unable_to_update: "При обновлении темы произошла ошибка."
@@ -876,8 +876,8 @@ ru:
     success: "Смена пароля прошла успешно, вы вошли на сайт."
     success_unapproved: "Смена пароля прошла успешно."
   email_login:
-    invalid_token: "К сожалению, ссылка для входа, указанная в сообщении электронной почты устарела. Нажмите на кнопку \"Войти\", а затем на \"Я забыл свой пароль\", чтобы создать новую ссылку для изменения пароля."
-    title: "Вход по E-mail"
+    invalid_token: "К сожалению, ссылка для входа, указанная в сообщении электронной почты устарела. Нажмите на кнопку «Войти», а затем на «Я забыл свой пароль», чтобы создать новую ссылку для изменения пароля."
+    title: "Вход по эл. почте"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -918,15 +918,15 @@ ru:
     confirm: "Подтверждение"
     max_secondary_emails_error: "Вы указали максимально возможное количество дополнительных адресов электронной почты."
     authorizing_new:
-      title: "Подтвердите свой новый Email"
+      title: "Подтвердите свою новую эл. почту"
       description: "Подтвердите, что Вы хотите поменять свой Email на новый:"
       description_add: "Подтвердите, что Вы хотите добавить дополнительный Email:"
     authorizing_old:
-      title: "Измените свой Email"
+      title: "Измените свою эл. почту"
       description: "Пожалуйста, подтвердите изменение вашего электронного адреса"
       description_add: "Подтвердите, что Вы хотите добавить дополнительный Email:"
-      old_email: "Старый Email: %{email}"
-      new_email: "Новый Email: %{email}"
+      old_email: "Старая эл. почта: %{email}"
+      new_email: "Новая эл. почта: %{email}"
       almost_done_title: "Подтверждение нового электронного адреса"
       almost_done_description: "Мы отправили письмо на ваш новый адрес электронной почты, чтобы подтвердить его изменение!"
   associated_accounts:
@@ -1053,7 +1053,7 @@ ru:
         make: "Эта тема теперь является объявлением и будет отображаться сверху на всех страницах, пока пользователи не скроют его, каждый сам для себя."
         remove: "Эта тема теперь не является объявлением и больше не будет отображаться в верхней части каждой страницы."
   unsubscribed:
-    title: "Настройки E-mail обновлены!"
+    title: "Настройки эл. почты обновлены!"
     description: "Настройки электронной почты для <b>%{email}</b> были обновлены. Чтобы изменить настройки электронной почты, зайдите в <a href='%{url}'>настройки пользователя</a>."
     topic_description: "Чтобы восстановить подписку на тему %{link}, воспользуйтесь кнопкой настройки уведомлений, расположенной справа и под последним сообщением темы."
     private_topic_description: "Чтобы повторно подписаться, воспользуйтесь кнопкой настройки уведомлений, расположенной справа и под последним сообщением темы."
@@ -1071,9 +1071,9 @@ ru:
     log_out: "Выйти"
     submit: "Сохранить настройки"
     digest_frequency:
-      title: "Вы получаете Email-дайджест %{frequency}"
+      title: "Вы получаете дайджест по эл. почте %{frequency}"
       never_title: "Вы не получаете Email-дайджест"
-      select_title: "Установить частоту отправки Email-дайджеста:"
+      select_title: "Установить частоту отправки дайджеста по эл. почте:"
       never: "Никогда"
       every_30_minutes: "Каждые 30 минут"
       every_hour: "Каждый час"
@@ -1497,7 +1497,7 @@ ru:
     min_personal_message_post_length: "Минимально допустимое количество символов в личном сообщении"
     max_post_length: "Максимально допустимое количество символов в одном сообщении"
     topic_featured_link_enabled: "Разрешать публиковать ссылку на избранную тему."
-    show_topic_featured_link_in_digest: "Публиковать ссылку на избранную тему в Email-дайджесте."
+    show_topic_featured_link_in_digest: "Публиковать ссылку на избранную тему в дайджесте по эл. почте."
     min_topic_views_for_delete_confirm: "Минимальное количество просмотров темы, при котором появляется всплывающее окно с запросом подтверждения при её удалении"
     min_topic_title_length: "Минимально допустимое количество символов в названии темы"
     max_topic_title_length: "Максимально допустимое количество символов в названии темы"
@@ -1560,7 +1560,7 @@ ru:
     facebook_app_access_token: "Токен, созданный на основе идентификатора и секрета вашего приложения Facebook. Используется для создания умных вставок для Instagram."
     logo: "Логотип в левом верхнем углу вашего сайта. Используйте широкое прямоугольное изображение высотой 120 и соотношением сторон более чем 3:1. Если оставить поле пустым, будет показан текст заголовка сайта."
     logo_small: "Уменьшенный логотип в левом верхнем углу вашего сайта, отображаемый при прокрутке вниз. Используйте квадратное изображение 120 × 120. Если оставить поле пустым, будет отображаться домашняя иконка."
-    digest_logo: "Альтернативный логотип, используемый в верхней части страницы, отображающей Email-дайджест. Используйте широкое прямоугольное изображение. Не используйте изображение в формате SVG. Если оставить поле пустым, будет использоваться стандартный настроенный логотип."
+    digest_logo: "Альтернативный логотип, используемый в верхней части страницы, отображающей дайджест по эл. почте. Используйте широкое прямоугольное изображение. Не используйте изображение в формате SVG. Если оставить поле пустым, будет использоваться стандартный настроенный логотип."
     mobile_logo: "Логотип, используемый в мобильной версии сайта. Используйте широкое прямоугольное изображение с высотой 120 и соотношением сторон более чем 3:1. Если оставить поле пустым, будет использоваться стандартный настроенный логотип."
     logo_dark: "Dark scheme alternative for the 'logo' site setting."
     logo_small_dark: "Dark scheme alternative for the 'logo small' site setting."
@@ -1572,7 +1572,7 @@ ru:
     apple_touch_icon: "Иконка, используемая на сенсорных устройствах Apple. Размер будет автоматически изменён до 180x180. Если оставить поле пустым, будет использоваться большая иконка."
     opengraph_image: "Стандартное изображение opengraph, используемое, если на странице нет другого подходящего изображения. Если оставить поле пустым, будет использоваться большая иконка."
     twitter_summary_large_image: "Сводная карточка Twitter с большим изображением (должна быть не менее 280 пикселей в ширину, не менее 150 пикселей в высоту и не может быть в формате 'svg'). Если оставить поле пустым, обычные метаданные карточки генерируются с использованием технологии opengraph image (если исходное изображение также не в формате 'svg')."
-    notification_email: "Отправитель: Email, используемый при отправке всех системных писем. Для успешной отправки писем, указанный здесь домен должен иметь правильно настроенные SPF, DKIM и reverse PTR."
+    notification_email: "Отправитель: Эл. почта, используемая при отправке всех системных писем. Для успешной отправки писем, указанный здесь домен должен иметь правильно настроенные SPF, DKIM и reverse PTR."
     email_custom_headers: "Разделённый вертикальной чертой список дополнительных заголовков в почтовых сообщениях"
     email_subject: "Настраиваемый формат темы для стандартных писем. См. тему <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "Предоставление пользователям более подробной информации о том, почему они не могут получить доступ к определённой теме. Примечание: Это менее безопасно, поскольку пользователи будут знать, ссылается ли URL-адрес на допустимую тему."
@@ -1673,7 +1673,7 @@ ru:
     prioritize_username_in_ux: "Показывать имя пользователя первым на странице пользователя, карточке пользователя и сообщениях (когда отключённое имя показывается первым)"
     enable_rich_text_paste: "Включить автоматическое преобразование HTML в Markdown при вставке текста в редактор. (Экспериментально)"
     send_old_credential_reminder_days: "Напомнить о старых учётных данных через указанное количество дней"
-    email_token_valid_hours: "Ссылка на восстановление пароля / активацию аккаунта будет действовать в течение указанного здесь количества часов."
+    email_token_valid_hours: "Ссылка на восстановление пароля / активацию учётной записи будет действовать в течение указанного здесь количества часов."
     enable_badges: "Включить систему наград"
     max_favorite_badges: "Максимальное количество наград, которое может выбрать пользователь"
     enable_whispers: "Разрешать персоналу создавать скрытые сообщения в темах."
@@ -1717,7 +1717,7 @@ ru:
     discourse_connect_overrides_website: "Перезаписывать веб-сайт пользователя данными с DiscourseConnect и запретить их изменение."
     discourse_connect_overrides_profile_background: "Перезаписывать фон шапки профиля значением, используемым в DiscourseConnect."
     discourse_connect_overrides_card_background: "Перезаписывать фон карточки пользователя значением, используемым в DiscourseConnect."
-    discourse_connect_not_approved_url: "Перенаправлять неподтверждённые DiscourseConnect-аккаунты на этот URL"
+    discourse_connect_not_approved_url: "Перенаправлять неподтверждённые учётные записи DiscourseConnect на этот URL"
     discourse_connect_allows_all_return_paths: "Не вводить ограничения для параметра return_paths на доменное имя, предоставляемое DiscourseConnect (по умолчанию возврат должен осуществляться на текущий сайт)"
     enable_local_logins: "Включить локальные учётные записи на основе имени пользователя и пароля. ВНИМАНИЕ: если параметр отключён, вы не сможете войти в систему, если ранее не был настроен хотя бы один альтернативный метод входа."
     enable_local_logins_via_email: "Разрешать пользователям запрашивать получение ссылки для входа в систему по электронной почте."
@@ -1930,7 +1930,7 @@ ru:
     topic_view_duration_hours: "Считать все просмотры темы как один просмотр, если просмотры происходят с одного IP-адреса в течение указанного здесь количества часов."
     user_profile_view_duration_hours: "Считать все просмотры профиля пользователя как один просмотр, если просмотры происходят с одного IP-адреса в течение указанного здесь количества часов."
     levenshtein_distance_spammer_emails: "Количество символов, на которое могут различаться сообщения, если проводится нечёткое сравнение текста при проверке писем на спам."
-    max_new_accounts_per_registration_ip: "Если обнаружено указанное здесь количество аккаунтов с уровнем доверия 0, использующих общий IP-адрес (и ни один аккаунт не принадлежит сотрудникам или пользователям с уровнем доверия 2 и выше), прекратить регистрацию новых аккаунтов с этого IP-адреса. Для отключения параметра установите значение в 0."
+    max_new_accounts_per_registration_ip: "Если обнаружено указанное здесь количество учётных записей с уровнем доверия 0, использующих общий IP-адрес (и ни одна учётная запись не принадлежит сотрудникам или пользователям с уровнем доверия 2 и выше), прекратить регистрацию новых учётных записей с этого IP-адреса. Для отключения параметра установите значение в 0."
     min_ban_entries_for_roll_up: "Создавать новую запись запрета подсети, если в списке адресов есть указанное здесь количество записей."
     max_age_unmatched_emails: "Удалять отфильтрованные письма после указанного здесь количества дней."
     max_age_unmatched_ips: "Удалять отфильтрованные IP-адреса после указанного здесь количества дней."
@@ -1959,15 +1959,15 @@ ru:
     display_name_on_email_from: "Отображать в поле 'От' полные имена отправителей электронных писем"
     unsubscribe_via_email: "Разрешать пользователям отказываться от подписки на электронные письма, отправив электронное письмо, содержащее 'unsubscribe' в теме или теле письма"
     unsubscribe_via_email_footer: "Отображать ссылку на отписку под текстом отправляемого письма"
-    delete_email_logs_after_days: "Удалять записи из журнала Email спустя указанное количество дней. Укажите 0, если необходимо хранить записи неограниченное количество времени."
+    delete_email_logs_after_days: "Удалять записи из журнала эл. почты спустя указанное количество дней. Укажите 0, если необходимо хранить записи неограниченное количество времени."
     disallow_reply_by_email_after_days: "Запретить ответ по электронной почте через указанное количество дней. Укажите 0, если запрет не нужен."
-    max_emails_per_day_per_user: "Максимальное количество Email, отправляемых пользователям в течение дня. Укажите 0, если необходимо отключить это ограничение."
+    max_emails_per_day_per_user: "Максимальное количество эл. писем, отправляемых пользователям в течение дня. Укажите 0, если необходимо отключить это ограничение."
     enable_staged_users: "Автоматически создавать сымитированных пользователей при обработке входящих писем."
     maximum_staged_users_per_email: "Максимальное количество сымитированных пользователей, создаваемых при обработке входящих писем."
     maximum_recipients_per_new_group_email: "Блокировать входящие письма со слишком большим количеством получателей."
     auto_generated_allowlist: "Перечень адресов электронной почты, которые не будут проверяться на автоматически сгенерированный контент. Пример: foo@bar.com|discourse@bar.com"
-    block_auto_generated_emails: "Блокировать входящие Email, идентифицированные как автоматически созданные."
-    ignore_by_title: "Игнорировать входящие Email по их заголовку."
+    block_auto_generated_emails: "Блокировать входящие эл. письма, идентифицированные как автоматически созданные."
+    ignore_by_title: "Игнорировать входящие эл. письма по их заголовку."
     mailgun_api_key: "Секретный ключ API Mailgun, используемый для проверки сообщений вебхука."
     soft_bounce_score: "Количество возвратов, добавляемых пользователю при непостоянных возвратах писем."
     hard_bounce_score: "Количество возвратов, добавляемых пользователю при постоянных возвратах писем."
@@ -1990,10 +1990,10 @@ ru:
     pop3_polling_ssl: "Использовать SSL при подключении к POP3-серверу. (Рекомендуется)"
     pop3_polling_openssl_verify: "Проверять сертификат сервера TLS (по умолчанию: включено)"
     pop3_polling_period_mins: "Период в минутах между проверками учетной записи POP3 на наличие электронных писем. ВНИМАНИЕ: требуется перезапуск."
-    pop3_polling_port: "Порт учетной записи POP3 для загрузки e-mail."
-    pop3_polling_host: "Хост учетной записи POP3 для загрузки e-mail."
-    pop3_polling_username: "Имя пользователя, или логин, учетной записи POP3 для загрузки e-mail."
-    pop3_polling_password: "Пароль учетной записи POP3 для загрузки e-mail."
+    pop3_polling_port: "Порт учётной записи POP3 для загрузки эл. писем."
+    pop3_polling_host: "Хост учётной записи POP3 для загрузки эл. писем."
+    pop3_polling_username: "Имя пользователя, или логин, учётной записи POP3 для загрузки эл. писем."
+    pop3_polling_password: "Пароль учётной записи POP3 для загрузки эл. писем."
     pop3_polling_delete_from_server: "Удалять электронную почту с сервера. ПРИМЕЧАНИЕ: при отключении этого параметра необходимо вручную очищать почтовый ящик"
     log_mail_processing_failures: "Записывать все ошибки обработки электронной почты в файл <a href='%{base_path}/logs' target='_blank'>журнала</a>"
     email_in: 'Разрешать пользователям публиковать новые темы по электронной почте (требуется автоматическая или ручная проверка почтового ящика - POP3). Настройте адреса на вкладке «Настройки» каждого раздела.'
@@ -2018,17 +2018,17 @@ ru:
     delete_user_self_max_post_count: "Максимальное количество сообщений, которое пользователь может иметь при удалении собственной учётной записи. Установите это значение в -1, если необходимо отключить возможность удаления собственной учётной записи."
     username_change_period: "Максимальное количество дней после регистрации, в течение которых пользователи могут менять свой псевдоним (установите это значение в 0, если необходимо запретить изменение псевдонимов)."
     email_editable: "Позволять пользователям изменять адрес электронной почты после регистрации."
-    logout_redirect: "Адрес страницы для перенаправления после выхода из аккаунта (например: https://example.com/logout)"
+    logout_redirect: "Адрес страницы для перенаправления после выхода из учётной записи (например: https://примерная_ссылка.ком/выход)"
     allow_uploaded_avatars: "Разрешать пользователям загружать свои собственные аватары."
     default_avatars: "URL для аватара, который будет использован по умолчанию для новых пользователей, пока они его не поменяют."
     automatically_download_gravatars: "Скачивать Gravatar пользователя при создании учётной записи или изменении электронного адреса."
-    digest_topics: "Максимальное количество популярных тем, отображаемых в Email-дайджесте."
+    digest_topics: "Максимальное количество популярных тем, отображаемых в дайджесте по эл. почте."
     digest_posts: "Максимальное количество популярных сообщений, отображаемых в Email-дайджесте."
-    digest_other_topics: "Максимальное количество тем для отображения в разделе Email-дайджеста \"Новые темы и разделы, за которыми вы следите\"."
+    digest_other_topics: "Максимальное количество тем для отображения в разделе дайджеста по эл. почте «Новые темы и разделы, за которыми вы следите»."
     digest_min_excerpt_length: "Минимальная длина отрывка сообщения в Email-дайджесте (количество символов)."
     suppress_digest_email_after_days: "Не рассылать Email-дайджест для пользователей, не появлявшихся на форуме более указанного здесь количества дней."
-    digest_suppress_categories: "Не отображать содержимое этих разделов в Email-дайджесте."
-    disable_digest_emails: "Отключить Email-дайджест для всех пользователей."
+    digest_suppress_categories: "Не отображать содержимое этих разделов в дайджесте по эл. почте."
+    disable_digest_emails: "Отключить дайджест по эл. почте для всех пользователей."
     apply_custom_styles_to_digest: "Применять пользовательский Email-шаблон и CSS к Email-дайджестам."
     email_accent_bg_color: "Цвет фона, отображаемого в электронных письмах, созданных в формате HTML. Введите название цвета («red») или его шестнадцатеричное значение («#FF0000»)."
     email_accent_fg_color: "Цвет текста, отображаемого в электронных письмах, созданных в формате HTML. Введите название цвета («white») или его шестнадцатеричное значение («#FFFFFF»)."
@@ -2180,10 +2180,10 @@ ru:
     retry_web_hook_events: "Автоматически повторять неудачные события вебхука 4 раза. Промежуток времени между повторными попытками составляет 1, 5, 25 и 125 минут."
     revoke_api_keys_days: "Количество дней до автоматического отзыва неиспользованного ключа API (0 - никогда)"
     allow_user_api_keys: "Разрешить создание пользовательских API-ключей"
-    allow_user_api_key_scopes: "Список областей, разрешенных для пользовательских API-ключей"
+    allow_user_api_key_scopes: "Список областей, разрешённых для пользовательских API-ключей"
     min_trust_level_for_user_api_key: "Уровень доверия, необходимый для генерации API-ключей пользователя"
-    allowed_user_api_auth_redirects: "Разрешенный URL для перенаправления аутентификации для API-ключей пользователя. Подстановочный знак * может использоваться для соответствия любой его части (например, www.example.com/*)."
-    allowed_user_api_push_urls: "Разрешенные URL-адреса для отправки на сервер к пользовательскому API"
+    allowed_user_api_auth_redirects: "Разрешённый URL для перенаправления аутентификации для API-ключей пользователя. Подстановочный знак * может использоваться для соответствия любой его части (например, www.example.com/*)."
+    allowed_user_api_push_urls: "Разрешённые URL-адреса для отправки на сервер к пользовательскому API"
     expire_user_api_keys_days: "Количество дней до автоматического истечения срока действия API-ключа (0 - никогда)"
     tagging_enabled: "Включить теги для тем?"
     min_trust_to_create_tag: "Минимальный уровень доверия для создания тега."
@@ -2215,7 +2215,7 @@ ru:
     short_title: "Краткое название будет использоваться на домашней странице, в панели запуска или в других местах, где пространство может быть ограничено. Оно должен быть не более 12 символов."
     dashboard_hidden_reports: "Разрешать скрывать отдельные отчёты из админки."
     dashboard_visible_tabs: "Закладки, которые будут отображаться в админке."
-    dashboard_general_tab_activity_metrics: "Выберите отчёты, отображаемые в метриках активности на основной вкладке админки."
+    dashboard_general_tab_activity_metrics: "Отчёты, отображаемые в метриках активности на основной вкладке админки."
     gravatar_name: "Название провайдера Gravatar"
     gravatar_base_url: "URL базы API провайдера Gravatar"
     gravatar_login_url: "URL относительно gravatar_base_url, который предоставляет пользователю логин для службы Gravatar"
@@ -2291,7 +2291,7 @@ ru:
         key: "www.example.com"
         value: "Ключ DiscourseConnect"
   search:
-    extreme_load_error: "Сайт сильно загружен, поиск отключен, попробуйте повторить позже"
+    extreme_load_error: "Сайт сильно загружен, поиск отключён, попробуйте повторить позже"
     within_post: "#%{post_number} от пользователя %{username}"
     types:
       category: "Разделы"
@@ -2308,7 +2308,7 @@ ru:
     timeout_expired: "Время авторизации истекло, пожалуйста, попробуйте войти снова."
     no_email: "Адрес электронной почты не указан. Пожалуйста, свяжитесь с администратором сайта."
     blank_id_error: "Параметр 'external_id' является обязательным, но он не установлен"
-    email_error: "Аккаунт не может быть зарегистрирован с электронным адресом <b>%{email}</b>. Пожалуйста, свяжитесь с администратором сайта."
+    email_error: "Учётная запись не может быть зарегистрирована с электронным адресом <b>%{email}</b>. Пожалуйста, свяжитесь с администратором сайта."
     missing_secret: "Сбой аутентификации из-за отсутствия ключа. Обратитесь к администраторам сайта для решения этой проблемы."
     invite_redeem_failed: "Не удалось осуществить приглашение по ссылке. Пожалуйста, свяжитесь с администратором сайта."
   original_poster: "Автор"
@@ -2440,15 +2440,15 @@ ru:
     security_key_no_matching_credential_error: "В указанном ключе безопасности не найдено подходящих учётных данных."
     security_key_support_missing_error: "Ваше текущее устройство или браузер не поддерживает использование ключей безопасности. Пожалуйста, используйте другой метод."
     security_key_invalid: "При проверке ключа безопасности произошла ошибка."
-    not_approved: "Ваша учетная запись ещё не одобрена. Вы получите электронное письмо, когда появится возможность войти под своей учетной записью."
+    not_approved: "Ваша учётная запись ещё не одобрена. Вы получите электронное письмо, когда появится возможность войти под своей учётной записью."
     incorrect_username_email_or_password: "Неверное имя пользователя, адрес электронной почты или пароль"
     incorrect_password: "Неверный пароль"
-    wait_approval: "Спасибо за регистрацию. Мы оповестим вас, когда ваша учетная запись будет одобрена."
-    active: "Ваша учетная запись активирована и готова к использованию."
-    activate_email: "<p>Почти готово! Мы выслали письмо на <b>%{email}</b>. Пожалуйста, следуйте инструкциям в этом письме для активации вашей учетной записи.</p><p>Если письмо не пришло, пожалуйста, проверьте папку \"спам\", или попробуйте войти ещё раз, чтобы выслать активационное письмо повторно.</p>"
-    not_activated: "Вы пока что не можете войти на сайт. Пожалуйста, следуйте инструкциям по активации учетной записи, которые мы отправили вам электронной почтой."
-    not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве пользователя %{username} запрещен."
-    admin_not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве администратора запрещен."
+    wait_approval: "Спасибо за регистрацию. Мы оповестим вас, когда ваша учётная запись будет одобрена."
+    active: "Ваша учётная запись активирована и готова к использованию."
+    activate_email: "<p>Почти готово! Мы выслали письмо на <b>%{email}</b>. Пожалуйста, следуйте инструкциям в этом письме для активации вашей учётной записи.</p><p>Если письмо не пришло, пожалуйста, проверьте папку \"спам\", или попробуйте войти ещё раз, чтобы выслать активационное письмо повторно.</p>"
+    not_activated: "Вы пока что не можете войти на сайт. Пожалуйста, следуйте инструкциям по активации учётной записи, которые мы отправили вам электронной почтой."
+    not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве пользователя %{username} запрещён."
+    admin_not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве администратора запрещён."
     reset_not_allowed_from_ip_address: "Запрос на сброс пароля с этого IP-адреса запрещён."
     suspended: "Вы не можете войти до %{date}."
     suspended_with_reason: "Учётная запись заморожена до %{date}: %{reason}"
@@ -2457,17 +2457,17 @@ ru:
     not_available: "Недоступно. Попробуйте %{suggestion}?"
     something_already_taken: "Что-то пошло не так, возможно, имя пользователя или электронный ящик уже используются. Попробуйте восстановить ваш пароль."
     omniauth_error:
-      generic: "Извините, произошла ошибка при авторизации вашего аккаунта. Пожалуйста, попробуйте ещё раз."
+      generic: "Извините, произошла ошибка при авторизации вашей учётной записи. Пожалуйста, попробуйте ещё раз."
       csrf_detected: "Время авторизации истекло, или вы использовали другой браузер для входа в систему. Пожалуйста, попробуйте ещё раз."
       request_error: "Произошла ошибка при запуске авторизации. Пожалуйста, попробуйте ещё раз."
       invalid_iat: "Невозможно проверить токен авторизации из-за разницы часов сервера. Пожалуйста, попробуйте ещё раз."
     omniauth_error_unknown: "В процессе входа на сайт произошла ошибка. Пожалуйста, повторите попытку."
     omniauth_confirm_title: "Войти, используя %{provider}"
     omniauth_confirm_button: "Продолжить"
-    authenticator_error_no_valid_email: "Нет разрешённых e-mail адресов, связанных с учётной записью %{account}. Вам необходимо настроить учётную запись с помощью другого e-mail адреса."
+    authenticator_error_no_valid_email: "Нет разрешённых эл. адресов, связанных с учётной записью %{account}. Вам необходимо настроить учётную запись с помощью другого эл. адреса."
     new_registrations_disabled: "Новые регистрации сейчас недоступны."
     password_too_long: "Максимальная длина пароля - 200 символов."
-    email_too_long: "E-mail, который Вы указали, слишком длинный. Имя почтового ящика должно быть не длиннее 254 символов, а доменное имя не более 253 символов."
+    email_too_long: "Эл. почта, которую вы указали, слишком длинная. Имя почтового ящика должно быть не длиннее 254 символов, а доменное имя не более 253 символов."
     wrong_invite_code: "Вы указали неверный код приглашения."
     reserved_username: "Такой псевдоним не разрешён."
     missing_user_field: "Вы не заполнили все поля пользователя"
@@ -2516,7 +2516,7 @@ ru:
       one: "Автоматически деактивируется после %{count} дня бездействия"
       few: "Автоматически деактивируется после %{count} дней бездействия"
       many: "Автоматически деактивируется после %{count} дней бездействия"
-      other: "Автоматически деактивируется после %{count} дней бездействия"
+      other: "Автоматически выключается после %{count} дней бездействия"
     activated_by_staff: "Включено персоналом"
     new_user_typed_too_fast: "Новый пользователь печатает слишком быстро"
     content_matches_auto_silence_regex: "Содержимое соответствует регулярному выражению автоматической блокировки первых сообщений"
@@ -2525,7 +2525,7 @@ ru:
       short: "должно быть как минимум %{min} знаков"
       long: "должно быть не более %{max} знаков"
       too_long: "слишком длинное"
-      characters: "может содержать только цифры, буквы, тире, точки и символ подчеркивания"
+      characters: "может содержать только цифры, буквы, тире, точки и символ подчёркивания"
       unique: "должно быть уникально"
       blank: "не может быть пустым"
       must_begin_with_alphanumeric_or_underscore: "должно начинаться с буквы, цифры или символа подчёркивания"
@@ -2536,7 +2536,7 @@ ru:
       invalid: "неверен."
       not_allowed: "недопустим в этом почтовом домене. Пожалуйста, используйте другой адрес."
       blocked: "не разрешён."
-      revoked: "Отправка e-mail на адрес '%{email}' не будет осуществляться до %{date}."
+      revoked: "Отправка эл. писем на адрес «%{email}» не будет осуществляться до %{date}."
       does_not_exist: "Нет данных"
     ip_address:
       blocked: "Новые регистрации запрещены с вашего IP-адреса."
@@ -2562,7 +2562,13 @@ ru:
   unsubscribe_mailer:
     title: "Отписаться от рассылки"
     subject_template: "Подтвердите, что вы больше не желаете получать обновления по электронной почте с сайта %{site_title}"
-    text_body_template: "Кто-то (возможно, вы?) попросил больше не отправлять обновления по электронной почте с сайта %{site_domain_name} на этот адрес.\nЕсли вы хотите подтвердить это, перейдите по ссылке: \n\n%{confirm_unsubscribe_link}\n\nЕсли вы хотите продолжать получать обновления по электронной почте, вы можете проигнорировать это письмо.\n"
+    text_body_template: |
+      Кто-то (возможно, вы?) попросил больше не отправлять обновления по электронной почте с сайта %{site_domain_name} на этот адрес.
+      Если вы хотите подтвердить это, перейдите по ссылке:
+
+      %{confirm_unsubscribe_link}
+
+      Если вы хотите продолжать получать обновления по электронной почте, вы можете проигнорировать это письмо.
   invite_mailer:
     title: "Приглашение к дискуссии"
     subject_template: "%{inviter_name} пригласил вас присоединиться к теме '%{topic_title}' на сайте %{site_domain_name}"
@@ -2640,25 +2646,25 @@ ru:
       Нажмите на эту ссылку, чтобы выбрать пароль:
        %{base_url}/u/password-reset/%{email_token}
 
-       (Если срок действия указанной выше ссылки истек, выберите ссылку «Я забыл свой пароль» при входе на сайт и укажите свой адрес электронной почты.)
+       (Если срок действия указанной выше ссылки истёк, выберите ссылку «Я забыл свой пароль» при входе на сайт и укажите свой адрес электронной почты.)
   download_backup_mailer:
     title: "Загрузка резервной копии"
     subject_template: "[%{email_prefix}] загрузка резервной копии сайта"
     text_body_template: |
       Вот ссылка на запрошенную вами загрузку [резервной копии сайта] (%{backup_file_path}).
 
-      В целях безопасности мы отправили эту ссылку на ваш подтвержденный адрес электронной почты .
+      В целях безопасности мы отправили эту ссылку на ваш подтверждённый адрес электронной почты .
 
       (Если вы *не запрашивали* эту загрузку, то это лишний повод для беспокойства - кто-то посторонний имеет административный доступ к вашему сайту.)
     no_token: |
-      Извините, но ссылка на скачивание резервной копии уже была использована или срок её действия истек.
+      Извините, но ссылка на скачивание резервной копии уже была использована или срок её действия истёк.
   admin_confirmation_mailer:
     title: "Подтверждение учётной записи Администратора"
-    subject_template: "[%{email_prefix}] Подтверждение новой учетной записи Администратора"
+    subject_template: "[%{email_prefix}] Подтверждение новой учётной записи Администратора"
     text_body_template: |
-      Подтвердите, что вы хотите предоставить пользователю ** %{target_username} (%{target_email}) ** административные права на вашем форуме.
+      Подтвердите, что вы хотите предоставить пользователю **%{target_username} (%{target_email})** административные права на вашем форуме.
 
-       [Подтвердить учётную запись администратора] (%{admin_confirm_url})
+       [Подтвердить учётную запись администратора](%{admin_confirm_url})
   test_mailer:
     title: "Отправка тестового письма"
     subject_template: "[%{email_prefix}] Проверка доставки электронного письма"
@@ -2681,12 +2687,12 @@ ru:
     title: "Установка обновления"
     subject_template: "[%{email_prefix}] Доступна новая версия Discourse"
     text_body_template: |
-      Ура, доступна свежая версия [Discourse](https://www.discourse.org) !
+      Ура, доступна свежая версия [Discourse](https://www.discourse.org)!
 
       Установленная версия: %{installed_version}
       Новая версия: **%{new_version}**
 
-      - Обновитесь, используя наш способ онлайн-обновления** [в один клик](%{base_url}/admin/upgrade)**
+      - Обновитесь, используя наш способ онлайн-обновления **[в один клик](%{base_url}/admin/upgrade)**
 
       - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/main)
 
@@ -2695,12 +2701,12 @@ ru:
     title: "Установка обновления (описание обновления прилагается)"
     subject_template: "[%{email_prefix}] доступно обновление с подробным описанием новой версии"
     text_body_template: |
-      Ура, доступна свежая версия [Discourse](https://www.discourse.org) !
+      Ура, доступна свежая версия [Discourse](https://www.discourse.org)!
 
       Установленная версия: %{installed_version}
       Новая версия: **%{new_version}**
 
-      - Обновитесь, используя наш способ онлайн-обновления** [в один клик](%{base_url}/admin/upgrade)**
+      - Обновитесь, используя наш способ онлайн-обновления **[в один клик](%{base_url}/admin/upgrade)**
 
       - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/main)
 
@@ -2720,7 +2726,7 @@ ru:
       spam: "Ваше сообщение расценено как **спам**. Сообщество считает, что ваше сообщение не имеет отношения к теме, не является актуальным и носит рекламный характер."
       notify_moderators: "Ваше сообщение отправлено на **премодерацию**. Сообщество считает, что ваше сообщение требует отдельного внимания модератора."
   flags_dispositions:
-    agreed: "Спасибо за информацию. Мы согласны, что это проблема, и уже рассматриваем ее."
+    agreed: "Спасибо за информацию. Мы согласны, что это проблема, и уже рассматриваем её."
     agreed_and_deleted: "Спасибо за информацию - мы согласны с вами и уже удалили сообщение."
     disagreed: "Спасибо за информацию. Уже рассматриваем."
     ignored: "Спасибо за информацию. Уже рассматриваем."
@@ -2862,7 +2868,7 @@ ru:
       text_body_template: |
         Привет. Мы видим, что вы были заняты чтением нашего форума, что нам весьма приятно, поэтому мы повысили вас до [уровня доверия 1](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
 
-        Мы очень рады, что вы проводите время с нами, и мы хотели бы узнать о вас больше. Найдите минутку, чтобы [заполнить свой профиль](%{base_url}/my/preferences/profile) и не стесняйтесь [начать новую тему](%{base_url} /categories).
+        Мы очень рады, что вы проводите время с нами, и мы хотели бы узнать о вас больше. Найдите минутку, чтобы [заполнить свой профиль](%{base_url}/my/preferences/profile) и не стесняйтесь [начать новую тему](%{base_url}/categories).
     welcome_staff:
       title: "Приветствуем нового сотрудника форума"
       subject_template: "Поздравляем, вы получили статус '%{role}'!"
@@ -2871,14 +2877,14 @@ ru:
 
         У роли '%{role}' есть доступ к <a href='%{base_url}/admin' target='_blank'>интерфейсу администратора</a>.
 
-         С большой властью приходит большая ответственность. Если роль модератора для вас в новинку - обратитесь к [Руководству модератора](https://meta.discourse.org/t/discourse-moderation-guide/63116).
+         С большой силой приходит большая ответственность. Если роль модератора для вас в новинку - обратитесь к [Руководству модератора](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Приветствуем приглашённого пользователя форума"
       subject_template: "Добро пожаловать на сайт %{site_name}!"
       text_body_template: |
         Благодарим Вас за принятие приглашения на сайт %{site_name} и - добро пожаловать!
 
-         - Для Вас мы создали новую учетную запись - **%{username}**. Измените свое имя или пароль, посетив [ваш профиль пользователя][prefs].
+         - Для Вас мы создали новую учётную запись - **%{username}**. Измените своё имя или пароль, посетив [ваш профиль пользователя][prefs].
 
          - При входе в систему, пожалуйста **используйте тот же адрес электронной почты, что был в исходном приглашении** - иначе мы не сможем убедиться в том, что это именно вы!
 
@@ -2973,7 +2979,7 @@ ru:
 
         %{download_link}
 
-        Приведенная выше ссылка для скачивания будет действовать в течение 48 часов.
+        Приведённая выше ссылка для скачивания будет действовать в течение 48 часов.
 
         Данные сжаты в zip-архив. Если архив не является самораспаковывающимся, используйте эту рекомендуемую утилиту: https://www.7-zip.org/
     csv_export_failed:
@@ -3193,8 +3199,8 @@ ru:
 
         Если для учётной записи электронной почты POP есть веб-интерфейс, вам может потребоваться войти в сеть и проверить свои настройки через веб-интерфейс.
     email_revoked:
-      title: "E-mail отозван"
-      subject_template: "Ваш E-mail правильный?"
+      title: "Эл. письмо отозвано"
+      subject_template: "Ваша эл. почта правильно указана?"
       text_body_template: |
         Приносим извинения, но мы не можем связаться с вами по электронной почте. Наши последние несколько электронных писем были возвращены как недоставленные.
 
@@ -3231,7 +3237,7 @@ ru:
          За дополнительными рекомендациями обращайтесь к [основным принципам сообщества](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Слишком много жалоб на сообщения пользователя (TL3)"
-      subject_template: "Новый аккаунт временно заблокирован"
+      subject_template: "Новая учётная запись временно заблокирована"
       text_body_template: |
         Здравствуйте,
 
@@ -3581,28 +3587,28 @@ ru:
         %{message}
     account_suspended:
       title: "Учётная запись заморожена"
-      subject_template: "[%{email_prefix}] Ваш аккаунт был заморожен"
+      subject_template: "[%{email_prefix}] Ваша учётная запись была заморожена"
       text_body_template: |
         Вы были заморожены на форуме до %{suspended_till}.
 
         Причина: %{reason}
     account_suspended_forever:
       title: "Учётная запись заморожена"
-      subject_template: "[%{email_prefix}] Ваш аккаунт был заморожен"
+      subject_template: "[%{email_prefix}] Ваша учётная запись была заморожена"
       text_body_template: |
         Вы были отстранены от форума.
 
         Причина: %{reason}
     account_silenced:
       title: "Учётная запись заблокирована"
-      subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
+      subject_template: "[%{email_prefix}] Ваша учётная запись была заблокирована"
       text_body_template: |
         Вы были заблокированы на форуме до %{silenced_till}.
 
         Причина: %{reason}
     account_silenced_forever:
       title: "Учётная запись заблокирована"
-      subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
+      subject_template: "[%{email_prefix}] Ваша учётная запись была заблокирована"
       text_body_template: |
         Вы были заблокированы на форуме.
 
@@ -3622,7 +3628,7 @@ ru:
       title: "Двухфакторная аутентификация отключена"
       subject_template: "[%{email_prefix}] Двухфакторная аутентификация отключена"
       text_body_template: |
-        В вашем аккаунте на сайте %{site_name} отключена двухфакторная аутентификация. Теперь вы можете войти только с вашим паролем; дополнительный код аутентификации больше не требуется.
+        В вашей учётной записи на сайте %{site_name} отключена двухфакторная аутентификация. Теперь вы можете войти только с вашим паролем; дополнительный код аутентификации больше не требуется.
 
         Если вы не отключали двухфакторную аутентификацию, возможно, кто-то скомпрометировал вашу учётную запись.
 
@@ -3687,7 +3693,7 @@ ru:
         %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Учётная запись создана"
-      subject_template: "[%{email_prefix}] Ваш новый аккаунт"
+      subject_template: "[%{email_prefix}] Ваша новая учётная запись"
       text_body_template: |
         Для вас была создана новая учётная запись по адресу %{site_name}.
 
@@ -3730,7 +3736,7 @@ ru:
 
         Подтвердите свой текущий адрес электронной почты для сайта %{site_name}, нажав на следующую ссылку:
 
-        %{base_url}/u/verify-old-email/%{email_token}
+        %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Уведомление на старый адрес электронной почты"
       subject_template: "[%{email_prefix}] Ваш адрес электронной почты был изменён"
@@ -3756,7 +3762,7 @@ ru:
       text_body_template: |
         Добро пожаловать на сайт %{site_name}!
 
-         Сотрудник подтвердил ваш аккаунт на сайте %{site_name}.
+         Сотрудник подтвердил вашу учётную запись на сайте %{site_name}.
 
         Теперь вы можете получить доступ к своей учётной записи, войдя по адресу:
         %{base_url}.
@@ -3765,7 +3771,7 @@ ru:
 
         %{new_user_tips}
 
-        Старайесь следовать [основным принципам нашего сообщества](%{base_url}/guidelines).
+        Старайтесь следовать [основным принципам нашего сообщества](%{base_url}/guidelines).
 
          Приятного времяпровождения!
     signup_after_reject:
@@ -3881,10 +3887,10 @@ ru:
     exceeded_emails_limit: "Превышен лимит max_emails_per_day_per_user"
     exceeded_bounces_limit: "Превышен лимит bounce_score_threshold"
     mailing_list_no_echo_mode: "Уведомления о рассылке отключены для собственных сообщений пользователя"
-    user_email_no_user: "Не удалось найти пользователя с id %{user_id}"
-    user_email_post_not_found: "Не удалось найти сообщение с id %{post_id}"
+    user_email_no_user: "Не удалось найти пользователя с ID %{user_id}"
+    user_email_post_not_found: "Не удалось найти сообщение с ID %{post_id}"
     user_email_anonymous_user: "Анонимный пользователь"
-    user_email_user_suspended_not_pm: "Пользователь заморожен"
+    user_email_user_suspended_not_pm: "Заморожен пользователь, но не личное сообщение"
     user_email_seen_recently: "Пользователь был недавно на форуме"
     user_email_notification_already_read: "Уведомление, о котором говорится в этом письме, уже прочтено"
     user_email_notification_topic_nil: "Тема сообщения равна nil"
@@ -4122,85 +4128,85 @@ ru:
     body: |
       <a name="collect"></a>
 
-      ## [What information do we collect?](#collect)
+      ## [Какую информацию мы собираем?](#collect)
 
-      We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.
+      Мы собираем информацию от вас, когда вы регистрируетесь на нашем сайте, и собираем данные, когда вы участвуете в форуме, читая, пиша и оценивая контент, которым здесь делятся.
 
-      When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
+      При регистрации на нашем сайте вас могут попросить ввести своё имя и адрес электронной почты. Однако вы можете посещать наш сайт без регистрации. Ваш адрес электронной почты будет проверен с помощью письма, содержащего уникальную ссылку. Если эта ссылка будет посещена, мы будем знать, что вы контролируете адрес электронной почты.
 
-      When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
+      При регистрации и размещении сообщений мы фиксируем IP-адрес, с которого пришло сообщение. Мы также можем сохранять журналы сервера, которые включают IP-адрес каждого запроса к нашему серверу.
 
       <a name="use"></a>
 
-      ## [What do we use your information for?](#use)
+      ## [Для чего мы используем вашу информацию?](#использование)
 
-      Any of the information we collect from you may be used in one of the following ways:
+      Любая информация, которую мы собираем от вас, может быть использована одним из следующих способов:
 
-      * To personalize your experience &mdash; your information helps us to better respond to your individual needs.
-      * To improve our site &mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.
-      * To improve customer service &mdash; your information helps us to more effectively respond to your customer service requests and support needs.
-      * To send periodic emails &mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.
+      * Для персонализации вашего опыта &mdash; ваша информация помогает нам лучше реагировать на ваши индивидуальные потребности.
+      * Для улучшения нашего сайта &mdash; мы постоянно стремимся улучшить предложения нашего сайта на основе информации и отзывов, которые мы получаем от вас.
+      * Для улучшения обслуживания клиентов &mdash; ваша информация помогает нам более эффективно отвечать на ваши запросы и потребности в поддержке.
+      * Для периодической отправки электронных писем &mdash; Указанный вами адрес электронной почты может использоваться для отправки тебе информации, уведомлений по вашему запросу об изменениях в темах или в ответ на ваше имя пользователя, ответов на запросы и/или другие просьбы или вопросы.
 
       <a name="protect"></a>
 
-      ## [How do we protect your information?](#protect)
+      ## [Как мы защищаем вашу информацию?](#protect)
 
-      We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
+      Мы применяем различные меры безопасности для поддержания безопасности вашей личной информации, когда вы вводите, отправляете или получаете доступ к вашей личной информации.
 
       <a name="data-retention"></a>
 
-      ## [What is your data retention policy?](#data-retention)
+      ## [Какова ваша политика хранения данных?](#data-retention)
 
-      We will make a good faith effort to:
+      Мы будем прилагать добросовестные усилия, чтобы:
 
-      * Retain server logs containing the IP address of all requests to this server no more than 90 days.
-      * Retain the IP addresses associated with registered users and their posts no more than 5 years.
+      * Сохранять журналы сервера, содержащие IP-адрес всех запросов к этому серверу, не более 90 дней.
+      * Хранить IP-адреса, связанные с зарегистрированными пользователями и их сообщениями, не более 5 лет.
 
       <a name="cookies"></a>
 
-      ## [Do we use cookies?](#cookies)
+      ## [Используем ли мы cookies?](#cookies)
 
-      Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+      Да. Cookies - это небольшие файлы, которые сайт или его поставщик услуг передаёт на жесткий диск вашего компьютера через ваш веб-браузер (если вы разрешили). Эти куки позволяют сайту распознать ваш браузер и, если у вас есть зарегистрированная учётная запись, связать его с вашей зарегистрированной учётной записью.
 
-      We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.
+      Мы используем куки, чтобы понять и сохранить ваши предпочтения для будущих посещений и собрать совокупные данные о посещаемости сайта и взаимодействии с ним, чтобы в будущем мы могли предложить лучшие возможности и инструменты сайта. Мы можем заключать контракты со сторонними поставщиками услуг, чтобы помочь нам лучше понять посетителей нашего сайта. Этим поставщикам услуг не разрешается использовать информацию, собранную от нашего имени, кроме как для помощи нам в ведении и улучшении нашего бизнеса.
 
       <a name="disclose"></a>
 
-      ## [Do we disclose any information to outside parties?](#disclose)
+      ## [Раскрываем ли мы какую-либо информацию сторонним лицам?](#disclose)
 
-      We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.
+      Мы не продаём, не торгуем и не передаём сторонним лицам вашу персонально идентифицируемую информацию. Это не касается доверенных третьих лиц, которые помогают нам в работе нашего сайта, ведении бизнеса или обслуживании вас, при условии, что эти лица согласны сохранять конфиденциальность этой информации. Мы также можем раскрыть вашу информацию, если считаем, что это необходимо для соблюдения закона, обеспечения соблюдения политик нашего сайта или защиты наших или чужих прав, собственности или безопасности. Однако неличная информация о посетителях может быть предоставлена другим сторонам для маркетинга, рекламы или других целей.
 
       <a name="third-party"></a>
 
-      ## [Third party links](#third-party)
+      ## [Сторонние ссылки](#third-party)
 
-      Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.
+      Иногда, по нашему усмотрению, мы можем включать или предлагать сторонние продукты или услуги на нашем сайте. Эти сторонние сайты имеют отдельную и независимую политику конфиденциальности. Поэтому мы не несём никакой ответственности или обязательств за содержание и деятельность этих сайтов, на которые ведут ссылки. Тем не менее, мы стремимся защитить целостность нашего сайта и приветствуем любые отзывы об этих сайтах.
 
       <a name="coppa"></a>
 
-      ## [Children's Online Privacy Protection Act Compliance](#coppa)
+      ## [Соблюдение закона о защите конфиденциальности детей в Интернете](#coppa)
 
-      Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), do not use this site.
+      Наш сайт, продукты и услуги предназначены для людей не моложе 13 лет. Если этот сервер находится в США, а вам меньше 13 лет, в соответствии с требованиями COPPA ([Children's Online Privacy Protection Act](https://ru.wikipedia.org/wiki/Children’s_Online_Privacy_Protection_Act)), не пользуйтесь этим сайтом.
 
       <a name="online"></a>
 
-      ## [Online Privacy Policy Only](#online)
+      ## [Только политика конфиденциальности в Интернете](#online)
 
-      This online privacy policy applies only to information collected through our site and not to information collected offline.
+      Эта онлайн политика конфиденциальности распространяется только на информацию, собранную через наш сайт, и не распространяется на информацию, собранную оффлайн.
 
       <a name="consent"></a>
 
-      ## [Your Consent](#consent)
+      ## [Ваше согласие](#consent)
 
-      By using our site, you consent to our web site privacy policy.
+      Используя наш сайт, вы соглашаетесь с политикой конфиденциальности нашего сайта.
 
       <a name="changes"></a>
 
-      ## [Changes to our Privacy Policy](#changes)
+      ## [Изменения в нашей политике конфиденциальности](#changes)
 
-      If we decide to change our privacy policy, we will post those changes on this page.
+      Если мы решим изменить нашу политику конфиденциальности, мы опубликуем эти изменения на этой странице.
 
-      This document is CC-BY-SA. It was last updated May 31, 2013.
+      Этот документ имеет статус CC-BY-SA. Последний раз он был обновлён 31 мая 2013 года.
   badges:
     mass_award:
       errors:
@@ -4247,7 +4253,7 @@ ru:
       name: Автобиограф
       description: Заполнил <a href="%{base_uri}/my/preferences/profile">профиль</a> пользователя
       long_description: |
-        Эта награда выдается при заполнении <a href="%{base_uri}/my/preferences/profile">вашего профиля </a> и выборе аватара. Если вы сообщите больше информации о том, кто вы есть, и что вас интересует, это поможет создать лучшее, более сплочённое сообщество. Присоединяйтесь к нам!
+        Эта награда выдаётся при заполнении <a href="%{base_uri}/my/preferences/profile">вашего профиля </a> и выборе аватара. Если вы сообщите больше информации о том, кто вы есть, и что вас интересует, это поможет создать лучшее, более сплочённое сообщество. Присоединяйтесь к нам!
     anniversary:
       name: Годовщина
       description: Активный пользователь в течении года, создал как минимум одну тему.
@@ -4277,57 +4283,57 @@ ru:
       name: Хорошая тема
       description: Получил 25 симпатий за тему
       long_description: |
-        Эта награда выдается, когда ваша тема получает 25 симпатий. Вы начали оживленную беседу, вокруг которой сплотилось сообщество.
+        Эта награда выдаётся, когда ваша тема получает 25 симпатий. Вы начали оживлённую беседу, вокруг которой сплотилось сообщество.
     great_topic:
       name: Отличная тема
       description: Получил 50 симпатий за тему
       long_description: |
-        Эта награда выдается, когда ваша тема получает 50 симпатий. Вы начали увлекательную беседу, и сообществу весьма понравилась оживленная дискуссия!
+        Эта награда выдаётся, когда ваша тема получает 50 симпатий. Вы начали увлекательную беседу, и сообществу весьма понравилась оживлённая дискуссия!
     nice_share:
       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: Понравилось сообщение
       long_description: |
-        Эта награда выдается один раз, когда вам нравится публикация и вы используете кнопку :heart:. Подобные действия - это отличный способ сообщить участникам сообщества, что они опубликовали интересную, полезную, классную или веселую статью!
+        Эта награда выдаётся один раз, когда вам нравится публикация и вы используете кнопку :heart:. Подобные действия - это отличный способ сообщить участникам сообщества, что они опубликовали интересную, полезную, классную или весёлую статью!
     first_flag:
       name: Первая жалоба
       description: Оставил жалобу на сообщение
       long_description: |
-        Эта награда выдается при выставлении первой жалобы. Если вы заметили какие-либо сообщение, требующие внимания модератора по любой причине, пожалуйста, не стесняйтесь воспользоваться кнопкой 'Пожаловаться'. Если вы видите нарушение, :flag_black: то сообщите об этом!
+        Эта награда выдаётся при выставлении первой жалобы. Если вы заметили какие-либо сообщение, требующие внимания модератора по любой причине, пожалуйста, не стесняйтесь воспользоваться кнопкой 'Пожаловаться'. Если вы видите нарушение, :flag_black: то сообщите об этом!
     promoter:
       name: Промоутер
       description: Пригласил нового пользователя
       long_description: |
-        Эта награда выдается, когда вы приглашаете кого-то присоединиться к сообществу с помощью кнопки приглашения на вашей странице пользователя или в нижней части темы. Приглашение друзей, которых могут заинтересовать конкретные дискуссии, это отличный способ представить новых людей нашему сообществу, поэтому  - спасибо!
+        Эта награда выдаётся, когда вы приглашаете кого-то присоединиться к сообществу с помощью кнопки приглашения на вашей странице пользователя или в нижней части темы. Приглашение друзей, которых могут заинтересовать конкретные дискуссии, это отличный способ представить новых людей нашему сообществу, поэтому  - спасибо!
     campaigner:
       name: Активист
       description: Пригласил 3 новичков
       long_description: |
-        Эта награда выдается, когда вы пригласили 3 новичков, которые впоследствии провели достаточно времени на сайте, чтобы стать обычными пользователями. Живое сообщество нуждается в регулярном вливании новичков, которые постоянно участвуют в форуме и добавляют новую ценность общению.
+        Эта награда выдаётся, когда вы пригласили 3 новичков, которые впоследствии провели достаточно времени на сайте, чтобы стать обычными пользователями. Живое сообщество нуждается в регулярном вливании новичков, которые постоянно участвуют в форуме и добавляют новую ценность общению.
     champion:
       name: Чемпион
       description: Пригласил 5 участников
       long_description: |
-        Эта награда выдается, когда вы пригласили 5 человек, которые впоследствии провели достаточно времени на сайте, чтобы стать полноправными участниками. Вот это да! Спасибо за расширение круга общения нашего сообщества!
+        Эта награда выдаётся, когда вы пригласили 5 человек, которые впоследствии провели достаточно времени на сайте, чтобы стать полноправными участниками. Вот это да! Спасибо за расширение круга общения нашего сообщества!
     first_share:
       name: Первый пиар
       description: Поделился сообщением
       long_description: |
-        Эта награда выдается при первом предоставлении ссылки на ответ или тему с помощью кнопки 'Поделиться'. Обмен ссылками - отличный способ показать интересные дискуссии остальному миру и развить свое сообщество.
+        Эта награда выдаётся при первом предоставлении ссылки на ответ или тему с помощью кнопки 'Поделиться'. Обмен ссылками - отличный способ показать интересные дискуссии остальному миру и развить своё сообщество.
     first_link:
       name: Первая ссылка
       description: Добавил ссылку на другую тему
@@ -4337,7 +4343,7 @@ ru:
       name: Первая цитата
       description: Процитировал сообщение
       long_description: |
-        Эта награда выдается при первом цитировании сообщения в вашем ответе. Цитирование соответствующих частей более ранних сообщений в вашем ответе помогает поддерживать связь между ответом и остальным содержанием. Самый простой способ процитировать - это выделить часть сообщения, а затем нажать на кнопку 'Ответить с цитированием'. Цитируйте щедро!
+        Эта награда выдаётся при первом цитировании сообщения в вашем ответе. Цитирование соответствующих частей более ранних сообщений в вашем ответе помогает поддерживать связь между ответом и остальным содержанием. Самый простой способ процитировать - это выделить часть сообщения, а затем нажать на кнопку 'Ответить с цитированием'. Цитируйте щедро!
     read_guidelines:
       name: Прочитал основные принципы сообщества
       description: Читал <a href="%{base_uri}/guidelines">основные принципы сообщества</a>
@@ -4352,32 +4358,32 @@ ru:
       name: Популярная ссылка
       description: Опубликовал ссылку на внешний ресурс, которую открыли более 50 раз
       long_description: |
-        Эта награда выдается, когда ссылка, которой вы поделились, получает 50 кликов. Спасибо за размещение полезной ссылки, которая добавила интересный контекст в разговор!
+        Эта награда выдаётся, когда ссылка, которой вы поделились, получает 50 кликов. Спасибо за размещение полезной ссылки, которая добавила интересный контекст в разговор!
     hot_link:
       name: Горячая ссылка
       description: Опубликовал ссылку на внешний ресурс, которую открыли более 300 раз
       long_description: |
-        Эта награда выдается, когда ссылка, которой вы поделились, получает 300 кликов. Спасибо за размещение увлекательной ссылки, которая подтолкнула разговор вперед и осветила дискуссию!
+        Эта награда выдаётся, когда ссылка, которой вы поделились, получает 300 кликов. Спасибо за размещение увлекательной ссылки, которая подтолкнула разговор вперёд и осветила дискуссию!
     famous_link:
       name: Легендарная ссылка
       description: Опубликовал ссылку на внешний ресурс, которую открыли более 1000 раз
       long_description: |
-        Эта награда выдается, когда ссылка, которой вы поделились, получает 1000 кликов. Вот это да! Вы разместили ссылку, которая значительно улучшила разговор, добавив важные детали, контекст и информацию. Отличная работа!
+        Эта награда выдаётся, когда ссылка, которой вы поделились, получает 1000 кликов. Вот это да! Вы разместили ссылку, которая значительно улучшила разговор, добавив важные детали, контекст и информацию. Отличная работа!
     appreciated:
       name: Оценённый
       description: Получил 1 симпатию, отправив 20 сообщений
       long_description: |
-        Эта награда выдается, когда вы получаете хотя бы одну симпатию за 20 различных сообщений. Сообщество наслаждается вашим вкладом в дискуссии!
+        Эта награда выдаётся, когда вы получаете хотя бы одну симпатию за 20 различных сообщений. Сообщество наслаждается вашим вкладом в дискуссии!
     respected:
       name: Уважаемый
       description: Получил 2 симпатии, отправив 100 сообщений
       long_description: |
-        Эта награда выдается, когда вы получаете хотя бы 2 симпатии за 100 различных сообщений. Сообщество всё больше уважает ваш значительный вклад в дискуссии.
+        Эта награда выдаётся, когда вы получаете хотя бы 2 симпатии за 100 различных сообщений. Сообщество всё больше уважает ваш значительный вклад в дискуссии.
     admired:
       name: Почитаемый
       description: Получил 5 симпатий, отправив 300 сообщений
       long_description: |
-        Эта награда выдается, когда вы получаете хотя бы 5 симпатий за 300 различных сообщений. Ух ты! Сообщество восхищается вашим постоянным и высококачественным вкладом в дискуссии.
+        Эта награда выдаётся, когда вы получаете хотя бы 5 симпатий за 300 различных сообщений. Ух ты! Сообщество восхищается вашим постоянным и высококачественным вкладом в дискуссии.
     out_of_love:
       name: За любовь
       description: Использовано %{max_likes_per_day} доступных ежедневных симпатий
@@ -4402,12 +4408,12 @@ ru:
       name: Взаимная симпатия
       description: Выразил 100 симпатий и 100 симпатий получил взамен
       long_description: |
-        Эта награда выдается, когда вы получили 100 симпатий и 100 или более симпатий выразили взамен. Спасибо за вашу поддержку!
+        Эта награда выдаётся, когда вы получили 100 симпатий и 100 или более симпатий выразили взамен. Спасибо за вашу поддержку!
     empathetic:
       name: Чуткий
       description: Получил 500 симпатий за сообщения и выразил 1000 симпатий
       long_description: |
-        Эта награда выдается, когда вы получили 500 симпатий и 1000 или более симпатий выразили взамен. Вот это да! Вы просто образец щедрости и взаимного обожания :two_hearts:.
+        Эта награда выдаётся, когда вы получили 500 симпатий и 1000 или более симпатий выразили взамен. Вот это да! Вы просто образец щедрости и взаимного обожания :two_hearts:.
     first_emoji:
       name: Первый эмодзи
       description: Использовал эмодзи в сообщении
@@ -4417,7 +4423,7 @@ ru:
       name: Первое обращение
       description: Упомянул пользователя в сообщении
       long_description: |
-        Эта награда выдается при первом упоминании чьего-либо @username в вашем сообщении. Каждое упоминание создаёт уведомление для этого человека, чтобы он знал о вашем сообщении. Просто начните вводить @ (как символ), чтобы упомянуть любого пользователя или, если это разрешено, группу - это удобный способ привлечь внимание.
+        Эта награда выдаётся при первом упоминании чьего-либо @username в вашем сообщении. Каждое упоминание создаёт уведомление для этого человека, чтобы он знал о вашем сообщении. Просто начните вводить @ (как символ), чтобы упомянуть любого пользователя или, если это разрешено, группу - это удобный способ привлечь внимание.
     first_onebox:
       name: Первая умная вставка
       description: Опубликовал ссылку, которая была преобразована в умную вставку
@@ -4425,29 +4431,29 @@ ru:
         Эта награда выдаётся при первом размещении ссылки в отдельной строке, которая автоматически разворачивается в умную вставку, содержащую сводку, заголовок и (при наличии) изображение.
     first_reply_by_email:
       name: Первый ответ по почте
-      description: Ответил на пост по электронной почте
+      description: Ответил на публикацию по электронной почте
       long_description: |
-        Эта награда выдается при первом ответе на сообщение по e-mail :e-mail:.
+        Эта награда выдаётся при первом ответе на сообщение по e-mail :e-mail:.
     new_user_of_the_month:
       name: "Новый пользователь месяца"
       description: Великолепный вклад за первый месяц
       long_description: |
-        Эта награда выдается, чтобы поздравить двух новых пользователей каждый месяц за их отличный общий вклад, измеряемый тем, как часто их сообщения нравились, и кому.
+        Эта награда выдаётся, чтобы поздравить двух новых пользователей каждый месяц за их отличный общий вклад, измеряемый тем, как часто их сообщения нравились, и кому.
     enthusiast:
       name: Энтузиаст
       description: Посещал форум 10 дней подряд
       long_description: |
-        Эта награда выдается при посещении форума 10 дней подряд. Спасибо, что остаетесь с нами более недели!
+        Эта награда выдаётся при посещении форума 10 дней подряд. Спасибо, что остаётесь с нами более недели!
     aficionado:
       name: Поклонник
       description: Посещал форум 100 дней подряд
       long_description: |
-        Эта награда выдается при посещении форума 100 дней подряд. Это более трех месяцев!
+        Эта награда выдаётся при посещении форума 100 дней подряд. Это более трёх месяцев!
     devotee:
       name: Преданный
       description: Посещал форум 365 дней подряд
       long_description: |
-        Этот награда выдается при посещении форума 365 дней подряд. Ух ты, целый год!
+        Этот награда выдаётся при посещении форума 365 дней подряд. Ух ты, целый год!
     badge_title_metadata: "%{display_name} награду на %{site_title}"
   admin_login:
     success: "Письмо отправлено"
@@ -4458,8 +4464,8 @@ ru:
     submit_button: "Отправить письмо"
     safe_mode: "Безопасный режим: отключение всех тем и плагинов при входе в систему"
   performance_report:
-    initial_post_raw: Эта тема содержит ежедневные отчеты активности форума.
-    initial_topic_title: Отчеты активности форума
+    initial_post_raw: Эта тема содержит ежедневные отчёты активности форума.
+    initial_topic_title: Отчёты активности форума
   tags:
     title: "Теги"
     restricted_tag_disallowed: 'Вы не можете применить тег «%{tag}».'
@@ -4511,7 +4517,7 @@ ru:
       no_emails: "К сожалению,  в процессе установки не была указана электронная почта Администратора, поэтому завершение установки может быть проблематично. Укажите электронный адрес в файле конфигурации или <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>создайте административную учётную запись из командной строки</a>."
     confirm_email:
       title: "Подтвердите адрес вашей электронной почты"
-      message: "<p> Мы отправили письмо для активации на адрес <b>%{email}</b>. Пожалуйста, следуйте инструкциям в электронном письме, чтобы активировать свою учетную запись. </p><p> Если письмо не приходит, проверьте папку со спамом и <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>убедитесь, что вы правильно настроили электронную почту</a>. </p>"
+      message: "<p> Мы отправили письмо для активации на адрес <b>%{email}</b>. Пожалуйста, следуйте инструкциям в электронном письме, чтобы активировать свою учётную запись. </p><p> Если письмо не приходит, проверьте папку со спамом и <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>убедитесь, что вы правильно настроили электронную почту</a>. </p>"
     resend_email:
       title: "Отправить повторно письмо для активации"
       message: "<p> Мы повторно отправили письмо для активации на адрес <b>%{email}</b>"
@@ -4628,7 +4634,7 @@ ru:
       invites:
         title: "Пригласить персонал"
         description: "Вы почти закончили! Давайте пригласим сюда людей, которые помогут вам <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>начать обсуждение </a> с интересных тем и ответов, чтобы ваше сообщество начало работу."
-        disabled: "Поскольку локальные учетные записи отключены, отправлять приглашения кому-либо невозможно. Пожалуйста, перейдите к следующему шагу."
+        disabled: "Поскольку локальные учётные записи отключены, отправлять приглашения кому-либо невозможно. Пожалуйста, перейдите к следующему шагу."
       finished:
         title: "Ваш форум готов к обсуждениям!"
         description: |
@@ -4637,7 +4643,7 @@ ru:
           <p>Хорошего дня и удачи <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>в создании нового сообщества!</a></p>
   search_logs:
     graph_title: "Количество поисковых запросов"
-  joined: "Вступил"
+  joined: "Вступил(-а)"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} упомянул вас в теме "%{topic}" - %{site_title}'
@@ -4654,7 +4660,7 @@ ru:
   staff_action_logs:
     not_found: "не найдено"
     unknown: "неизвестно"
-    user_merged: "Пользователь %{username} был объединен с этой учетной записью"
+    user_merged: "Пользователь %{username} был объединён с этой учётной записью"
     user_delete_self: "Пользователь удалил свою учётную запись на сайте %{url}"
     webhook_deactivation_reason: "Ваш вебхук был автоматически выключен. Мы получили несколько ответов «%{status}» о состоянии HTTP."
     api_key:
@@ -4756,13 +4762,13 @@ ru:
       approve_user:
         title: "Утвердить пользователя"
       reject_user:
-        title: "Удалить пользователя..."
+        title: "Удаление пользователя..."
         delete:
           title: "Удалить пользователя"
           description: "Пользователь будет удалён с форума."
         block:
           title: "Удалить и заблокировать пользователя"
-          description: "Пользователь будет удалён; мы заблокируем его IP-адрес и e-mail."
+          description: "Пользователь будет удалён; мы заблокируем его IP-адрес и эл. почту."
       reject:
         title: "Отклонить"
         bundle_title: "Отклонить..."
@@ -4788,7 +4794,7 @@ ru:
   discord:
     not_in_allowed_guild: "Ошибка аутентификации. Вы не являетесь членом разрешённой гильдии Discord."
   old_keys_reminder:
-    title: "Напоминание о старых учетных данных"
+    title: "Напоминание о старых учётных данных"
     body: |
       Здравствуйте! Это обычное ежегодное напоминание в целях обеспечения безопасности вашего экземпляра Discourse.
 
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 81587c367e..8339bc4365 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -61,7 +61,7 @@ zh_CN:
     ember_selector_error: "抱歉 - 不允许使用 #ember 或 .ember-view CSS 选择器，因为这些名称是在运行时动态生成的，并且会随着时间变化，最终会导致 CSS 损坏。尝试其他选择器。"
     import_error:
       generic: 导入该主题时发生错误
-      upload: "创建上传资产时出错：%{name}。%{errors}"
+      upload: "创建上传资源时出错：%{name}。%{errors}"
       about_json: "导入错误：about.json 不存在或无效。确定这是一个 Discourse 主题码？"
       about_json_values: "about.json 包含无效值：%{errors}"
       modifier_values: "about.json 修饰符包含无效值：%{errors}"
@@ -1299,7 +1299,7 @@ zh_CN:
         qtt_like: 获赞
       description: "从各种用户收到赞最多的前 10 名用户。"
   dashboard:
-    group_email_credentials_warning: '群组 <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> 的电子邮件凭证有问题。在此问题解决之前，不会从群组收件箱发送电子邮件。%{error}'
+    group_email_credentials_warning: '群组 <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> 的电子邮件凭据有问题。在此问题解决之前，不会从群组收件箱发送电子邮件。%{error}'
     rails_env_warning: "您的服务器正在以%{env}模式运行。"
     host_names_warning: "您的 config/database.yml 文件使用的是默认的 localhost 主机名。请更新为您的站点主机名。"
     sidekiq_warning: 'Sidekiq 未运行。许多任务，例如发送电子邮件，是通过 Sidekiq 异步执行的。请确保至少运行一个 Sidekiq进程。<a href="https://github.com/mperham/sidekiq" target="_blank">在此处了解 Sidekiq</a>。'
@@ -1571,7 +1571,7 @@ zh_CN:
     google_oauth2_client_secret: "您的 Google 应用的客户端密钥。"
     google_oauth2_prompt: "可选的以空格分隔的字符串值列表，指定授权服务器是否提示用户进行重新身份验证和同意。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'> https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> 了解可能的值。"
     google_oauth2_hd: "登录将受限的可选 Google Apps 托管网域。请参阅 <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> 以了解详情。"
-    google_oauth2_hd_groups: "（实验性）在进行身份验证时检索用户在托管网域上的 Google 群组。检索到的 Google 群组可用于自动授予 Discourse 群组成员资格。有关更多信息，请参阅 https://meta.discourse.org/t/226850"
+    google_oauth2_hd_groups: "（实验性）在进行身份验证时检索用户在托管网域上的 Google 群组。检索到的 Google 群组可用于自动授予 Discourse 群组成员资格（请参见群组设置）。有关更多信息，请参阅 https://meta.discourse.org/t/226850"
     google_oauth2_hd_groups_service_account_admin_email: "属于 Google Workspace 管理员帐号的电子邮件地址。将与服务帐户凭据一起使用以获取群组信息。"
     google_oauth2_hd_groups_service_account_json: "服务帐户的 JSON 格式密钥信息。将用于获取群组信息。"
     enable_twitter_logins: "启用 Twitter 身份验证，需要 twitter_consumer_key 和 twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395' target='_blank'>为 Discourse 配置 Twitter 登录（和丰富的嵌入）</a>。"
@@ -2594,7 +2594,7 @@ zh_CN:
         %{flagged_post_raw_content}
         ```
 
-        请阅读我们的[社区准则](%{base_url}/guidelines)以了解详情。
+        请查阅我们的[社区准则](%{base_url}/guidelines)以了解详情。
     flags_agreed_and_post_deleted_for_responders:
       title: "管理人员从被举报的帖子中移除了回复"
       subject_template: "管理人员从被举报的帖子中移除了回复"
@@ -2617,7 +2617,7 @@ zh_CN:
         %{flagged_post_response_raw_content}
         ``
 
-        关于移除原因的详细信息，请查看我们的[社区准则](%{base_url}/guidelines)。
+        关于移除原因的详细信息，请查阅我们的[社区准则](%{base_url}/guidelines)。
     usage_tips:
       text_body_template: |
         有关作为新用户入门的一些快速提示，请[查看此博文](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
@@ -3786,7 +3786,7 @@ zh_CN:
       * 不要在多个话题中回复同样的内容。
       * 不要发布没有内容的回复。
       * 不要在中途改变话题。
-      * 不要在您的帖子中签名 &mdash; 每一个帖子都附有您的个人信息。
+      * 不要在您的帖子中签名 &mdash; 每一个帖子都附有您的个人资料信息。
 
       比起发表“+1”或者“同意”，请使用“赞”按钮。比起将现有话题带向一个截然不同的方向，使用“作为链接话题回复”。
 
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 9e8378076f..26826072b3 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -308,6 +308,16 @@ zh_TW:
   education:
     until_posts:
       other: "%{count} 篇貼文"
+    "new-reply": |
+      歡迎來到 %{site_name} &mdash; — **感謝你的參與！**
+
+      - 務必尊重所有社群成員。
+
+      - 您的回應是否改善了討論？
+
+      - 歡迎有建設性的評論，但論述時請針對*觀點*，而別針對個人。
+
+      [請查看我們的社群守則](%{base_path}/guidelines)以進一步了解。此訊息面板只會在您發表 %{education_posts_text} 時顯示。
     avatar: |
       ### 來個大頭貼吧！
 
@@ -420,6 +430,7 @@ zh_TW:
   staff_category_name: "管理員"
   staff_category_description: "讓工作人員進行討論的私人分類。此分類下的討論話題只有管理員與板主才看得到。"
   discourse_welcome_topic:
+    title: "歡迎來到我們的社群！"
     body: |2
 
       置頂主題的第一段是訪客在主頁看到的歡迎消息。這很重要！
@@ -685,7 +696,7 @@ zh_TW:
     authorize: "授權"
     read: "閲讀"
     read_write: "讀/寫"
-    description: '“%{application_name}”正在請求訪問你的賬戶中的以下權限：'
+    description: '“%{application_name}”要求存取您帳號中的以下權限：'
     instructions: '系統熱騰騰產生了新的使用者API鑰匙給您使用，請將以下API鑰匙貼到您的應用程式裡。'
     otp_description: '你要允許進入%{application_name}這個網站嗎？'
     otp_confirmation:
@@ -1090,7 +1101,7 @@ zh_TW:
     editing_grace_period_max_diff: "編輯寬限期允許的字元更改的最大數量，如果有更多的更改，將另儲存為另一個版本的修訂（信任等級0和1）"
     editing_grace_period_max_diff_high_trust: "編輯寬限期允許的最大字元更改數，如果更改將另存為另一個修訂版（信任級別2和更高）"
     staff_edit_locks_post: "如果版主編輯過貼文，貼文將被鎖定編輯"
-    edit_history_visible_to_public: "允許任何人查看編輯過的貼文的舊版本。當禁用時，只有職員才能查看。"
+    edit_history_visible_to_public: "允許任何人查看編輯過的貼文的舊版本。當禁用時，只有工作成員才能查看。"
     delete_removed_posts_after: "貼文被作者刪除，將在 (n) 小時後被自動刪除。如果設置為 0，貼文將被立即刪除。"
     max_image_width: "貼文中最大的縮圖寬度"
     max_image_height: "貼文中的允許圖片最大的縮圖高度"
@@ -1143,6 +1154,8 @@ zh_TW:
     markdown_linkify_tlds: "自動設為連結的最上層網域列表"
     post_undo_action_window_mins: "允許使用者還原貼文上近期動作（讚、標記等）的時間長度（分鐘數）。"
     must_approve_users: "新註冊用戶必須由管理員進行審核，才能進行相關操作"
+    invite_code: "使用者必須輸入此代碼才能被允許註冊帳號，留空時將忽略（不分大小寫）"
+    persistent_sessions: "關閉網頁瀏覽器時，使用者將保持登入狀態"
     maximum_session_age: "使用者自訪問後可維持登錄 n 小時"
     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>"
     cors_origins: "允許跨來源資源共享（CORS）。每個來源必須包括 http:// 或 https://。DISCOURSE_ENABLE_CORS 環境選項必須設置為 true 才能啟用 CORS 。"
@@ -1160,7 +1173,7 @@ zh_TW:
     post_menu: "確定在貼文功能表條包含哪些條目，以及排列順序。例如：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "貼文菜單中默認隱藏的按鈕，點擊省略號後顯示。"
     share_links: "決定在分享對話方塊裡顯示哪些項目、以什麼順序顯示。"
-    site_contact_username: "論壇給使用者自動發送消息時使用的使用者名；如果留空將使用預設的系統賬戶。"
+    site_contact_username: "以一個有效的工作成員帳號來發送所有自動化消息。如果保留空白，則會使用預設的系統帳號。"
     site_contact_group_name: "有效的群組名稱將自動被加入到所有自動發送的訊息。"
     send_welcome_message: "給所有使用者發送快速開始指導的消息"
     send_tl1_welcome_message: "向新使用者（信任級別1）發送歡迎消息。"
@@ -1178,9 +1191,9 @@ zh_TW:
     email_token_valid_hours: "\"忘記密碼\" / \"重啟帳號\" token 有效的小時數 (n)"
     enable_badges: "啟用勳章系統"
     enable_whispers: "允許工作人員在主題中私密交流。"
-    blocked_email_domains: "用管道符“|”分隔的郵箱域名黑名單列表，其中的域名將不能用來註冊賬戶，例如：mailinator.com|trashmail.net"
+    blocked_email_domains: "不允許以豎線“|”分隔的電子郵件網域清單內的使用者註冊帳號。範例：mailinator.com|trashmail.net"
     allowed_email_domains: "用管道符“|”分隔的電子郵箱域名的列表，使用者必須使用這些郵箱域名註冊。警告：使用者使用不包含在這個列表裡的郵箱域名，將無法成功註冊。"
-    log_out_strict: "登出時，登出使用者所有設備上的所有時段"
+    log_out_strict: "登出時，登出使用者所有設備上的所有連線階段"
     version_checks: "當 Discourse 有推新的版本需要更新時，顯示在 <a href='%{base_path}/admin' target='_blank'>/admin/</a>Dashboard 上以提示管理員"
     new_version_emails: "當新版本發佈時，將會發送一封新的 EMail 至 contact_email 設定的位址"
     invite_expiry_days: "多少天以內使用者的邀請碼是有效的"
@@ -1195,9 +1208,10 @@ zh_TW:
     password_unique_characters: "密碼必須包含英文字"
     block_common_passwords: "不允許使用 10,000 個最常用的密碼"
     discourse_connect_overrides_bio: "在使用者頁面中覆蓋使用者的個人信息並禁止使用者修改"
+    enable_local_logins: "啟用本機使用者名稱和密碼登入型帳戶。警告：如果停用，如果您先前尚未設定至少一種替代登入方法，則可能無法登入。"
     enable_local_logins_via_email: "允許使用者用電子郵件來快速登入，Email內會包含一鍵登入連結。"
     allow_new_registrations: "允許新使用者註冊，如果取消選取，則沒有人能夠註冊"
-    enable_signup_cta: "顯示推薦創建賬戶的提示給那些回訪的未註冊使用者。"
+    enable_signup_cta: "顯示推薦創建帳號的提示給那些回訪的未註冊使用者。"
     enable_google_oauth2_logins: "啟用Google Oauth2身份驗證。 這是Google目前支持的身份驗證方法，若啟用將可以讓使用者使用 Google帳號登入，需要額外設定key和鑰匙（secret）。 請參閱<a href='https://meta.discourse.org/t/15858' target='_blank'>設定Google Login for Discourse</a>。"
     google_oauth2_client_id: "你的 Google 應用程式的客戶端 ID"
     google_oauth2_client_secret: "你的 Google 應用程式的客戶端 secret"
@@ -1398,11 +1412,11 @@ zh_TW:
     pop3_polling_enabled: "輪詢 POP3 收取郵件回覆。"
     pop3_polling_ssl: "連接至 POP3 伺服器時使用 SSL。（推薦）"
     pop3_polling_openssl_verify: "驗證伺服器的 TLS 證書（預設：啟用）"
-    pop3_polling_period_mins: "查詢用於郵件的 POP3 賬戶的間隔（以分鐘計）。注意：需要重新啟動。"
-    pop3_polling_port: "POP3 輪詢賬戶連接埠。"
+    pop3_polling_period_mins: "查詢用於郵件的 POP3 帳號的間隔（以分鐘計）。注意：需要重新啟動。"
+    pop3_polling_port: "POP3 輪詢帳號連接埠。"
     pop3_polling_host: "需用 POP3 向該地址輪詢電子郵件的主機。"
-    pop3_polling_username: "輪詢 POP3 賬戶所用的使用者名。"
-    pop3_polling_password: "輪詢 POP3 賬戶所用的密碼。"
+    pop3_polling_username: "POP3 帳戶用來輪詢電子郵件的使用者名稱。"
+    pop3_polling_password: "POP3 帳戶用來輪詢電子郵件的密碼。"
     pop3_polling_delete_from_server: "從Server端刪除電子郵件。注意：如果禁用此功能，則需要手動清理收件匣。"
     log_mail_processing_failures: "將所有電子郵件處理失敗記錄到<a href='%{base_path}/logs' target='_blank'>/logs</a>"
     email_in: '允許使用者通過電子郵件建立討論話題（需要手動設定或定期從pop3向伺服器擷取訊息）。在每個類別的“設定”選項中設定地址。'
@@ -1440,7 +1454,7 @@ zh_TW:
     group_in_subject: "在電子郵件中設定%%{optional_pm} ，取決於私訊中第一個群組的名稱，請參閱：<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>客製化標準電子郵件的格式</a>"
     allow_anonymous_posting: "允許使用者切換至匿名模式"
     anonymous_posting_min_trust_level: "啟用匿名發帖所需的最小信任等級"
-    anonymous_account_duration_minutes: "為了匿名性，為每個使用者每 N 分鐘創建一個匿名賬戶。例如：如果設置為 600，只要發帖後 600 分鐘到了，並且使用者切換至了匿名模式，就會創建一個新的匿名賬戶。"
+    anonymous_account_duration_minutes: "為了匿名性，為每個使用者每 N 分鐘創建一個匿名帳號。例如：如果設置為 600，只要發帖後 600 分鐘到了，並且使用者切換至了匿名模式，就會創建一個新的匿名帳號。"
     hide_user_profiles_from_public: "不對來訪使用者顯示使用者信息卡、使用者資料和使用者目錄。"
     show_inactive_accounts: "允許登入使用者瀏覽未啟用帳戶的使用者個人檔案。"
     hide_suspension_reasons: "不要在使用者個人檔案上公開顯示暫停原因。"
@@ -1519,6 +1533,7 @@ zh_TW:
     default_other_external_links_in_new_tab: "預設在新的標籤頁打開外部連結"
     default_other_enable_quoting: "預設在高亮選擇文字時啟用引用回覆"
     default_other_dynamic_favicon: "預設在瀏覽器表徵圖上顯示新/更新的主題數量"
+    default_other_skip_new_user_tips: "跳過新使用者登入時的提示和徽章."
     default_other_like_notification_frequency: "預設通知使用者讚的消息"
     default_topics_automatic_unpin: "預設時當使用者到達底部時自動解除主題置頂。"
     default_categories_watching: "分類列表預設跟蹤。"
@@ -1575,7 +1590,7 @@ zh_TW:
       pop3_polling_host_is_empty: "在啟用 POP3 輪詢前，你必須設置 'pop3 polling host'。"
       pop3_polling_username_is_empty: "在啟用 POP3 輪詢前，你必須設置 'pop3 polling username'。"
       pop3_polling_password_is_empty: "在啟用 POP3 輪詢前，你必須設置 'pop3 polling password'。"
-      pop3_polling_authentication_failed: "POP3 驗證失敗。請驗證你的 pop3 賬戶信息。"
+      pop3_polling_authentication_failed: "POP3 驗證失敗。請驗證你的 pop3 帳號信息。"
       reply_by_email_address_is_empty: "在啟用郵件回覆之前，你必須設置“reply by email address”。"
       email_polling_disabled: "在啟用郵件回覆功能前，你必須啟用手動或者 POP3 輪詢。"
       user_locale_not_enabled: "你必須先設置 'allow user locale' 再啟用該設置。"
@@ -1605,9 +1620,9 @@ zh_TW:
     results_page: "「%{term}」的搜尋結果"
   discourse_connect:
     login_error: "登入錯誤"
-    not_found: "無法找到你的賬戶。請聯繫站點管理人員。"
+    not_found: "無法找到你的帳號。請聯絡網站管理人員。"
     account_not_approved: "你的帳號尚未被審核通過。一旦你的帳號獲得批准，你就會收到一封電子郵件提醒。"
-    unknown_error: "你的賬戶發生了問題。請聯繫站點管理人員。"
+    unknown_error: "你的帳號發生了問題。請聯繫網站管理人員。"
     timeout_expired: "賬戶登錄超時，請重新嘗試登錄。"
     no_email: "沒有 email 被提供，請聯繫網站的管理員。"
     email_error: "無法使用此郵件地址：<b>%{email}</b>註冊帳號，請聯絡此網站管理員"
@@ -1686,7 +1701,7 @@ zh_TW:
     not_available: "不可用，試試 %{suggestion}？"
     something_already_taken: "出了一些問題，可能此使用者名或電子郵箱已經被註冊。試試 忘記密碼 連結吧。"
     omniauth_confirm_button: "繼續"
-    authenticator_error_no_valid_email: "關聯%{account}的賬戶沒有優秀的郵件地址。你可能需要用不同的郵件地址配置你的賬戶。"
+    authenticator_error_no_valid_email: "不允許使用與 %{account} 相關聯的電子郵件地址。您可能需要使用不同的電子郵件地址設定您的帳號。"
     new_registrations_disabled: "現在不允許註冊新的帳戶"
     password_too_long: "密碼不能超過 200 個字符。"
     email_too_long: "你輸入的郵件太長了。郵箱名不得超過 254 字元，域名必須不超過 253 字元。"
@@ -2977,7 +2992,7 @@ zh_TW:
     congratulations: "祝賀，你已經安裝好了 Discourse！"
     register:
       button: "註冊"
-      title: "註冊管理員賬戶"
+      title: "註冊管理員帳號"
       no_emails: "遺憾的是，在嚮導過程中你沒有設定管理員的電子郵件，所以完善設定可能有點困難。請在設定檔案中加入開發人員的電子郵件，或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>從控制台（console）建立一個管理員帳號</a> 。"
     confirm_email:
       title: "配置你的郵件"
@@ -3005,8 +3020,11 @@ zh_TW:
           login_required:
             placeholder: "私密"
             extra_description: "使用者必須登入後才能訪問此社群"
+          invite_only:
+            placeholder: "僅限邀請"
           must_approve_users:
             placeholder: "需要審核"
+            extra_description: "使用者必須經過工作人員的批准"
       ready:
         title: "你的 Discourse 已經準備就緒！"
       styling:
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
index 334dff7f66..57937a96a5 100644
--- a/plugins/discourse-details/config/locales/server.ru.yml
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -6,6 +6,6 @@
 
 ru:
   site_settings:
-    details_enabled: 'Включить возможность скрывать текст сообщения под спойлер. Эту функцию можно найти в выпадающем меню на панели инструментов редактора. Если вы измените эту настройку, то необходимо перезаписать все сообщения, выполнив команду ''rake posts:rebake''.'
+    details_enabled: 'Включить возможность скрывать текст сообщения под спойлер. Эту функцию можно найти в выпадающем меню на панели инструментов редактора. Если вы измените эту настройку, то необходимо перезаписать все сообщения, выполнив команду «rake posts:rebake».'
   details:
     excerpt_details: "(нажмите для более подробной информации)"
diff --git a/plugins/discourse-local-dates/config/locales/client.fi.yml b/plugins/discourse-local-dates/config/locales/client.fi.yml
index 1fcdf5a972..726842b9df 100644
--- a/plugins/discourse-local-dates/config/locales/client.fi.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fi.yml
@@ -31,6 +31,7 @@ fi:
           format_title: Päivämäärän muoto
           timezone: Aikavyöhyke
           until: Asti...
+          current_timezone: "Nykyinen aikavyöhyke:"
           recurring:
             every_day: "Joka päivä"
             every_week: "Joka viikko"
@@ -40,3 +41,4 @@ fi:
             every_three_months: "Joka kolmas kuukausi"
             every_six_months: "Kuuden kuukauden välein"
             every_year: "Kerran vuodessa"
+      default_title: "%{site_name}-tapahtuma"
diff --git a/plugins/discourse-local-dates/config/locales/client.ja.yml b/plugins/discourse-local-dates/config/locales/client.ja.yml
index 5148f5b510..7237246d67 100644
--- a/plugins/discourse-local-dates/config/locales/client.ja.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ja.yml
@@ -31,6 +31,7 @@ ja:
           format_title: 日付のフォーマット
           timezone: タイムゾーン
           until: 終了日...
+          current_timezone: "現在のタイムゾーン:"
           recurring:
             every_day: "毎日"
             every_week: "毎週"
@@ -40,3 +41,4 @@ ja:
             every_three_months: "3 か月ごと"
             every_six_months: "6 か月毎"
             every_year: "毎年"
+      default_title: "%{site_name} のイベント"
diff --git a/plugins/discourse-local-dates/config/locales/server.ru.yml b/plugins/discourse-local-dates/config/locales/server.ru.yml
index 07fe7cdc4e..20f8142f5b 100644
--- a/plugins/discourse-local-dates/config/locales/server.ru.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ru.yml
@@ -9,4 +9,4 @@ ru:
     discourse_local_dates_enabled: "Включить поддержку локальных дат. Эта функция добавит поддержку дат в сообщениях, использующих элемент [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_format: "Формат, используемый для отображения даты в Email-сообщениях."
+    discourse_local_dates_email_format: "Формат, используемый для отображения даты в эл. сообщениях."
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 13a987198b..23763833af 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -84,6 +84,15 @@ fi:
       "10":
         quote: "Joskus pitää laittaa viatonkin vankilaan. Joskus täytyy poliisin laittaa viaton lusimaan. Arvovalta säilyy. Pelote säilyy. Aina siellä muutama viaton istuu, viaton pulmunen istuu siellä."
         author: "Rauno Repomies televisiosarjassa Pasila"
+      "11":
+        quote: "Rauha kotona, rauha maailmassa."
+        author: "Mustafa Kemal Atatürk"
+      "12":
+        quote: "Koulutus ei ole keino paeta köyhyyttä, se on keino taistella sitä vastaan."
+        author: "Julius Nyerere"
+      "13":
+        quote: "Tuhannen mailin matka alkaa yhdestä askeleesta."
+        author: "Laozi"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 0d94e5e30a..dacc356877 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -85,7 +85,7 @@ fr:
         quote: "Tout ce que l'esprit de l'homme peut concevoir et croire peut être atteint."
         author: "Napoleon Hill"
       "11":
-        quote: "Paix dans le pays, paix dans le monde."
+        quote: "La paix chez nous, la paix dans le monde."
         author: "Mustafa Kemal Atatürk"
       "12":
         quote: "L'éducation n'est pas un moyen d'échapper à la pauvreté. Elle est un\nmoyen de la combattre."
@@ -236,15 +236,15 @@ fr:
           >
           > L'avantage de se parler à soi-même, c'est que l'on est sûr que quelqu'un nous écoute.
           >
-          > Certaines personnes ont du talent avec des mots, et d'autres personnes... oh, euh, n'en ont pas.
+          > Certaines personnes ont du talent avec les mots, tandis que d'autres… eh bien, n'en ont pas.
 
-          Sélectionnez le texte de votre &uarr; citation préférée, et appuyez sur le bouton **Citer** qui apparaît sur votre sélection ou sur le bouton **Répondre** sous ce message.
+          Sélectionnez le texte de votre &uarr; citation préférée et appuyez sur le bouton **Citer** qui apparaît sur votre sélection ou sur le bouton **Répondre** sous ce message.
 
           Sous cette citation, ajoutez un ou deux mots pour expliquer votre choix, je suis curieux ! :thinking:
         reply: |-
           Bon travail, vous avez choisi ma citation préférée ! :left_speech_bubble:
         not_found: |-
-          Hum... je n'ai pas l'impression que vous m'ayez cité dans votre réponse ?
+          Hum… je n'ai pas l'impression que vous m'ayez cité dans votre réponse ?
 
           La sélection de n'importe quel texte dans mon message fera apparaître le bouton <kbd>**Citer**</kbd>. L'utilisation de la fonction « Répondre » avec le texte sélectionné fonctionnera également ! Pouvez-vous réessayer ?
       bookmark:
@@ -316,7 +316,7 @@ fr:
 
           - Si vous avez un clavier physique :keyboard:, appuyez sur <kbd>?</kbd> pour voir nos raccourcis clavier pratiques.
         not_found: |-
-          Hum... Il semble que vous rencontrez des difficultés. J'en suis désolé. Avez-vous cherché <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> le mot **capy&#8203;bara** ?
+          Hum… Il semble que vous rencontrez des difficultés. J'en suis désolé. Avez-vous cherché <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> le mot **capy&#8203;bara** ?
       end:
         message: |-
           Merci d'être resté(e) avec moi @%{username} ! J'ai fait ça pour vous, je pense que vous l'avez mérité :
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index f8ee1fdb53..894516d086 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -83,6 +83,15 @@ ja:
       "10":
         quote: "人の心が思い描き信じたものは何でも、実現可能である。"
         author: "ナポレオン・ヒル"
+      "11":
+        quote: "家庭に平和を、世界に平和を。"
+        author: "ムスタファ・ケマル・アタテュルク"
+      "12":
+        quote: "教育は貧困から逃れるための手段ではなく、貧困に立ち向かうための手段である。"
+        author: "ジュリアス・ニエレレ"
+      "13":
+        quote: "千里の道も一歩から。"
+        author: "老子"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 88724296ca..cc174688cf 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -23,7 +23,7 @@ ru:
       name: Лицензированный участник
       description: "Дополнительное обучение завершено"
       long_description: |
-        Эта награда выдается при успешном завершении дополнительного обучения пользователя. Вы освоили все инструменты форума, теперь вы полностью готовы к общению!
+        Эта награда выдаётся при успешном завершении дополнительного обучения пользователя. Вы освоили все инструменты форума, теперь вы полностью готовы к общению!
   discourse_narrative_bot:
     bio: "Привет, я не человек. Я бот, который может рассказать вам много интересного об этом сайте. Чтобы пообщаться со мной, отправьте мне личное сообщение или упомяните меня по имени в любом другом сообщении."
     tl2_promotion_message:
@@ -167,7 +167,7 @@ ru:
 
           - Я всего лишь робот, но [наш дружный коллектив](%{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).
       onebox:
@@ -325,7 +325,7 @@ ru:
 
           %{certificate}
 
-          Вот и все на сегодня! Не забудьте ознакомиться с [**нашими последними темами**](%{base_uri}/latest) и [**разделами**](%{base_uri}/categories). :sunglasses:
+          Вот и всё на сегодня! Не забудьте ознакомиться с [**нашими последними темами**](%{base_uri}/latest) и [**разделами**](%{base_uri}/categories). :sunglasses:
 
           (Если вы снова захотите поговорить со мной или узнать что-то ещё, отправьте мне сообщение или упомяните мой псевдоним `@%{discobot_username}` в любое время!)
       certificate:
@@ -335,9 +335,9 @@ ru:
       cert_title: "В знак признания успешного освоения расширенного руководства пользователя"
       title: ":arrow_up: Расширенные функции пользователя"
       start_message: |-
-        Как _продвинутый_ пользователь, вы уже посетили страницу [настроек вашего профиля](%{base_uri}/my/preferences), @%{username}? Там вы найдете множество интересных настроек, в том числе выбор темной или светлой темы, которые помогут сделать ваше пребывание на форуме более комфортным.
+        Как _продвинутый_ пользователь, вы уже посетили страницу [настроек вашего профиля](%{base_uri}/my/preferences), @%{username}? Там вы найдёте множество интересных настроек, в том числе выбор тёмной или светлой темы, которые помогут сделать ваше пребывание на форуме более комфортным.
 
-        Но я немного отвлекся, давайте уже начнем!
+        Но я немного отвлёкся, давайте уже начнём!
       edit:
         bot_created_post_raw: "@%{discobot_username} - безусловно, самый лучший бот, которого я знаю :wink:"
         instructions: |-
@@ -385,11 +385,11 @@ ru:
           Отлично! Эта фишка работает для всех разделов _и_ тегов (если теги включены).
       change_topic_notification_level:
         instructions: |-
-          Каждой теме присваивается свой уровень уведомлений. По умолчанию присваивается уровень 'Уведомлять', который позволяет вам получать уведомления только в том случае, если кто-то из участников темы упомянет ВАС в своем сообщении или ответит на ВАШЕ сообщение.
+          Каждой теме присваивается свой уровень уведомлений. По умолчанию присваивается уровень 'Уведомлять', который позволяет вам получать уведомления только в том случае, если кто-то из участников темы упомянет ВАС в своём сообщении или ответит на ВАШЕ сообщение.
 
           При создании личного сообщения ему присваивается самый высокий уровень уведомлений - 'Наблюдать', что означает, что вы будете получать уведомление при каждом новом ответе. При необходимости вы можете изменить уровень уведомлений для _любой_ темы на 'Наблюдать', 'Следить', 'Уведомлять' или 'Без уведомлений'.
 
-          Давайте попробуем изменить уровень уведомления нашей темы. Внизу темы вы найдете кнопку, которая показывает уровень уведомления **Наблюдать**. Не могли бы вы изменить уровень уведомления на **Следить**?
+          Давайте попробуем изменить уровень уведомления нашей темы. Внизу темы вы найдёте кнопку, которая показывает уровень уведомления **Наблюдать**. Не могли бы вы изменить уровень уведомления на **Следить**?
         not_found: |-
           Похоже, вы всё ещё наблюдаете :eyes: за этой темой! Кнопка изменения типа уведомления находится под последним сообщением этой темы.
         reply: |-
@@ -448,7 +448,7 @@ ru:
 
           %{certificate}
 
-          Это все, что я хотел сказать вам.
+          Это всё, что я хотел сказать вам.
 
           До новых встреч! Если вы захотите снова пообщаться со мной, отправьте мне сообщение в любое время :sunglasses:
       certificate:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
index 8ee79cec4a..f263eda9d1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
@@ -7,6 +7,9 @@
 zh_TW:
   site_settings:
     discourse_narrative_bot_enabled: "啟用 Discourse 機器人"
+  badges:
+    certified:
+      name: 已認證
   discourse_narrative_bot:
     quote:
       trigger: "引用"
@@ -32,3 +35,13 @@ zh_TW:
         "18": "My sources say no"
         "19": "Outlook not so good"
         "20": "Very doubtful"
+    new_user_narrative:
+      hello:
+        message: |-
+          感謝您加入 %{title}，歡迎！
+
+          - 我只是一個機器人，但是如果您需要聯繫真人的話， [我們友善工作成員們](%{base_uri}/about)也在這裡為您提供協助。
+
+          - 出於安全原因，我們暫時限制新用戶可以執行的操作。當我們了解您時，您將獲得 [新能力](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)(和 [badges](%{base_uri}/badges))。
+
+          - 我們始終相信 [文明社群行為](%{base_uri}/guidelines)。
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index 8c9a4a2abb..5e4092e358 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -43,6 +43,9 @@ fi:
       show-results:
         title: "Näytä kyselyn tulos"
         label: "Näytä tulokset"
+      remove-vote:
+        title: "Poista äänesi"
+        label: "Poista ääni"
       hide-results:
         title: "Palaa äänestysvalintaasi"
         label: "Näytä äänestys"
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index b6446e5f16..51a7bc50da 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -38,6 +38,9 @@ ja:
       show-results:
         title: "投票結果を表示する"
         label: "結果を表示する"
+      remove-vote:
+        title: "投票の削除"
+        label: "投票を削除"
       hide-results:
         title: "自分の投票に戻る"
         label: "投票を表示する"
diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index d362c112a0..b2b6978c77 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -52,7 +52,7 @@ ru:
         label: "Проголосовать!"
       show-results:
         title: "Показать результаты опроса"
-        label: "Показать результаты"
+        label: "Показывать результаты"
       remove-vote:
         title: "Удалить свой голос"
         label: "Удалить голос"
@@ -114,8 +114,8 @@ ru:
           bar: Гистограмма
           pie: Круговая
         poll_config:
-          max: Минимальный выбор
-          min: Максимальный выбор
+          max: Максимальный выбор
+          min: Минимальный выбор
           step: Шаг
         poll_public:
           label: Показывать проголосовавших (не отмечайте, если голосование анонимное)
diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml
index 872df356c1..9834232ab5 100644
--- a/plugins/poll/config/locales/server.fi.yml
+++ b/plugins/poll/config/locales/server.fi.yml
@@ -40,6 +40,13 @@ fi:
     user_cant_post_in_topic: "Et voi äänestää, koska sinulla ei ole oikeutta kirjoittaa ketjuun."
     topic_must_be_open_to_vote: "Vain avoimessa ketjussa voi äänestää."
     poll_must_be_open_to_vote: "Vain avoimessa kyselyssä voi äänestää."
+    one_vote_per_user: "Tähän kyselyyn voi antaa vain yhden äänen."
+    max_vote_per_user:
+      one: Tähän kyselyyn voi antaa vain %{count} äänen.
+      other: Tähän kyselyyn voi antaa enintään %{count} ääntä.
+    min_vote_per_user:
+      one: Tähän kyselyyn vaaditaan vähintään %{count} ääni.
+      other: Tähän kyselyyn vaaditaan vähintään %{count} ääntä.
     topic_must_be_open_to_toggle_status: "Vain avoimessa ketjussa voi muuttaa kyselyn tilaa."
     only_staff_or_op_can_toggle_status: "Vain henkilökunta tai kyselyn laatija voi muuttaa kyselyn tilaa."
     insufficient_rights_to_create: "Sinulla ei ole oikeutta luoda kyselyitä."
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index f8d731f922..015a9f5631 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -43,10 +43,10 @@ fr:
     one_vote_per_user: "Seul 1 vote est autorisé pour ce sondage."
     max_vote_per_user:
       one: Seul %{count} vote est autorisé pour ce sondage.
-      other: Pas plus de %{count} votes sont autorisés pour ce sondage.
+      other: Un maximum de %{count} votes est autorisé pour ce sondage.
     min_vote_per_user:
       one: Un minimum de %{count} vote est nécessaire pour ce sondage.
-      other: Pas moins de %{count} votes sont requis pour ce sondage.
+      other: Un minimum de %{count} votes est nécessaire pour ce sondage.
     topic_must_be_open_to_toggle_status: "Le sujet doit être ouvert pour modifier le statut."
     only_staff_or_op_can_toggle_status: "Seul(e) un(e) responsable ou le créateur ou la créatrice du sujet peuvent modifier le statut d'un sondage."
     insufficient_rights_to_create: "Vous n'avez pas la permission de créer des sondages."
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index b02675903b..cdaa048da1 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -38,9 +38,9 @@ ja:
     user_cant_post_in_topic: "このトピックに投稿できないため投票できません。"
     topic_must_be_open_to_vote: "トピックは投票できるようにオープンである必要があります。"
     poll_must_be_open_to_vote: "投票はオープンである必要があります。"
-    one_vote_per_user: "この投票には1票のみ投票できます。"
+    one_vote_per_user: "この投票には 1 票のみ投票できます。"
     max_vote_per_user:
-      other: この投票では最大 %{count} 票投票できます。
+      other: この投票では %{count} 票まで投票できます。
     min_vote_per_user:
       other: この投票には最低 %{count} 票が必要です。
     topic_must_be_open_to_toggle_status: "ステータスを切り替えるには、トピックがオープンになっている必要があります。"
diff --git a/plugins/styleguide/config/locales/client.fi.yml b/plugins/styleguide/config/locales/client.fi.yml
index 5bdd68f9f5..67b1f8e690 100644
--- a/plugins/styleguide/config/locales/client.fi.yml
+++ b/plugins/styleguide/config/locales/client.fi.yml
@@ -85,6 +85,10 @@ fi:
           title: "Yläpalkin kuvakkeet"
         spinners:
           title: "Latausnäkymät"
+        empty_state:
+          title: "Tyhjä tila"
         rich_tooltip:
+          title: "Monipuolinen työkaluvihje"
           description: "Kuvaus"
           header: "Yläpalkki"
+          hover_to_see: "Katso työkaluvihje osoittamalla"
diff --git a/plugins/styleguide/config/locales/client.ja.yml b/plugins/styleguide/config/locales/client.ja.yml
index 86742eea77..14b1792312 100644
--- a/plugins/styleguide/config/locales/client.ja.yml
+++ b/plugins/styleguide/config/locales/client.ja.yml
@@ -85,6 +85,10 @@ ja:
           title: "ヘッダーアイコン"
         spinners:
           title: "スピナー"
+        empty_state:
+          title: "エンプティステート"
         rich_tooltip:
+          title: "リッチツールヒント"
           description: "説明"
           header: "ヘッダー"
+          hover_to_see: "マウスを合わせるとツールヒントを表示"

From d0f88da9c9de358010f435d6c899f9946c5205dd Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 25 Oct 2022 14:45:37 -0400
Subject: [PATCH 276/332] FEATURE: control topic width with variables (#18743)

---
 .../common/base/personal-message.scss         |  9 ----
 .../stylesheets/common/base/reviewables.scss  |  9 ++--
 .../stylesheets/common/base/topic-post.scss   | 47 +++++++++++--------
 app/assets/stylesheets/common/base/topic.scss | 25 ++++++----
 .../common/foundation/variables.scss          |  6 +++
 .../stylesheets/desktop/topic-post.scss       | 42 ++++++++++-------
 6 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/app/assets/stylesheets/common/base/personal-message.scss b/app/assets/stylesheets/common/base/personal-message.scss
index 4f392f26d5..a1337db954 100644
--- a/app/assets/stylesheets/common/base/personal-message.scss
+++ b/app/assets/stylesheets/common/base/personal-message.scss
@@ -83,15 +83,6 @@
     margin-top: 0.5em;
   }
 
-  .small-action-desc.timegap {
-    flex: 0 0 auto;
-    padding: 0 1em;
-    margin-top: -1.75em;
-    margin-left: -1em;
-    background: var(--secondary);
-    max-width: calc(758px - 1.5em);
-  }
-
   .post-notice {
     margin-bottom: 1em;
     border: none;
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 4df2d64395..7b2a48ac70 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -350,7 +350,7 @@
 
 .reviewable-score-reason {
   margin: 0.5em 0;
-  max-width: $topic-body-width;
+  max-width: var(--topic-body-width);
   margin-bottom: 0.5em;
 }
 
@@ -358,7 +358,7 @@
   margin: 0.5em 0;
 
   .reviewable-conversation-post {
-    max-width: $topic-body-width;
+    max-width: var(--topic-body-width);
     margin-bottom: 0.5em;
 
     .username {
@@ -405,8 +405,7 @@
   .reviewable-post-header {
     display: flex;
     justify-content: space-between;
-    max-width: $topic-body-width;
-    width: $topic-body-width;
+    width: var(--topic-body-width);
     align-items: center;
 
     .reviewable-reply-to {
@@ -426,7 +425,7 @@
   }
 
   .post-body {
-    max-width: $topic-body-width;
+    max-width: var(--topic-body-width);
     max-height: 300px;
     margin-top: 0.5em;
     overflow-y: auto;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 9aebb72bd7..0468dee57b 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -35,9 +35,9 @@ $quote-share-maxwidth: 150px;
 }
 
 .placeholder-text {
-  margin-left: 11px;
+  margin-left: var(--topic-body-width-padding);
   display: inline-block;
-  width: calc(100% - 11px);
+  width: calc(100% - var(--topic-body-width-padding));
   height: 1.5em;
   margin-bottom: 0.6em;
 }
@@ -1084,7 +1084,8 @@ blockquote > *:last-child {
 }
 
 .gap {
-  padding: 0.25em 0 0.5em 56px; // 45px (topic avatar) + 11px (margin) = 56px
+  padding: 0.25em 0 0.5em
+    calc(var(--topic-avatar-width) + var(--topic-body-width-padding));
   color: var(--primary-med-or-secondary-high);
   cursor: pointer;
   text-transform: uppercase;
@@ -1120,17 +1121,20 @@ blockquote > *:last-child {
 .small-action {
   display: flex;
   align-items: center;
-  max-width: 758px;
-  border-top: 1px solid var(--primary-low);
+
+  .topic-avatar,
+  .small-action-desc {
+    border-top: 1px solid var(--primary-low);
+  }
+
   .topic-avatar {
     align-self: flex-start;
     padding: 0.7em 0;
-    border-top: none;
-    margin-right: 11px;
     flex: 0 0 auto;
+    width: var(--topic-avatar-width);
     .d-icon {
       font-size: 2em;
-      width: 45px;
+      width: var(--topic-avatar-width);
       text-align: center;
       color: var(--primary-low-mid);
     }
@@ -1145,15 +1149,18 @@ blockquote > *:last-child {
   }
 
   .small-action-desc {
+    box-sizing: border-box;
     display: flex;
     flex-wrap: wrap;
-    flex: 1 1 100%;
     align-items: center;
-    padding: 1em 0;
+    padding: 1em 0 1em var(--topic-body-width-padding);
     text-transform: uppercase;
     font-weight: bold;
     font-size: var(--font-down-1);
     color: var(--primary-medium);
+    width: calc(
+      var(--topic-body-width) + (var(--topic-body-width-padding) * 2)
+    );
     min-width: 0; // Allows flex container to shrink
 
     button {
@@ -1408,8 +1415,9 @@ a.mention-group {
 
 .signup-cta {
   box-sizing: border-box;
-  max-width: calc(#{$topic-body-width} + 4.5em);
-  padding: 3em 5em 2em 56px; // 45px (topic avatar) + 11px (margin) = 56px
+  max-width: calc(var(--topic-body-width) + 4.5em);
+  padding: 3em 5em 2em
+    calc(var(--topic-avatar-width + var(--topic-body-width-padding)));
   @include breakpoint(mobile-extra-large) {
     padding: 1.5em 1.5em 0.25em;
   }
@@ -1453,11 +1461,11 @@ a.mention-group {
   display: flex;
   width: 100%;
   max-width: calc(
-    #{$topic-body-width} + (#{$topic-body-width-padding} * 2) + #{$topic-avatar-width} -
-      (0.8em * 2)
+    var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+      var(--topic-avatar-width)
   );
-  padding: 0.8em;
-
+  padding: var(--topic-body-width-padding);
+  padding-left: 0;
   &.old {
     background-color: unset;
     color: var(--primary-medium);
@@ -1473,8 +1481,9 @@ a.mention-group {
 
   .d-icon {
     font-size: 2em;
+    width: var(--topic-avatar-width);
     color: var(--primary-high);
-    margin-right: 0.65em;
+    margin-right: var(--topic-body-width-padding);
   }
 }
 
@@ -1558,8 +1567,8 @@ a.mention-group {
   justify-content: center;
   align-items: center;
   max-width: calc(
-    #{$topic-body-width} + (#{$topic-body-width-padding} * 2) + #{$topic-avatar-width} -
-      (0.8em * 2)
+    var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+      var(--topic-avatar-width)
   );
 
   .filtered-avatar {
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 99df950ce8..183034f0bb 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -217,7 +217,10 @@ $topic-progress-height: 42px;
 .topic-timer-info {
   border-top: 1px solid var(--primary-low);
   margin: 0;
-  max-width: 758px;
+  max-width: calc(
+    var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+      var(--topic-avatar-width)
+  );
   &:empty {
     padding: 0;
   }
@@ -291,9 +294,12 @@ a.badge-category {
     display: flex;
     flex-wrap: wrap;
     box-sizing: border-box;
-    max-width: 758px;
+    max-width: calc(
+      var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+        var(--topic-avatar-width)
+    );
     #edit-title {
-      flex: 1 1 auto;
+      flex: 1 1 100%;
     }
     .category-chooser,
     .mini-tag-chooser {
@@ -304,11 +310,14 @@ a.badge-category {
       }
     }
     .mini-tag-chooser {
-      margin-left: 2%;
+      margin-left: 2%; // category/tag chooser are 49% wide, so this is 1% * 2
       @media all and (max-width: 500px) {
         margin-left: 0;
       }
     }
+    .edit-controls {
+      flex: 1 1 100%;
+    }
     .select-kit .category-row {
       max-width: unset;
     }
@@ -464,8 +473,8 @@ a.topic-featured-link {
 .topic-area {
   .pending-posts {
     max-width: calc(
-      #{$topic-body-width} + #{$topic-avatar-width} + #{$topic-body-width-padding *
-        2}
+      var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+        var(--topic-avatar-width)
     );
     .reviewable-item {
       .post-body {
@@ -480,8 +489,8 @@ a.topic-featured-link {
   justify-content: space-between;
   padding-bottom: 1em;
   max-width: calc(
-    #{$topic-body-width} + #{$topic-avatar-width} + #{$topic-body-width-padding *
-      2}
+    var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+      var(--topic-avatar-width)
   );
   align-items: center;
 
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 56627397a7..56d9b5b1fc 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -14,6 +14,12 @@ $topic-body-width-padding: 11px;
 $topic-avatar-width: 45px;
 $reply-area-max-width: 1475px !default;
 
+:root {
+  --topic-body-width: #{$topic-body-width};
+  --topic-body-width-padding: #{$topic-body-width-padding};
+  --topic-avatar-width: #{$topic-avatar-width};
+}
+
 $d-sidebar-width: 16em !default;
 
 // Brand color variables
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index c3eaebca03..3191fa32c2 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -36,11 +36,11 @@
 
 section.post-menu-area {
   position: relative;
-  padding-left: 11px;
+  padding-left: var(--topic-body-width-padding);
 }
 
 .post-links-container {
-  margin-left: 11px;
+  margin-left: var(--topic-body-width-padding);
 }
 
 nav.post-controls {
@@ -103,7 +103,9 @@ nav.post-controls {
     }
   }
   .show-replies {
-    margin-left: -11px; // negates padding-left on .cooked, for visual alignment
+    margin-left: calc(
+      var(--topic-body-width-padding) * -1
+    ); // negates padding-left on .cooked, for visual alignment
     .d-icon {
       margin-right: var(--control-icon-space);
     }
@@ -176,7 +178,6 @@ pre.codeblock-buttons:hover {
   &.bottom {
     border-top: none;
     margin-bottom: 20px;
-    margin-left: 11px;
     &.hidden {
       display: block;
       opacity: 0;
@@ -199,8 +200,11 @@ pre.codeblock-buttons:hover {
     .collapse-down {
       transform: translate(-50%, 55%);
     }
-    margin-left: 56px;
-    width: 699px;
+    margin-left: var(--topic-avatar-width);
+    width: calc(
+      var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+        var(--topic-avatar-width) - (var(--topic-avatar-width + 2px))
+    ); // 2px accounts for left and right borders
     .row {
       border-bottom: none;
       .topic-avatar,
@@ -249,7 +253,7 @@ pre.codeblock-buttons:hover {
 }
 
 .topic-map {
-  margin: 20px 0 20px 11px;
+  margin: 20px 0 20px var(--topic-body-width-padding);
   .map {
     .secondary {
       text-align: center;
@@ -324,7 +328,10 @@ pre.codeblock-buttons:hover {
 }
 
 #topic-footer-buttons {
-  max-width: calc(690px + (11px * 2) + 45px);
+  max-width: calc(
+    var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
+      var(--topic-avatar-width)
+  );
 
   @media screen and (max-width: 924px) {
     .topic-footer-main-buttons {
@@ -363,7 +370,7 @@ span.post-count {
 
 button.expand-post {
   margin-top: 10px;
-  margin-left: $topic-body-width-padding;
+  margin-left: var(--topic-body-width-padding);
 }
 
 iframe {
@@ -459,23 +466,26 @@ blockquote {
 
 // variables are used to calculate the width of .gap
 .topic-body {
-  width: calc(#{$topic-body-width} + (#{$topic-body-width-padding} * 2));
+  width: calc(var(--topic-body-width) + (var(--topic-body-width-padding) * 2));
   float: left;
   min-width: 0; // prevents some elements, like <pre>, from blowing out the width
   position: relative;
   border-top: 1px solid var(--primary-low);
   padding: 12px 0 0 0;
   .topic-meta-data {
-    padding: 0 $topic-body-width-padding 0.25em $topic-body-width-padding;
+    padding: 0 var(--topic-body-width-padding) 0.25em
+      var(--topic-body-width-padding);
   }
   .cooked {
-    padding: 1em $topic-body-width-padding 0.25em $topic-body-width-padding;
+    padding: 1em var(--topic-body-width-padding) 0.25em
+      var(--topic-body-width-padding);
   }
   .group-request {
-    padding: 0.5em $topic-body-width-padding 0 $topic-body-width-padding;
+    padding: 0.5em var(--topic-body-width-padding) 0
+      var(--topic-body-width-padding);
   }
   a.expand-hidden {
-    padding-left: $topic-body-width-padding;
+    padding-left: var(--topic-body-width-padding);
   }
 }
 
@@ -495,8 +505,8 @@ blockquote {
 .topic-area > .loading-container {
   // loader needs to be same width as posts
   width: calc(
-    #{$topic-avatar-width} + #{$topic-body-width} +
-      (#{$topic-body-width-padding} * 2)
+    var(--topic-body-width) + var(--topic-avatar) +
+      (var(--topic-body-width-padding) * 2)
   );
   max-width: 100%;
   @media all and (max-width: 790px) {

From 2737bc55bb1166ef592c27760ec2bd58363b5240 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Tue, 25 Oct 2022 14:19:45 -0500
Subject: [PATCH 277/332] DEV: Update docs for composerBeforeSave (#18746)

* DEV: Update docs for composerBeforeSave
---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 9635da273a..3fa4fcf197 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -1223,11 +1223,14 @@ class PluginApi {
   /**
    * Registers a "beforeSave" function on the composer. This allows you to
    * implement custom logic that will happen before the user makes a post.
+   * The passed function is expected to return a promise.
    *
    * Example:
    *
    * api.composerBeforeSave(() => {
-   *   console.log("Before saving, do something!");
+   *   return new Promise(() => {
+   *     console.log("Before saving, do something!")
+   *   })
    * })
    */
   composerBeforeSave(method) {

From d3663a143ba506b0e74fc66b5e571d1ed4b5b6c0 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 25 Oct 2022 17:59:09 -0400
Subject: [PATCH 278/332] FIX: variable name typo (#18752)

---
 app/assets/stylesheets/desktop/topic-post.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 3191fa32c2..6409b8a9f5 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -505,7 +505,7 @@ blockquote {
 .topic-area > .loading-container {
   // loader needs to be same width as posts
   width: calc(
-    var(--topic-body-width) + var(--topic-avatar) +
+    var(--topic-body-width) + var(--topic-avatar-width) +
       (var(--topic-body-width-padding) * 2)
   );
   max-width: 100%;

From f78ea9926bd2fa623bb0e1e1dbb9d68690ed6a14 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 25 Oct 2022 18:24:54 -0600
Subject: [PATCH 279/332] DEV: Add description for active param on create user
 api docs (#18753)

The `active` param on the create user endpoint requires that an api key
is used in the request header otherwise it is ignored, so adding this
distinction to the api docs.
---
 spec/requests/api/schemas/json/user_create_request.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/requests/api/schemas/json/user_create_request.json b/spec/requests/api/schemas/json/user_create_request.json
index ac5fc3265f..92990832e5 100644
--- a/spec/requests/api/schemas/json/user_create_request.json
+++ b/spec/requests/api/schemas/json/user_create_request.json
@@ -14,7 +14,8 @@
       "type": "string"
     },
     "active": {
-      "type": "boolean"
+      "type": "boolean",
+      "description": "This param requires an api key in the request header or it will be ignored"
     },
     "approved": {
       "type": "boolean"

From a18082725b9c88215ecbae5f28b6386ea5ca13e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 08:37:50 +0800
Subject: [PATCH 280/332] Build(deps): Bump rubocop-ast from 1.22.0 to 1.23.0
 (#18751)

Bumps [rubocop-ast](https://github.com/rubocop/rubocop-ast) from 1.22.0 to 1.23.0.
- [Release notes](https://github.com/rubocop/rubocop-ast/releases)
- [Changelog](https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-ast/compare/v1.22.0...v1.23.0)

---
updated-dependencies:
- dependency-name: rubocop-ast
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 517bf2b225..93b492a17c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,7 +416,7 @@ GEM
       rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.22.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-discourse (3.0)
       rubocop (>= 1.1.0)

From 1b27e3c3ebd2fcdb216891f74b318fc062a7f322 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 08:38:03 +0800
Subject: [PATCH 281/332] Build(deps): Bump rspec-mocks from 3.11.1 to 3.11.2
 (#18749)

Bumps [rspec-mocks](https://github.com/rspec/rspec-mocks) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/rspec/rspec-mocks/releases)
- [Changelog](https://github.com/rspec/rspec-mocks/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-mocks/compare/v3.11.1...v3.11.2)

---
updated-dependencies:
- dependency-name: rspec-mocks
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 93b492a17c..081e8cb1f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -387,7 +387,7 @@ GEM
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-rails (6.0.1)

From 9dd431c272ab386d6032990b5e50b57fc47c5552 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 08:38:19 +0800
Subject: [PATCH 282/332] Build(deps): Bump net-http from 0.2.2 to 0.3.0
 (#18748)

Bumps [net-http](https://github.com/ruby/net-http) from 0.2.2 to 0.3.0.
- [Release notes](https://github.com/ruby/net-http/releases)
- [Commits](https://github.com/ruby/net-http/compare/v0.2.2...v0.3.0)

---
updated-dependencies:
- dependency-name: net-http
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 081e8cb1f0..a1ddadf5f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustache (1.1.1)
-    net-http (0.2.2)
+    net-http (0.3.0)
       uri
     net-imap (0.3.1)
       net-protocol

From 9129f18815cc01e9c6d13fa5bed0a172128c8640 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 26 Oct 2022 04:59:08 +0400
Subject: [PATCH 283/332] DEV: make possible to pass both async and sync
 callbacks to the user status modal (#18712)

---
 .../discourse/app/controllers/preferences/account.js        | 4 ++--
 .../javascripts/discourse/app/controllers/user-status.js    | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 5d1c18c1bd..db8da6fd0d 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -157,8 +157,8 @@ export default Controller.extend(CanCheckEmails, {
       modalClass: "user-status",
       model: {
         status,
-        saveAction: async (s) => this.set("newStatus", s),
-        deleteAction: async () => this.set("newStatus", null),
+        saveAction: (s) => this.set("newStatus", s),
+        deleteAction: () => this.set("newStatus", null),
       },
     });
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/user-status.js b/app/assets/javascripts/discourse/app/controllers/user-status.js
index b13b71161d..d9062b6878 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-status.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-status.js
@@ -52,8 +52,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @action
   delete() {
-    this.model
-      .deleteAction()
+    Promise.resolve(this.model.deleteAction())
       .then(() => this.send("closeModal"))
       .catch((e) => this._handleError(e));
   },
@@ -71,8 +70,7 @@ export default Controller.extend(ModalFunctionality, {
       ends_at: this.status.endsAt?.toISOString(),
     };
 
-    this.model
-      .saveAction(newStatus)
+    Promise.resolve(this.model.saveAction(newStatus))
       .then(() => this.send("closeModal"))
       .catch((e) => this._handleError(e));
   },

From 305b7c8fae71cb6e775b056304337e947ac9fa90 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 26 Oct 2022 09:05:15 +0800
Subject: [PATCH 284/332] DEV: Update rubocop (#18754)

---
 Gemfile.lock                                  |  6 ++---
 ...50727230537_add_example_column_comments.rb |  3 +--
 spec/lib/auth/facebook_authenticator_spec.rb  |  3 +--
 spec/requests/api/private_messages_spec.rb    |  9 +++----
 spec/requests/api/tags_spec.rb                | 27 +++++++------------
 spec/requests/api/topics_spec.rb              |  6 ++---
 spec/swagger_helper.rb                        |  3 +--
 7 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1ddadf5f7..5aefbc4bc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -406,14 +406,14 @@ GEM
       json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
       rspec-core (>= 2.14)
-    rubocop (1.36.0)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
@@ -421,7 +421,7 @@ GEM
     rubocop-discourse (3.0)
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.14.2)
       rubocop (~> 1.33)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
diff --git a/db/migrate/20150727230537_add_example_column_comments.rb b/db/migrate/20150727230537_add_example_column_comments.rb
index ce5062aa2a..73acbb93d2 100644
--- a/db/migrate/20150727230537_add_example_column_comments.rb
+++ b/db/migrate/20150727230537_add_example_column_comments.rb
@@ -21,8 +21,7 @@ class AddExampleColumnComments < CommentMigration
   end
 
   def comments_down
-    {
-    }
+    {}
   end
 
 end
diff --git a/spec/lib/auth/facebook_authenticator_spec.rb b/spec/lib/auth/facebook_authenticator_spec.rb
index 4a39fe5c46..9033506af3 100644
--- a/spec/lib/auth/facebook_authenticator_spec.rb
+++ b/spec/lib/auth/facebook_authenticator_spec.rb
@@ -5,8 +5,7 @@ RSpec.describe Auth::FacebookAuthenticator do
     {
       provider: "facebook",
       extra: {
-        raw_info: {
-        }
+        raw_info: {}
       },
       info: {
         email: "bob@bob.com",
diff --git a/spec/requests/api/private_messages_spec.rb b/spec/requests/api/private_messages_spec.rb
index aaecd897e6..d85345e5a6 100644
--- a/spec/requests/api/private_messages_spec.rb
+++ b/spec/requests/api/private_messages_spec.rb
@@ -34,8 +34,7 @@ RSpec.describe 'private messages' do
           },
           primary_groups: {
             type: :array,
-            items: {
-            },
+            items: {},
           },
           topic_list: {
             type: :object,
@@ -144,8 +143,7 @@ RSpec.describe 'private messages' do
           },
           primary_groups: {
             type: :array,
-            items: {
-            },
+            items: {},
           },
           topic_list: {
             type: :object,
@@ -206,8 +204,7 @@ RSpec.describe 'private messages' do
                     },
                     participants: {
                       type: :array,
-                      items: {
-                      },
+                      items: {},
                     },
                   }
                 },
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index 3227f0518b..95bfd02883 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -31,13 +31,11 @@ RSpec.describe 'tags' do
                 name: { type: :string },
                 tag_names: {
                   type: :array,
-                  items: {
-                  },
+                  items: {},
                 },
                 parent_tag_name: {
                   type: :array,
-                  items: {
-                  },
+                  items: {},
                 },
                 one_per_topic: { type: :boolean },
                 permissions: {
@@ -101,13 +99,11 @@ RSpec.describe 'tags' do
               name: { type: :string },
               tag_names: {
                 type: :array,
-                items: {
-                },
+                items: {},
               },
               parent_tag_name: {
                 type: :array,
-                items: {
-                },
+                items: {},
               },
               one_per_topic: { type: :boolean },
               permissions: {
@@ -151,13 +147,11 @@ RSpec.describe 'tags' do
               name: { type: :string },
               tag_names: {
                 type: :array,
-                items: {
-                },
+                items: {},
               },
               parent_tag_name: {
                 type: :array,
-                items: {
-                },
+                items: {},
               },
               one_per_topic: { type: :boolean },
               permissions: {
@@ -204,8 +198,7 @@ RSpec.describe 'tags' do
             properties: {
               categories: {
                 type: :array,
-                items: {
-                },
+                items: {},
               },
             }
           },
@@ -240,8 +233,7 @@ RSpec.describe 'tags' do
           },
           primary_groups: {
             type: :array,
-            items: {
-            },
+            items: {},
           },
           topic_list: {
             type: :object,
@@ -294,8 +286,7 @@ RSpec.describe 'tags' do
                     liked: { type: :boolean },
                     tags: {
                       type: :array,
-                      items: {
-                      },
+                      items: {},
                     },
                     views: { type: :integer },
                     like_count: { type: :integer },
diff --git a/spec/requests/api/topics_spec.rb b/spec/requests/api/topics_spec.rb
index ac690323c3..c576e7a3c9 100644
--- a/spec/requests/api/topics_spec.rb
+++ b/spec/requests/api/topics_spec.rb
@@ -337,8 +337,7 @@ RSpec.describe 'topics' do
           },
           primary_groups: {
             type: :array,
-            items: {
-            },
+            items: {},
           },
           topic_list: {
             type: :object,
@@ -442,8 +441,7 @@ RSpec.describe 'topics' do
           },
           primary_groups: {
             type: :array,
-            items: {
-            },
+            items: {},
           },
           topic_list: {
             type: :object,
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
index ea9d5b0ac7..4a92cc7dc9 100644
--- a/spec/swagger_helper.rb
+++ b/spec/swagger_helper.rb
@@ -124,8 +124,7 @@ RSpec.configure do |config|
         }
       ],
       components: {
-        schemas: {
-        }
+        schemas: {}
       }
     }
   }

From f822a933fa295c80a8b0408cf0f6c459918dfa08 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 26 Oct 2022 03:19:54 +0200
Subject: [PATCH 285/332] DEV: Clean up pre-initializers (#18680)

---
 .../svg-sprite-fontawesome.js                 |   5 +-
 .../theme-errors-handler.js                   | 117 +++++++++---------
 .../discourse/app/mapping-router.js           |  11 --
 .../app/pre-initializers/map-routes.js        |  11 +-
 4 files changed, 65 insertions(+), 79 deletions(-)
 rename app/assets/javascripts/discourse/app/{pre-initializers => initializers}/svg-sprite-fontawesome.js (71%)
 rename app/assets/javascripts/discourse/app/{pre-initializers => initializers}/theme-errors-handler.js (52%)

diff --git a/app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js b/app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js
similarity index 71%
rename from app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js
rename to app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js
index 7547b1769c..b9351be066 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js
+++ b/app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js
@@ -2,10 +2,11 @@ import { loadSprites } from "discourse/lib/svg-sprite-loader";
 
 export default {
   name: "svg-sprite-fontawesome",
-  after: "discourse-bootstrap",
+  after: "export-application-global",
 
   initialize(container) {
-    let session = container.lookup("service:session");
+    const session = container.lookup("service:session");
+
     if (session.svgSpritePath) {
       loadSprites(session.svgSpritePath, "fontawesome");
     }
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js b/app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js
similarity index 52%
rename from app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
rename to app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js
index 4299d09233..827b26ea0c 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
+++ b/app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js
@@ -14,7 +14,7 @@ const showingErrors = new Set();
 
 export default {
   name: "theme-errors-handler",
-  after: "inject-discourse-objects",
+  after: "export-application-global",
 
   initialize(container) {
     if (isTesting()) {
@@ -23,9 +23,7 @@ export default {
 
     this.currentUser = container.lookup("service:current-user");
 
-    getAndClearUnhandledThemeErrors().forEach((e) => {
-      reportThemeError(this.currentUser, e);
-    });
+    getAndClearUnhandledThemeErrors().forEach((e) => this.reportThemeError(e));
 
     document.addEventListener("discourse-error", this.handleDiscourseError);
   },
@@ -38,12 +36,65 @@ export default {
   @bind
   handleDiscourseError(e) {
     if (e.detail?.themeId) {
-      reportThemeError(this.currentUser, e);
+      this.reportThemeError(e);
     } else {
-      reportGenericError(this.currentUser, e);
+      this.reportGenericError(e);
     }
+
     e.preventDefault(); // Mark as handled
   },
+
+  reportThemeError(e) {
+    const { themeId, error } = e.detail;
+    const source = {
+      type: "theme",
+      ...getThemeInfo(themeId),
+    };
+
+    reportToConsole(error, source);
+    reportToLogster(source.name, error);
+
+    const message = I18n.t("themes.broken_theme_alert");
+    this.displayErrorNotice(this.currentUser, message, source);
+  },
+
+  reportGenericError(e) {
+    const { messageKey, error } = e.detail;
+
+    const message = I18n.t(messageKey);
+    const source = identifySource(error);
+
+    reportToConsole(error, source);
+
+    if (messageKey && !showingErrors.has(messageKey)) {
+      showingErrors.add(messageKey);
+      this.displayErrorNotice(message, source);
+    }
+  },
+
+  displayErrorNotice(message, source) {
+    if (!this.currentUser?.admin) {
+      return;
+    }
+
+    let html = `⚠️ ${message}`;
+
+    if (source && source.type === "theme") {
+      html += `<br/>${I18n.t("themes.error_caused_by", {
+        name: escape(source.name),
+        path: source.path,
+      })}`;
+    }
+
+    html += `<br/><span class='theme-error-suffix'>${I18n.t(
+      "themes.only_admins"
+    )}</span>`;
+
+    const alertDiv = document.createElement("div");
+    alertDiv.classList.add("broken-theme-alert");
+    alertDiv.innerHTML = html;
+    document.body.prepend(alertDiv);
+  },
 };
 
 function reportToLogster(name, error) {
@@ -59,36 +110,6 @@ function reportToLogster(name, error) {
   });
 }
 
-function reportThemeError(currentUser, e) {
-  const { themeId, error } = e.detail;
-
-  const source = {
-    type: "theme",
-    ...getThemeInfo(themeId),
-  };
-
-  reportToConsole(error, source);
-  reportToLogster(source.name, error);
-
-  const message = I18n.t("themes.broken_theme_alert");
-  displayErrorNotice(currentUser, message, source);
-}
-
-function reportGenericError(currentUser, e) {
-  const { messageKey, error } = e.detail;
-
-  let message = I18n.t(messageKey);
-
-  const source = identifySource(error);
-
-  reportToConsole(error, source);
-
-  if (messageKey && !showingErrors.has(messageKey)) {
-    showingErrors.add(messageKey);
-    displayErrorNotice(currentUser, message, source);
-  }
-}
-
 function reportToConsole(error, source) {
   const prefix = consolePrefix(error, source);
   if (prefix) {
@@ -99,27 +120,3 @@ function reportToConsole(error, source) {
     console.error(error);
   }
 }
-
-function displayErrorNotice(currentUser, message, source) {
-  if (!currentUser?.admin) {
-    return;
-  }
-
-  let html = `⚠️ ${message}`;
-
-  if (source && source.type === "theme") {
-    html += `<br/>${I18n.t("themes.error_caused_by", {
-      name: escape(source.name),
-      path: source.path,
-    })}`;
-  }
-
-  html += `<br/><span class='theme-error-suffix'>${I18n.t(
-    "themes.only_admins"
-  )}</span>`;
-
-  const alertDiv = document.createElement("div");
-  alertDiv.classList.add("broken-theme-alert");
-  alertDiv.innerHTML = html;
-  document.body.prepend(alertDiv);
-}
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index cb000cc1f3..9f372413af 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -141,14 +141,3 @@ export function mapRoutes() {
     this.route("unknown", { path: "*path" });
   });
 }
-export function teardownRouter(routerClass) {
-  routerClass.dslCallbacks.splice(0, routerClass.dslCallbacks.length);
-}
-
-export function registerRouter(registry) {
-  registry.unregister("router:main");
-  let router = mapRoutes();
-
-  registry.register("router:main", router);
-  return router;
-}
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
index 27b1196a8c..cf911e834f 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
@@ -1,16 +1,15 @@
-import { registerRouter, teardownRouter } from "discourse/mapping-router";
+import { mapRoutes } from "discourse/mapping-router";
 
 export default {
   name: "map-routes",
   after: "inject-discourse-objects",
 
-  initialize(container, app) {
-    let routerClass = registerRouter(app);
-    container.registry.register("router:main", routerClass);
-    this.routerClass = routerClass;
+  initialize(_, app) {
+    this.routerClass = mapRoutes();
+    app.register("router:main", this.routerClass);
   },
 
   teardown() {
-    teardownRouter(this.routerClass);
+    this.routerClass.dslCallbacks.length = 0;
   },
 };

From d680d019a295f7d0c64754b387fa1a015dcfbee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:20:59 +0800
Subject: [PATCH 286/332] Build(deps): Bump eslint in /app/assets/javascripts
 (#18713)

Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.32.0...v8.26.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json |   2 +-
 app/assets/javascripts/yarn.lock              | 325 ++++++++----------
 2 files changed, 136 insertions(+), 191 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index ca5c57bd11..33615ed7fa 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -68,7 +68,7 @@
     "ember-rfc176-data": "^0.3.17",
     "ember-source": "~3.28.8",
     "ember-test-selectors": "^6.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.26.0",
     "eslint-plugin-qunit": "^6.2.0",
     "html-entities": "^2.3.3",
     "js-yaml": "^4.1.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 39e157a5df..e6b5413738 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -10,13 +10,6 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
@@ -305,7 +298,7 @@
     "@babel/traverse" "^7.19.4"
     "@babel/types" "^7.19.4"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
+"@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
   integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
@@ -1174,19 +1167,19 @@
     broccoli-funnel "^3.0.5"
     ember-cli-babel "^7.23.1"
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.4.0"
+    globals "^13.15.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@glimmer/component@^1.1.2":
@@ -1275,16 +1268,21 @@
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b"
+  integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -1329,25 +1327,30 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@nodelib/fs.stat" "2.0.4"
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.stat@^2.0.2":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
   integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
 "@popperjs/core@^2.11.6", "@popperjs/core@^2.9.0":
@@ -1920,10 +1923,10 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.0.2:
   version "8.2.0"
@@ -1935,11 +1938,6 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
 acorn@^8.1.0, acorn@^8.7.1, acorn@^8.8.0:
   version "8.8.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
@@ -1991,7 +1989,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.8.0:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
   integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
@@ -2014,11 +2012,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -2051,11 +2044,6 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2073,7 +2061,7 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -2231,11 +2219,6 @@ ast-types@0.13.3:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
   integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-disk-cache@^1.2.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
@@ -4093,7 +4076,7 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -5075,13 +5058,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
@@ -5220,7 +5196,7 @@ eslint-plugin-qunit@^6.2.0:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -5236,12 +5212,13 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^3.0.0:
   version "3.0.0"
@@ -5250,75 +5227,74 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint@^8.26.0:
+  version "8.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
+  integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.15.0"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 esm@^3.2.4:
   version "3.2.25"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
@@ -6058,11 +6034,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -6165,13 +6136,20 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -6242,10 +6220,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.16.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.16.0.tgz#9be4aca28f311aaeb974ea54978ebbb5e35ce46a"
-  integrity sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==
+globals@^13.15.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
   dependencies:
     type-fest "^0.20.2"
 
@@ -6293,6 +6271,11 @@ graceful-fs@~1.2.0:
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -6621,15 +6604,10 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.1.1:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+ignore@^5.1.1, ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
 immutable@^4.0.0:
   version "4.1.0"
@@ -6922,10 +6900,10 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -6966,6 +6944,11 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -7125,6 +7108,11 @@ jquery@^3.5.0, jquery@^3.5.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
+js-sdsl@^4.1.4:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
+  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -7140,7 +7128,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -7504,7 +7492,7 @@ lodash.castarray@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
   integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
 
-lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -7603,11 +7591,6 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash.uniq@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -7943,10 +7926,10 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -8854,11 +8837,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -9159,10 +9137,10 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^4.7.1:
   version "4.7.1"
@@ -9512,7 +9490,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -9682,15 +9660,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -10076,14 +10045,7 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10193,18 +10155,6 @@ sync-disk-cache@^2.0.0:
     rimraf "^3.0.0"
     username-sync "^1.0.2"
 
-table@^6.0.9:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
-  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-
 tap-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
@@ -10784,11 +10734,6 @@ uuid@^8.3.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"

From 787d512c0346e73863aca3fefb83b6645ff65090 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Wed, 26 Oct 2022 07:18:05 +0300
Subject: [PATCH 287/332] FIX: Add theme-color `<meta>` tag when a dark scheme
 is selected (#18747)

Meta topic: https://meta.discourse.org/t/meta-theme-color-is-not-respecting-current-color-scheme/239815/7?u=osama.

This commit renders an additional `theme-color` `<meta>` tag for the dark scheme if the current user/request has a scheme selected for dark mode. We currently only render one `theme-color` tag which is always based on the user's selected scheme for light mode, but if the user also selects a scheme for dark mode and uses a device that's configured to use/prefer dark mode, the Discourse UI will be in dark mode, but any parts of the browser/OS UI that's colored based on the `theme-color` tag, would use a color from the user's selected light scheme and look inconsistent with the Discourse UI because the `theme-color` tag is based on the user's selected light scheme.

The additional `theme-color` tag has `media="(prefers-color-scheme: dark)"` and is based on the user's selected dark scheme which means any browser UI that's colored based on `theme-color` tags should be able to pick the right tag based on the user's preference for light/dark mode.
---
 app/helpers/application_helper.rb       | 12 ++++++++++
 app/views/layouts/_head.html.erb        |  2 +-
 spec/helpers/application_helper_spec.rb | 30 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 84912f3815..d2078d15eb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -625,6 +625,18 @@ module ApplicationHelper
     result.html_safe
   end
 
+  def discourse_theme_color_meta_tags
+    result = +<<~HTML
+      <meta name="theme-color" media="all" content="##{ColorScheme.hex_for_name('header_background', scheme_id)}">
+    HTML
+    if dark_scheme_id != -1
+      result << <<~HTML
+        <meta name="theme-color" media="(prefers-color-scheme: dark)" content="##{ColorScheme.hex_for_name('header_background', dark_scheme_id)}">
+      HTML
+    end
+    result.html_safe
+  end
+
   def dark_color_scheme?
     return false if scheme_id.blank?
     ColorScheme.find_by_id(scheme_id)&.is_dark?
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 12db631ba8..5f16e29124 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -6,7 +6,7 @@
 <%- if site_apple_touch_icon_url.present? %>
 <link rel="apple-touch-icon" type="image/png" href="<%= ::UrlHelper.absolute(site_apple_touch_icon_url) %>">
 <%- end %>
-<meta name="theme-color" content="#<%= ColorScheme.hex_for_name('header_background', scheme_id) %>">
+<%= discourse_theme_color_meta_tags %>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
 <%- if Discourse.base_path.present? %>
 <meta name="discourse-base-uri" content="<%= Discourse.base_path %>">
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 0e57abf94d..8b3ae785cc 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -739,4 +739,34 @@ RSpec.describe ApplicationHelper do
       expect(helper.html_lang).to eq(I18n.locale.to_s)
     end
   end
+
+  describe "#discourse_theme_color_meta_tags" do
+    before do
+      light = Fabricate(:color_scheme)
+      light.color_scheme_colors << ColorSchemeColor.new(name: "header_background", hex: "abcdef")
+      light.save!
+      helper.request.cookies["color_scheme_id"] = light.id
+
+      dark = Fabricate(:color_scheme)
+      dark.color_scheme_colors << ColorSchemeColor.new(name: "header_background", hex: "defabc")
+      dark.save!
+      helper.request.cookies["dark_scheme_id"] = dark.id
+    end
+
+    it "renders theme-color meta for the light scheme with media=all and another one for the dark scheme with media=(prefers-color-scheme: dark)" do
+      expect(helper.discourse_theme_color_meta_tags).to eq(<<~HTML)
+        <meta name="theme-color" media="all" content="#abcdef">
+        <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#defabc">
+      HTML
+    end
+
+    it "doesn't render theme-color meta tag for the dark scheme if none is set" do
+      SiteSetting.default_dark_mode_color_scheme_id = -1
+      helper.request.cookies.delete("dark_scheme_id")
+
+      expect(helper.discourse_theme_color_meta_tags).to eq(<<~HTML)
+        <meta name="theme-color" media="all" content="#abcdef">
+      HTML
+    end
+  end
 end

From 1da5aa90279170b8b1957fee2a67c1402661fe97 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 26 Oct 2022 12:00:35 +0100
Subject: [PATCH 288/332] DEV: Parallelize core JS tests in docker.rake
 (#18756)

---
 lib/tasks/docker.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index fc942c4ad6..3f9de71ede 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -208,7 +208,7 @@ task 'docker:test' do
         js_timeout = ENV["JS_TIMEOUT"].presence || 900_000 # 15 minutes
 
         unless ENV["SKIP_CORE"]
-          @good &&= run_or_fail("cd app/assets/javascripts/discourse && CI=1 yarn ember exam --random")
+          @good &&= run_or_fail("cd app/assets/javascripts/discourse && CI=1 yarn ember exam --load-balance --parallel=3 --random")
         end
 
         unless ENV["SKIP_PLUGINS"]

From fd993240fd69a0d2accadd145f0ca57189680656 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 26 Oct 2022 20:04:55 +0800
Subject: [PATCH 289/332] DEV: Add missing assertion for InvitesController test
 (#18755)

---
 spec/requests/invites_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 4eac015423..01332a0b99 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -631,7 +631,9 @@ RSpec.describe InvitesController do
 
       it 'does not log in the user if there are validation errors' do
         put "/invites/show/#{invite.invite_key}.json", params: { password: 'password' }
+
         expect(response.status).to eq(412)
+        expect(session[:current_user_id]).to eq(nil)
       end
 
       it 'does not log in the user if they were not approved' do

From 20efd494ef7a3c5c71f022df86d4b7ee3ed4907f Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 26 Oct 2022 16:41:31 +0400
Subject: [PATCH 290/332] DEV: move BasicUserWithStatusSerializer from
 Discourse Chat (#18745)

---
 .../basic_user_with_status_serializer.rb      | 13 ++++++
 .../basic_user_with_status_serializer_spec.rb | 44 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 app/serializers/basic_user_with_status_serializer.rb
 create mode 100644 spec/serializers/basic_user_with_status_serializer_spec.rb

diff --git a/app/serializers/basic_user_with_status_serializer.rb b/app/serializers/basic_user_with_status_serializer.rb
new file mode 100644
index 0000000000..8eb1a7ce2d
--- /dev/null
+++ b/app/serializers/basic_user_with_status_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class BasicUserWithStatusSerializer < BasicUserSerializer
+  attributes :status
+
+  def include_status?
+    SiteSetting.enable_user_status && user.has_status?
+  end
+
+  def status
+    UserStatusSerializer.new(user.user_status, root: false)
+  end
+end
diff --git a/spec/serializers/basic_user_with_status_serializer_spec.rb b/spec/serializers/basic_user_with_status_serializer_spec.rb
new file mode 100644
index 0000000000..7f5076db12
--- /dev/null
+++ b/spec/serializers/basic_user_with_status_serializer_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+RSpec.describe BasicUserWithStatusSerializer do
+  fab!(:user_status) { Fabricate(:user_status) }
+  fab!(:user) { Fabricate(:user, user_status: user_status) }
+  let(:serializer) { described_class.new(user, scope: Guardian.new(user), root: false) }
+
+  it "adds user status when enabled" do
+    SiteSetting.enable_user_status = true
+
+    json = serializer.as_json
+
+    expect(json[:status]).to_not be_nil do |status|
+      expect(status.description).to eq(user_status.description)
+      expect(status.emoji).to eq(user_status.emoji)
+    end
+  end
+
+  it "doesn't add user status when status is disabled in site settings" do
+    SiteSetting.enable_user_status = false
+    json = serializer.as_json
+    expect(json.keys).not_to include :status
+  end
+
+  it "doesn't add expired user status" do
+    SiteSetting.enable_user_status = true
+
+    user.user_status.ends_at = 1.minutes.ago
+    serializer = described_class.new(user, scope: Guardian.new(user), root: false)
+    json = serializer.as_json
+
+    expect(json.keys).not_to include :status
+  end
+
+  it "doesn't return status if user doesn't have it set" do
+    SiteSetting.enable_user_status = true
+
+    user.clear_status!
+    user.reload
+    json = serializer.as_json
+
+    expect(json.keys).not_to include :status
+  end
+end

From 0221855ba783c6d96d2dbf2ec9f7e92b5297499b Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Wed, 26 Oct 2022 09:44:12 -0400
Subject: [PATCH 291/332] DEV: Normalize event handling to improve Glimmer +
 Classic component compat (Take 2) (#18742)

Classic Ember components (i.e. "@ember/component") rely upon "event
delegation" to listen for events at the application root and then dispatch
those events to any event handlers defined on individual Classic components.
This coordination is handled by Ember's EventDispatcher.

In contrast, Glimmer components (i.e. "@glimmer/component") expect event
listeners to be added to elements using modifiers (such as `{{on "click"}}`).
These event listeners are added directly to DOM elements using
`addEventListener`. There is no need for an event dispatcher.

Issues may arise when using Classic and Glimmer components together, since it
requires reconciling the two event handling approaches. For instance, event
propagation may not work as expected when a Classic component is nested
inside a Glimmer component.

`normalizeEmberEventHandling` helps an application standardize upon the
Glimmer event handling approach by eliminating usage of event delegation and
instead rewiring Classic components to directly use `addEventListener`.

Specifically, it performs the following:

- Invokes `eliminateClassicEventDelegation()` to remove all events associated
  with Ember's EventDispatcher to reduce its runtime overhead and ensure that
  it is effectively not in use.

- Invokes `rewireClassicComponentEvents(app)` to rewire each Classic
  component to add its own event listeners for standard event handlers (e.g.
  `click`, `mouseDown`, `submit`, etc.).

- Configures an instance initializer that invokes
  `rewireActionModifier(appInstance)` to redefine the `action` modifier with
    a substitute that uses `addEventListener`.

Additional changes include:
* d-button: only preventDefault / stopPropagation for handled actions
   This allows unhandled events to propagate as expected.
* d-editor: avoid adding duplicate event listener for tests
   This extra event listener causes duplicate paste events in tests.
* group-manage-email-settings: Monitor `input` instead of `change` event for checkboxes
---
 app/assets/javascripts/discourse/app/app.js   |   5 +
 .../discourse/app/components/d-button.js      |  59 ++--
 .../discourse/app/components/d-editor.js      |   4 -
 .../app/initializers/ember-events.js          |  46 ---
 .../app/lib/ember-action-modifier.js          |  92 ++++++
 .../discourse/app/lib/ember-events.js         | 232 ++++++++++++++
 .../group-manage-email-settings.hbs           |   4 +-
 .../unit/lib/ember-action-modifer-test.js     |  76 +++++
 .../tests/unit/lib/ember-events-test.js       | 300 ++++++++++++++++++
 9 files changed, 738 insertions(+), 80 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/initializers/ember-events.js
 create mode 100644 app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
 create mode 100644 app/assets/javascripts/discourse/app/lib/ember-events.js
 create mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
 create mode 100644 app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 8d5d9d8ea3..6b2bd6af25 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,6 +1,7 @@
 import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 import { isTesting } from "discourse-common/config/environment";
+import { normalizeEmberEventHandling } from "./lib/ember-events";
 
 const _pluginCallbacks = [];
 let _unhandledThemeErrors = [];
@@ -54,6 +55,10 @@ const Discourse = Application.extend({
   start() {
     document.querySelector("noscript")?.remove();
 
+    // Rewire event handling to eliminate event delegation for better compat
+    // between Glimmer and Classic components.
+    normalizeEmberEventHandling(this);
+
     if (Error.stackTraceLimit) {
       // We need Errors to have full stack traces for `lib/source-identifier`
       Error.stackTraceLimit = Infinity;
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index 1726bb76d8..b2f8d2ccb1 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -118,8 +118,7 @@ export default Component.extend({
   },
 
   click(event) {
-    this._triggerAction(event);
-    return false;
+    return this._triggerAction(event);
   },
 
   mouseDown(event) {
@@ -129,37 +128,41 @@ export default Component.extend({
   },
 
   _triggerAction(event) {
-    let { action } = this;
+    let { action, route, href } = this;
 
-    if (action) {
-      if (typeof action === "string") {
-        // Note: This is deprecated in new Embers and needs to be removed in the future.
-        // There is already a warning in the console.
-        this.sendAction("action", this.actionParam);
-      } else if (typeof action === "object" && action.value) {
-        if (this.forwardEvent) {
-          action.value(this.actionParam, event);
-        } else {
-          action.value(this.actionParam);
-        }
-      } else if (typeof this.action === "function") {
-        if (this.forwardEvent) {
-          action(this.actionParam, event);
-        } else {
-          action(this.actionParam);
+    if (action || route || href?.length) {
+      if (action) {
+        if (typeof action === "string") {
+          // Note: This is deprecated in new Embers and needs to be removed in the future.
+          // There is already a warning in the console.
+          this.sendAction("action", this.actionParam);
+        } else if (typeof action === "object" && action.value) {
+          if (this.forwardEvent) {
+            action.value(this.actionParam, event);
+          } else {
+            action.value(this.actionParam);
+          }
+        } else if (typeof this.action === "function") {
+          if (this.forwardEvent) {
+            action(this.actionParam, event);
+          } else {
+            action(this.actionParam);
+          }
         }
       }
-    }
 
-    if (this.route) {
-      this.router.transitionTo(this.route);
-    }
+      if (route) {
+        this.router.transitionTo(route);
+      }
 
-    if (this.href && this.href.length) {
-      DiscourseURL.routeTo(this.href);
-    }
+      if (href?.length) {
+        DiscourseURL.routeTo(href);
+      }
 
-    event.preventDefault();
-    event.stopPropagation();
+      event.preventDefault();
+      event.stopPropagation();
+
+      return false;
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 3dcdfd0f7e..298dc542ec 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -289,10 +289,6 @@ export default Component.extend(TextareaTextManipulation, {
         "indentSelection"
       );
     }
-
-    if (isTesting()) {
-      this.element.addEventListener("paste", this.paste);
-    }
   },
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
deleted file mode 100644
index 231b01712c..0000000000
--- a/app/assets/javascripts/discourse/app/initializers/ember-events.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Ember from "ember";
-
-let initializedOnce = false;
-
-export default {
-  name: "ember-events",
-
-  initialize() {
-    // By default Ember listens to too many events. This tells it the only events
-    // we're interested in. (it removes mousemove, touchstart and touchmove)
-    if (initializedOnce) {
-      return;
-    }
-
-    Ember.EventDispatcher.reopen({
-      events: {
-        touchend: "touchEnd",
-        touchcancel: "touchCancel",
-        keydown: "keyDown",
-        keyup: "keyUp",
-        keypress: "keyPress",
-        mousedown: "mouseDown",
-        mouseup: "mouseUp",
-        contextmenu: "contextMenu",
-        click: "click",
-        dblclick: "doubleClick",
-        focusin: "focusIn",
-        focusout: "focusOut",
-        mouseenter: "mouseEnter",
-        mouseleave: "mouseLeave",
-        submit: "submit",
-        input: "input",
-        change: "change",
-        dragstart: "dragStart",
-        drag: "drag",
-        dragenter: "dragEnter",
-        dragleave: "dragLeave",
-        dragover: "dragOver",
-        drop: "drop",
-        dragend: "dragEnd",
-      },
-    });
-
-    initializedOnce = true;
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
new file mode 100644
index 0000000000..61177cce93
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
@@ -0,0 +1,92 @@
+import { modifier } from "ember-modifier";
+
+/**
+ * Creates a replacement for Ember's built-in `action` modifier that uses
+ * `addEventListener` directly instead of relying upon classic event delegation.
+ *
+ * This relies upon a deep override of Ember's rendering internals. If possible,
+ * consider eliminating usage of `action` as a modifier instead.
+ *
+ * Reference: https://github.com/emberjs/ember.js/blob/master/packages/%40ember/-internals/glimmer/lib/helpers/action.ts
+ */
+export const actionModifier = modifier(
+  (
+    element,
+    [context, callback, ...args],
+    { on, bubbles, preventDefault, allowedKeys }
+  ) => {
+    const handler = (event) => {
+      const fn = typeof callback === "string" ? context[callback] : callback;
+      if (fn === undefined) {
+        throw new Error(
+          "Unexpected callback for `action` modifier. Please provide either a function or the name of a method on the current context."
+        );
+      }
+
+      if (!isAllowedEvent(event, allowedKeys)) {
+        return true;
+      }
+
+      if (preventDefault !== false) {
+        event.preventDefault();
+      }
+
+      let shouldBubble = bubbles !== false;
+      if (!shouldBubble) {
+        event.stopPropagation();
+      }
+
+      if (args.length > 0) {
+        return fn.call(context, ...args);
+      } else {
+        return fn.call(context, event);
+      }
+    };
+
+    const eventName = on ?? "click";
+    element.addEventListener(eventName, handler);
+
+    return () => {
+      element.removeEventListener(eventName, handler);
+    };
+  },
+  { eager: false }
+);
+
+export function isSimpleClick(event) {
+  if (!(event instanceof MouseEvent)) {
+    return false;
+  }
+  let modKey = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
+  let secondaryClick = event.which > 1; // IE9 may return undefined
+
+  return !modKey && !secondaryClick;
+}
+
+const MODIFIERS = ["alt", "shift", "meta", "ctrl"];
+const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
+
+function isAllowedEvent(event, allowedKeys) {
+  if (allowedKeys === null || allowedKeys === undefined) {
+    if (POINTER_EVENT_TYPE_REGEX.test(event.type)) {
+      return isSimpleClick(event);
+    } else {
+      allowedKeys = "";
+    }
+  }
+
+  if (allowedKeys.indexOf("any") >= 0) {
+    return true;
+  }
+
+  for (let i = 0; i < MODIFIERS.length; i++) {
+    if (
+      event[MODIFIERS[i] + "Key"] &&
+      allowedKeys.indexOf(MODIFIERS[i]) === -1
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/ember-events.js b/app/assets/javascripts/discourse/app/lib/ember-events.js
new file mode 100644
index 0000000000..dbd6dce976
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/ember-events.js
@@ -0,0 +1,232 @@
+// eslint-disable-next-line ember/no-classic-components
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import { actionModifier } from "./ember-action-modifier";
+
+/**
+ * Classic Ember components (i.e. "@ember/component") rely upon "event
+ * delegation" to listen for events at the application root and then dispatch
+ * those events to any event handlers defined on individual Classic components.
+ * This coordination is handled by Ember's EventDispatcher.
+ *
+ * In contrast, Glimmer components (i.e. "@glimmer/component") expect event
+ * listeners to be added to elements using modifiers (such as `{{on "click"}}`).
+ * These event listeners are added directly to DOM elements using
+ * `addEventListener`. There is no need for an event dispatcher.
+ *
+ * Issues may arise when using Classic and Glimmer components together, since it
+ * requires reconciling the two event handling approaches. For instance, event
+ * propagation may not work as expected when a Classic component is nested
+ * inside a Glimmer component.
+ *
+ * `normalizeEmberEventHandling` helps an application standardize upon the
+ * Glimmer event handling approach by eliminating usage of event delegation and
+ * instead rewiring Classic components to directly use `addEventListener`.
+ *
+ * Specifically, it performs the following:
+ *
+ * - Invokes `eliminateClassicEventDelegation()` to remove all events associated
+ *   with Ember's EventDispatcher to reduce its runtime overhead and ensure that
+ *   it is effectively not in use.
+ *
+ * - Invokes `rewireClassicComponentEvents(app)` to rewire each Classic
+ *   component to add its own event listeners for standard event handlers (e.g.
+ *   `click`, `mouseDown`, `submit`, etc.).
+ *
+ * - Configures an instance initializer that invokes
+ *   `rewireActionModifier(appInstance)` to redefine the `action` modifier with
+ *   a substitute that uses `addEventListener`.
+ *
+ * @param {Application} app
+ */
+export function normalizeEmberEventHandling(app) {
+  eliminateClassicEventDelegation();
+  rewireClassicComponentEvents(app);
+  app.instanceInitializer({
+    name: "rewire-action-modifier",
+    initialize: (appInstance) => rewireActionModifier(appInstance),
+  });
+}
+
+/**
+ * Remove all events registered with Ember's EventDispatcher to reduce its
+ * runtime overhead.
+ */
+function eliminateClassicEventDelegation() {
+  // eslint-disable-next-line no-undef
+  Ember.EventDispatcher.reopen({
+    events: {},
+  });
+}
+
+/**
+ * Standard Ember event handlers, keyed by matching DOM events.
+ *
+ * Source: https://github.com/emberjs/ember.js/blob/master/packages/@ember/-internals/views/lib/system/event_dispatcher.ts#L64-L89
+ *
+ * @type {Record<string, string>}
+ */
+const EVENTS = {
+  touchstart: "touchStart",
+  touchmove: "touchMove",
+  touchend: "touchEnd",
+  touchcancel: "touchCancel",
+  keydown: "keyDown",
+  keyup: "keyUp",
+  keypress: "keyPress",
+  mousedown: "mouseDown",
+  mouseup: "mouseUp",
+  contextmenu: "contextMenu",
+  click: "click",
+  dblclick: "doubleClick",
+  focusin: "focusIn",
+  focusout: "focusOut",
+  submit: "submit",
+  input: "input",
+  change: "change",
+  dragstart: "dragStart",
+  drag: "drag",
+  dragenter: "dragEnter",
+  dragleave: "dragLeave",
+  dragover: "dragOver",
+  drop: "drop",
+  dragend: "dragEnd",
+};
+
+/**
+ * @type {WeakMap<object, { event: string; listener: () => {} }[]>}
+ */
+const EVENT_LISTENERS = new WeakMap();
+
+const INTERNAL = Symbol("INTERNAL");
+
+/**
+ * Rewires classic component event handling to use `addEventListener` directly
+ * on inserted elements, instead of relying upon classic event delegation.
+ *
+ * This maximizes compatibility with glimmer components and event listeners
+ * added via the `on` modifier. In particular, using `addEventListener`
+ * consistently everywhere ensures that event propagation works as expected
+ * between parent and child elements.
+ *
+ * @param {Application} app
+ */
+function rewireClassicComponentEvents(app) {
+  const allEvents = { ...EVENTS };
+
+  if (app.customEvents) {
+    for (const [event, methodName] of Object.entries(app.customEvents)) {
+      allEvents[event] = methodName;
+    }
+  }
+
+  const allEventMethods = {};
+  for (const [event, methodName] of Object.entries(allEvents)) {
+    allEventMethods[methodName] = event;
+  }
+
+  // Avoid Component.reopen to stop `ember.component.reopen` deprecation warning
+  EmberObject.reopen.call(Component, {
+    /**
+     * @param {string | typeof INTERNAL} name
+     * @param {unknown[]} args
+     */
+    trigger(name, ...args) {
+      if (name === INTERNAL) {
+        if (this.element) {
+          return this._super.call(this, ...args);
+        }
+      } else if (name.toLowerCase() in allEvents) {
+        return;
+      } else {
+        return this._super.call(this, name, ...args);
+      }
+    },
+
+    // eslint-disable-next-line ember/no-component-lifecycle-hooks
+    didInsertElement() {
+      this._super(...arguments);
+      setupComponentEventListeners(this, allEventMethods);
+    },
+
+    // eslint-disable-next-line ember/no-component-lifecycle-hooks
+    willDestroyElement() {
+      teardownComponentEventListeners(this);
+      this._super(...arguments);
+    },
+  });
+}
+
+/**
+ * Rewires the `action` modifier to use `addEventListener` directly instead of
+ * relying upon classic event delegation.
+ *
+ * This relies upon a deep override of Ember's rendering internals. If possible,
+ * consider eliminating usage of `action` as a modifier instead.
+ *
+ * @param {ApplicationInstance} appInstance
+ */
+function rewireActionModifier(appInstance) {
+  // This is a deep runtime override, since neither the runtime resolver nor the
+  // built-in `action` modifier seem to be available otherwise.
+  //
+  // TODO: Investigate if a cleaner override is possible.
+  const renderer = appInstance.lookup("renderer:-dom");
+  const lookupModifier = renderer._runtimeResolver.lookupModifier;
+  renderer._runtimeResolver.lookupModifier = (name, owner) => {
+    if (name === "action") {
+      return actionModifier;
+    } else {
+      return lookupModifier(name, owner);
+    }
+  };
+}
+
+function setupComponentEventListeners(component, allEventMethods) {
+  let eventListeners;
+  const { element } = component;
+
+  for (const method of Object.keys(allEventMethods)) {
+    if (component.has(method)) {
+      const event = allEventMethods[method];
+
+      if (eventListeners === undefined) {
+        eventListeners = EVENT_LISTENERS.get(component);
+        if (eventListeners === undefined) {
+          eventListeners = [];
+          EVENT_LISTENERS.set(component, eventListeners);
+        }
+      }
+
+      const listener = (e) => {
+        const ret = component.trigger.call(component, INTERNAL, method, e);
+        // If an event handler returns `false`, assume the intent is to stop
+        // propagation and default event handling, as per the behavior
+        // encoded in Ember's `EventDispatcher`.
+        //
+        // See: https://github.com/emberjs/ember.js/blob/7d9095f38911d30aebb0e67ceec13e4a9818088b/packages/%40ember/-internals/views/lib/system/event_dispatcher.ts#L331-L337
+        if (ret === false) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        return ret;
+      };
+
+      element.addEventListener(event, listener);
+      eventListeners.push({ event, listener });
+    }
+  }
+}
+
+function teardownComponentEventListeners(component) {
+  const eventListeners = EVENT_LISTENERS.get(component);
+  if (eventListeners?.length > 0) {
+    const { element } = component;
+    if (element) {
+      for (const { event, listener } of eventListeners) {
+        element.removeEventListener(event, listener);
+      }
+    }
+    EVENT_LISTENERS.delete(component);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index 7c59effdfd..bccf3ff4ac 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,7 +3,7 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "change" this.smtpEnabledChange}} />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} id="enable_smtp" tabindex="1" {{on "input" this.smtpEnabledChange}} />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
@@ -23,7 +23,7 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "change" this.imapEnabledChange}} />
+        <Input @type="checkbox" disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} id="enable_imap" tabindex="8" {{on "input" this.imapEnabledChange}} />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
new file mode 100644
index 0000000000..8ede3ff97b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
@@ -0,0 +1,76 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "ember-qunit";
+import { click, doubleClick, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Unit | Lib | ember-action-modifer", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("`{{action}}` can target a function", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action this.onChildClick}} />
+    `);
+
+    await click("#childButton");
+
+    assert.strictEqual(this.childClicked, 0);
+  });
+
+  test("`{{action}}` can target a method on the current context by name", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action 'onChildClick'}} />
+    `);
+
+    await click("#childButton");
+
+    assert.strictEqual(this.childClicked, 0);
+  });
+
+  test("`{{action}}` will ignore clicks combined with modifier keys", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onChildClick: () => this.set("childClicked", i++),
+      childClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action 'onChildClick'}} />
+    `);
+
+    await click("#childButton", { ctrlKey: true });
+
+    assert.strictEqual(this.childClicked, undefined);
+  });
+
+  test("`{{action}}` can specify an event other than `click` via `on`", async function (assert) {
+    let i = 0;
+
+    this.setProperties({
+      onDblClick: () => this.set("dblClicked", i++),
+      dblClicked: undefined,
+    });
+
+    await render(hbs`
+      <button id="childButton" {{action this.onDblClick on='dblclick'}} />
+    `);
+
+    await doubleClick("#childButton");
+
+    assert.strictEqual(this.dblClicked, 0);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
new file mode 100644
index 0000000000..a3d2828d99
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
@@ -0,0 +1,300 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "ember-qunit";
+import { click, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+/* eslint-disable ember/require-tagless-components */
+/* eslint-disable ember/no-classic-classes */
+/* eslint-disable ember/no-classic-components */
+import { default as ClassicComponent } from "@ember/component";
+import { default as GlimmerComponent } from "@glimmer/component";
+import { action } from "@ember/object";
+
+// Configure test-local Classic and Glimmer components that
+// will be immune from upgrades to actual Discourse components.
+const ExampleClassicButton = ClassicComponent.extend({
+  tagName: "button",
+  type: "button",
+  preventEventPropagation: false,
+  onClick: null,
+  onMouseDown: null,
+
+  click(event) {
+    event.preventDefault();
+    if (this.preventEventPropagation) {
+      event.stopPropagation();
+    }
+    this.onClick?.(event);
+  },
+});
+const exampleClassicButtonTemplate = hbs`{{yield}}`;
+
+class ExampleGlimmerButton extends GlimmerComponent {
+  @action
+  click(event) {
+    event.preventDefault();
+    if (this.args.preventEventPropagation) {
+      event.stopPropagation();
+    }
+    this.args.onClick?.(event);
+  }
+}
+const exampleGlimmerButtonTemplate = hbs`
+<button {{on 'click' this.click}} type='button' ...attributes>
+  {{yield}}
+</button>
+`;
+
+module("Unit | Lib | ember-events", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.owner.register(
+      "component:example-classic-button",
+      ExampleClassicButton
+    );
+    this.owner.register(
+      "template:components/example-classic-button",
+      exampleClassicButtonTemplate
+    );
+
+    this.owner.register(
+      "component:example-glimmer-button",
+      ExampleGlimmerButton
+    );
+    this.owner.register(
+      "template:components/example-glimmer-button",
+      exampleGlimmerButtonTemplate
+    );
+  });
+
+  module("classic component event configuration", function () {
+    test("it adds listeners for standard event handlers on the component prototype or the component itself", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onOneClick: () => this.set("oneClicked", i++),
+        onTwoClick: () => this.set("twoClicked", i++),
+        oneClicked: undefined,
+        twoClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="buttonOne" @onClick={{this.onOneClick}} />
+        <ExampleClassicButton id="buttonTwo" @click={{this.onTwoClick}} />
+      `);
+
+      await click("#buttonOne");
+      await click("#buttonTwo");
+
+      assert.strictEqual(this.oneClicked, 0);
+      assert.strictEqual(this.twoClicked, 1);
+    });
+
+    test("it adds listeners for standard event handlers on the component itself or the component prototype (order reversed)", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onOneClick: () => this.set("oneClicked", i++),
+        onTwoClick: () => this.set("twoClicked", i++),
+        oneClicked: undefined,
+        twoClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="buttonOne" @click={{this.onOneClick}} />
+        <ExampleClassicButton id="buttonTwo" @onClick={{this.onTwoClick}} />
+      `);
+
+      await click("#buttonOne");
+      await click("#buttonTwo");
+
+      assert.strictEqual(this.oneClicked, 0);
+      assert.strictEqual(this.twoClicked, 1);
+    });
+  });
+
+  module("nested glimmer inside classic", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleGlimmerButton id="childButton" @onClick={{this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleGlimmerButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested classic inside glimmer", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleClassicButton id="childButton" @onClick={{this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <ExampleClassicButton id="childButton" @preventEventPropagation={{true}} @onClick={{this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested `{{action}}` usage inside classic", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick bubbles=false}} />
+        </ExampleClassicButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+
+  module("nested `{{action}}` usage inside glimmer", function () {
+    test("it handles click events and allows propagation by default", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, 1);
+    });
+
+    test("it handles click events and can prevent event propagation", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onParentClick: () => this.set("parentClicked", i++),
+        onChildClick: () => this.set("childClicked", i++),
+        parentClicked: undefined,
+        childClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleGlimmerButton id="parentButton" @onClick={{this.onParentClick}}>
+          <button id="childButton" {{action this.onChildClick bubbles=false}} />
+        </ExampleGlimmerButton>
+      `);
+
+      await click("#childButton");
+
+      assert.strictEqual(this.childClicked, 0);
+      assert.strictEqual(this.parentClicked, undefined);
+    });
+  });
+});

From a727476fb738abbf02acb6371b2186056936e60a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 26 Oct 2022 20:16:01 +0200
Subject: [PATCH 292/332] DEV: Revert topic loading async changes (#18757)

This reverts commits 2c5e8f17635fd4e6d280a3dc794335711e19970e (#18585) and 589a249a6539f74c31c2a4f50c7249628c8b72b0 (#18727)

Those changes caused race conditions with scroll-to-post/lockOn code.
---
 .../javascripts/discourse/app/controllers/topic.js   |  1 -
 app/assets/javascripts/discourse/app/models/topic.js | 12 ++++++------
 .../discourse/app/routes/topic-from-params.js        |  1 -
 app/assets/javascripts/discourse/app/routes/topic.js |  1 -
 .../javascripts/discourse/app/templates/topic.hbs    |  2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 2b58257d8e..f682f8e68b 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -71,7 +71,6 @@ export default Controller.extend(bufferedProperty("model"), {
   currentPostId: null,
   userLastReadPostNumber: null,
   highestPostNumber: null,
-  controllerReady: false,
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 5b2c1e5a1b..1776e9f5d1 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -24,7 +24,7 @@ import DiscourseURL, { userPath } from "discourse/lib/url";
 import deprecated from "discourse-common/lib/deprecated";
 import { applyModelTransformations } from "discourse/lib/model-transformers";
 
-export async function loadTopicView(topic, args) {
+export function loadTopicView(topic, args) {
   const data = deepMerge({}, args);
   const url = `${getURL("/t/")}${topic.id}`;
   const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
@@ -33,12 +33,12 @@ export async function loadTopicView(topic, args) {
   delete data.__type;
   delete data.store;
 
-  const json = await PreloadStore.getAndRemove(`topic_${topic.id}`, () =>
+  return PreloadStore.getAndRemove(`topic_${topic.id}`, () =>
     ajax(jsonUrl, { data })
-  );
-
-  topic.updateFromJson(json);
-  return json;
+  ).then((json) => {
+    topic.updateFromJson(json);
+    return json;
+  });
 }
 
 export const ID_CONSTRAINT = /^\d+$/;
diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
index 0dc639f03b..5875089d6d 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -80,7 +80,6 @@ export default DiscourseRoute.extend({
       enteredAt: Date.now().toString(),
       userLastReadPostNumber: topic.last_read_post_number,
       highestPostNumber: topic.highest_post_number,
-      controllerReady: true,
     });
 
     this.appEvents.trigger("page:topic-loaded", topic);
diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
index b299ae5996..2f4570b181 100644
--- a/app/assets/javascripts/discourse/app/routes/topic.js
+++ b/app/assets/javascripts/discourse/app/routes/topic.js
@@ -352,7 +352,6 @@ const TopicRoute = DiscourseRoute.extend({
       model,
       editingTopic: false,
       firstPostExpanded: false,
-      controllerReady: false,
     });
 
     this.searchService.set("searchContext", model.get("searchContext"));
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 05a64c9d1e..85186edfe2 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -13,7 +13,7 @@
 
   <PluginOutlet @name="topic-above-post-stream" @tagName="span" @connectorTagName="div" @args={{hash model=this.model editFirstPost=(action "editFirstPost")}} />
 
-  {{#if (and this.controllerReady this.model.postStream.loaded)}}
+  {{#if this.model.postStream.loaded}}
     {{#if this.model.postStream.firstPostPresent}}
       <TopicTitle @cancelled={{action "cancelEditingTopic"}} @save={{action "finishedEditingTopic"}} @model={{this.model}}>
         {{#if this.editingTopic}}

From 3fbae5dd036ade6cf3be424448fb51eee258e160 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Wed, 26 Oct 2022 20:53:57 +0200
Subject: [PATCH 293/332] UX: Use a friendlier educational message (#18760)

See /t/82115/3
---
 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 0d1f8ce17c..b2d97d160d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -538,7 +538,7 @@ en:
 
       It’s easier for everyone to read topics that have fewer in-depth replies versus lots of small, individual replies.
 
-    dominating_topic: You’ve posted more than %{percent}% of the replies here, is there anyone else you would like to hear from?
+    dominating_topic: You’ve posted more than %{percent}% of the replies here; may we suggest you give other people an opportunity to chime in?
 
     get_a_room: You’ve replied to @%{reply_username} %{count} times, did you know you could send them a personal message instead?
 

From 9ec62091c6590de7857e19370cd71ce8a5a2a364 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 26 Oct 2022 15:41:50 -0400
Subject: [PATCH 294/332] DEV: Update upload mismatch error message (#18759)

Following feedback from translators, it does not look like we need to
refer to an "upload stub" here.
---
 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 b2d97d160d..b43b8f13a7 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4133,7 +4133,7 @@ en:
     png_to_jpg_conversion_failure_message: "An error happened when converting from PNG to JPG."
     optimize_failure_message: "An error occurred while optimizing the uploaded image."
     download_failure: "Downloading the file from the external provider failed."
-    size_mismatch_failure: "The size of the file uploaded to S3 did not match the external upload stub's intended size. %{additional_detail}"
+    size_mismatch_failure: "The size of the file uploaded to S3 did not match the external upload's intended size. %{additional_detail}"
     create_multipart_failure: "Failed to create multipart upload in the external store."
     abort_multipart_failure: "Failed to abort multipart upload in the external store."
     complete_multipart_failure: "Failed to complete multipart upload in the external store."

From e12413dc0e27d85e4772bc35376483bb69c34312 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 05:30:27 +0800
Subject: [PATCH 295/332] Build(deps): Bump memory_profiler from 1.0.0 to 1.0.1
 (#18762)

Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: memory_profiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5aefbc4bc6..fa537b9e63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -225,7 +225,7 @@ GEM
     lz4-ruby (0.3.3)
     matrix (0.4.2)
     maxminddb (0.1.22)
-    memory_profiler (1.0.0)
+    memory_profiler (1.0.1)
     message_bus (4.2.0)
       rack (>= 1.1.3)
     method_source (1.0.0)

From d4583357cb4092aa7f31c8f6b42ead0c977796b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 05:30:51 +0800
Subject: [PATCH 296/332] Build(deps-dev): Bump rspec from 3.11.0 to 3.12.0
 (#18761)

Bumps [rspec](https://github.com/rspec/rspec-metagem) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/rspec/rspec-metagem/releases)
- [Commits](https://github.com/rspec/rspec-metagem/compare/v3.11.0...v3.12.0)

---
updated-dependencies:
- dependency-name: rspec
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fa537b9e63..f2c46fe56b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -375,21 +375,21 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.11.2)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-rails (6.0.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -398,7 +398,7 @@ GEM
       rspec-expectations (~> 3.11)
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
-    rspec-support (3.11.1)
+    rspec-support (3.12.0)
     rss (0.2.9)
       rexml
     rswag-specs (2.7.0)

From a473e352de0b75d9c53f30b09eed05855934512d Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 27 Oct 2022 06:13:21 +0800
Subject: [PATCH 297/332] DEV: Introduce TopicGuardian#can_see_topic_ids method
 (#18692)

Before this commit, there was no way for us to efficiently check an
array of topics for which a user can see. Therefore, this commit
introduces the `TopicGuardian#can_see_topic_ids` method which accepts an
array of `Topic#id`s and filters out the ids which the user is not
allowed to see. The `TopicGuardian#can_see_topic_ids` method is meant to
maintain feature parity with `TopicGuardian#can_see_topic?` at all
times so a consistency check has been added in our tests to ensure that
`TopicGuardian#can_see_topic_ids` returns the same result as
`TopicGuardian#can_see_topic?`. In the near future, the plan is for us
to switch to `TopicGuardian#can_see_topic_ids` completely but I'm not
doing that in this commit as we have to be careful with the performance
impact of such a change.

This method is currently not being used in the current commit but will
be relied on in a subsequent commit.
---
 app/models/reviewable_flagged_post.rb         |  3 +
 app/models/topic.rb                           |  6 +-
 lib/guardian.rb                               | 25 ++++--
 lib/guardian/topic_guardian.rb                | 85 ++++++++++++++++++-
 spec/lib/guardian/topic_guardian_spec.rb      | 59 ++++++++++++-
 spec/lib/guardian_spec.rb                     | 18 ++--
 ...opic_guardian_can_see_consistency_check.rb | 44 ++++++++++
 7 files changed, 222 insertions(+), 18 deletions(-)
 create mode 100644 spec/support/topic_guardian_can_see_consistency_check.rb

diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index d79f1daf1c..032f6bed90 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class ReviewableFlaggedPost < Reviewable
+  scope :pending_and_default_visible, -> {
+    pending.default_visible
+  }
 
   # Penalties are handled by the modal after the action is performed
   def self.action_aliases
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 88578cdce4..2db3023458 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -423,8 +423,12 @@ class Topic < ActiveRecord::Base
     posts.where(post_type: Post.types[:regular], user_deleted: false).order('score desc nulls last').limit(1).first
   end
 
+  def self.has_flag_scope
+    ReviewableFlaggedPost.pending_and_default_visible
+  end
+
   def has_flags?
-    ReviewableFlaggedPost.pending.default_visible.where(topic_id: id).exists?
+    self.class.has_flag_scope.exists?(topic_id: self.id)
   end
 
   def is_official_warning?
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 69415b5470..0dbdd1dec3 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -116,21 +116,18 @@ class Guardian
   end
 
   def is_category_group_moderator?(category)
-    return false if !SiteSetting.enable_category_group_moderation?
     return false if !category
-    return false if !authenticated?
+    return false if !category_group_moderation_allowed?
 
     reviewable_by_group_id = category.reviewable_by_group_id
     return false if reviewable_by_group_id.blank?
 
-    @is_group_member ||= {}
+    @category_group_moderator_groups ||= {}
 
-    if @is_group_member.key?(reviewable_by_group_id)
-      @is_group_member[reviewable_by_group_id]
+    if @category_group_moderator_groups.key?(reviewable_by_group_id)
+      @category_group_moderator_groups[reviewable_by_group_id]
     else
-      @is_group_member[reviewable_by_group_id] = begin
-        GroupUser.where(group_id: reviewable_by_group_id, user_id: @user.id).exists?
-      end
+      @category_group_moderator_groups[reviewable_by_group_id] = category_group_moderator_scope.exists?("categories.id": category.id)
     end
   end
 
@@ -622,4 +619,16 @@ class Guardian
     end
   end
 
+  protected
+
+  def category_group_moderation_allowed?
+    authenticated? && SiteSetting.enable_category_group_moderation
+  end
+
+  def category_group_moderator_scope
+    Category
+      .joins("INNER JOIN group_users ON group_users.group_id = categories.reviewable_by_group_id")
+      .where("group_users.user_id = ?", user.id)
+  end
+
 end
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 874ed0fb1d..04feb20b24 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -2,7 +2,6 @@
 
 #mixin for all guardian methods dealing with topic permissions
 module TopicGuardian
-
   def can_remove_allowed_users?(topic, target_user = nil)
     is_staff? ||
     (topic.user == @user && @user.has_trust_level?(TrustLevel[2])) ||
@@ -199,6 +198,49 @@ module TopicGuardian
     is_staff? || is_category_group_moderator?(category)
   end
 
+  # Accepts an array of `Topic#id` and returns an array of `Topic#id` which the user can see.
+  def can_see_topic_ids(topic_ids: [], hide_deleted: true)
+    topic_ids = topic_ids.compact
+
+    return topic_ids if is_admin?
+    return [] if topic_ids.blank?
+
+    default_scope = Topic.unscoped.where(id: topic_ids)
+
+    # When `hide_deleted` is `true`, hide deleted topics if user is not staff or category moderator
+    if hide_deleted && !is_staff?
+      if category_group_moderation_allowed?
+        default_scope = default_scope.where(<<~SQL)
+          (
+            deleted_at IS NULL OR
+            (
+              deleted_at IS NOT NULL
+              AND topics.category_id IN (#{category_group_moderator_scope.select(:id).to_sql})
+            )
+          )
+        SQL
+      else
+        default_scope = default_scope.where("deleted_at IS NULL")
+      end
+    end
+
+    # Filter out topics with shared drafts if user cannot see shared drafts
+    if !can_see_shared_draft?
+      default_scope = default_scope.left_outer_joins(:shared_draft).where("shared_drafts.id IS NULL")
+    end
+
+    all_topics_scope =
+      if authenticated?
+        Topic.unscoped.merge(
+          secured_regular_topic_scope(default_scope, topic_ids: topic_ids).or(private_message_topic_scope(default_scope))
+        )
+      else
+        Topic.unscoped.merge(secured_regular_topic_scope(default_scope, topic_ids: topic_ids))
+      end
+
+    all_topics_scope.pluck(:id)
+  end
+
   def can_see_topic?(topic, hide_deleted = true)
     return false unless topic
     return true if is_admin?
@@ -277,4 +319,45 @@ module TopicGuardian
   def affected_by_slow_mode?(topic)
     topic&.slow_mode_seconds.to_i > 0 && @user.human? && !is_staff?
   end
+
+  private
+
+  def private_message_topic_scope(scope)
+    pm_scope = scope.private_messages_for_user(user)
+
+    if is_moderator?
+      pm_scope = pm_scope.or(scope.where(<<~SQL))
+        topics.subtype = '#{TopicSubtype.moderator_warning}'
+        OR topics.id IN (#{Topic.has_flag_scope.select(:topic_id).to_sql})
+      SQL
+    end
+
+    pm_scope
+  end
+
+  def secured_regular_topic_scope(scope, topic_ids:)
+    secured_scope = Topic.unscoped.secured(self)
+
+    # Staged users are allowed to see their own topics in read restricted categories when Category#email_in and
+    # Category#email_in_allow_strangers has been configured.
+    if is_staged?
+      sql = <<~SQL
+      topics.id IN (
+        SELECT
+          topics.id
+        FROM topics
+        INNER JOIN categories ON categories.id = topics.category_id
+        WHERE categories.read_restricted
+        AND categories.email_in IS NOT NULL
+        AND categories.email_in_allow_strangers
+        AND topics.user_id = :user_id
+        AND topics.id IN (:topic_ids)
+      )
+      SQL
+
+      secured_scope = secured_scope.or(Topic.unscoped.where(sql, user_id: user.id, topic_ids: topic_ids))
+    end
+
+    scope.listable_topics.merge(secured_scope)
+  end
 end
diff --git a/spec/lib/guardian/topic_guardian_spec.rb b/spec/lib/guardian/topic_guardian_spec.rb
index 24ef2e0332..c6da52b9ee 100644
--- a/spec/lib/guardian/topic_guardian_spec.rb
+++ b/spec/lib/guardian/topic_guardian_spec.rb
@@ -1,10 +1,22 @@
 # frozen_string_literal: true
 
 RSpec.describe TopicGuardian do
+  fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:tl3_user) { Fabricate(:leader) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:category) { Fabricate(:category) }
+  fab!(:topic) { Fabricate(:topic, category: category) }
+  fab!(:private_message_topic) { Fabricate(:private_message_topic) }
+  fab!(:group) { Fabricate(:group) }
+
+  before do
+    Guardian.enable_topic_can_see_consistency_check
+  end
+
+  after do
+    Guardian.disable_topic_can_see_consistency_check
+  end
 
   describe '#can_create_shared_draft?' do
     it 'when shared_drafts are disabled' do
@@ -88,7 +100,6 @@ RSpec.describe TopicGuardian do
       end
 
       it 'returns true if a shared draft exists' do
-        topic = Fabricate(:topic, category: category)
         Fabricate(:shared_draft, topic: topic)
 
         expect(Guardian.new(tl2_user).can_edit_topic?(topic)).to eq(true)
@@ -96,7 +107,6 @@ RSpec.describe TopicGuardian do
 
       it 'returns false if the user has a lower trust level' do
         tl1_user = Fabricate(:user, trust_level: TrustLevel[1])
-        topic = Fabricate(:topic, category: category)
         Fabricate(:shared_draft, topic: topic)
 
         expect(Guardian.new(tl1_user).can_edit_topic?(topic)).to eq(false)
@@ -119,4 +129,49 @@ RSpec.describe TopicGuardian do
       expect(Guardian.new(tl4_user).can_review_topic?(topic)).to eq(false)
     end
   end
+
+  # The test cases here are intentionally kept brief because majority of the cases are already handled by
+  # `TopicGuardianCanSeeConsistencyCheck` which we run to ensure that the implementation between `TopicGuardian#can_see_topic_ids`
+  # and `TopicGuardian#can_see_topic?` is consistent.
+  describe '#can_see_topic_ids' do
+    it 'returns the topic ids for the topics which a user is allowed to see' do
+      expect(Guardian.new.can_see_topic_ids(topic_ids: [topic.id, private_message_topic.id])).to contain_exactly(
+        topic.id
+      )
+
+      expect(Guardian.new(user).can_see_topic_ids(topic_ids: [topic.id, private_message_topic.id])).to contain_exactly(
+        topic.id
+      )
+
+      expect(Guardian.new(moderator).can_see_topic_ids(topic_ids: [topic.id, private_message_topic.id])).to contain_exactly(
+        topic.id,
+      )
+
+      expect(Guardian.new(admin).can_see_topic_ids(topic_ids: [topic.id, private_message_topic.id])).to contain_exactly(
+        topic.id,
+        private_message_topic.id
+      )
+    end
+
+    it 'returns the topic ids for topics which are deleted but user is a category moderator of' do
+      SiteSetting.enable_category_group_moderation = true
+
+      category.update!(reviewable_by_group_id: group.id)
+      group.add(user)
+      topic.update!(category: category)
+      topic.trash!(admin)
+
+      topic2 = Fabricate(:topic)
+      user2 = Fabricate(:user)
+
+      expect(Guardian.new(user).can_see_topic_ids(topic_ids: [topic.id, topic2.id])).to contain_exactly(
+        topic.id,
+        topic2.id
+      )
+
+      expect(Guardian.new(user2).can_see_topic_ids(topic_ids: [topic.id, topic2.id])).to contain_exactly(
+        topic2.id,
+      )
+    end
+  end
 end
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index f9f3bfe234..feed9f9dac 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -27,6 +27,11 @@ RSpec.describe Guardian do
 
   before do
     Group.refresh_automatic_groups!
+    Guardian.enable_topic_can_see_consistency_check
+  end
+
+  after do
+    Guardian.disable_topic_can_see_consistency_check
   end
 
   it 'can be created without a user (not logged in)' do
@@ -853,6 +858,7 @@ RSpec.describe Guardian do
         expect(Guardian.new(user_gm).can_see?(topic)).to be_falsey
 
         topic.category.update!(reviewable_by_group_id: group.id, topic_id: post.topic.id)
+
         expect(Guardian.new(user_gm).can_see?(topic)).to be_truthy
       end
 
@@ -1118,7 +1124,7 @@ RSpec.describe Guardian do
 
       context "with trashed topic" do
         before do
-          topic.deleted_at = Time.now
+          topic.trash!(admin)
         end
 
         it "doesn't allow new posts from regular users" do
@@ -1729,14 +1735,14 @@ RSpec.describe Guardian do
       end
 
       context 'with private message' do
+        fab!(:private_message) { Fabricate(:private_message_topic) }
+
         it 'returns false at trust level 3' do
-          topic.archetype = 'private_message'
-          expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(false)
+          expect(Guardian.new(trust_level_3).can_edit?(private_message)).to eq(false)
         end
 
         it 'returns false at trust level 4' do
-          topic.archetype = 'private_message'
-          expect(Guardian.new(trust_level_4).can_edit?(topic)).to eq(false)
+          expect(Guardian.new(trust_level_4).can_edit?(private_message)).to eq(false)
         end
       end
 
@@ -3965,7 +3971,7 @@ RSpec.describe Guardian do
 
     it "should correctly detect category moderation" do
       group.add(user)
-      category.reviewable_by_group_id = group.id
+      category.update!(reviewable_by_group_id: group.id)
       guardian = Guardian.new(user)
 
       # implementation detail, ensure memoization is good (hence testing twice)
diff --git a/spec/support/topic_guardian_can_see_consistency_check.rb b/spec/support/topic_guardian_can_see_consistency_check.rb
new file mode 100644
index 0000000000..f50b3dbb72
--- /dev/null
+++ b/spec/support/topic_guardian_can_see_consistency_check.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+if !Guardian.new.respond_to?(:can_see_topic?)
+  raise "Guardian no longer implements a `can_see_topic?` method making this consistency check invalid"
+end
+
+# Monkey patches `TopicGuardian#can_see_topic?` to ensure that `TopicGuardian#can_see_topic_ids` returns the same
+# result for the same inputs. We're using this check to bridge the transition to `TopicGuardian#can_see_topic_ids` as the
+# backing implementation for `TopicGuardian#can_see_topic?` in the near future.
+module TopicGuardianCanSeeConsistencyCheck
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def enable_topic_can_see_consistency_check
+      @enable_can_see_consistency_check = true
+    end
+
+    def disable_topic_can_see_consistency_check
+      @enable_can_see_consistency_check = false
+    end
+
+    def run_topic_can_see_consistency_check?
+      @enable_can_see_consistency_check
+    end
+  end
+
+  def can_see_topic?(topic, hide_deleted = true)
+    result = super
+
+    if self.class.run_topic_can_see_consistency_check?
+      new_result = self.can_see_topic_ids(topic_ids: [topic&.id], hide_deleted: hide_deleted).present?
+
+      if result != new_result
+        raise "result between TopicGuardian#can_see_topic? (#{result}) and TopicGuardian#can_see_topic_ids (#{new_result}) has drifted and returned different results for the same input"
+      end
+    end
+
+    result
+  end
+end
+
+class Guardian
+  prepend TopicGuardianCanSeeConsistencyCheck
+end

From 1b56a55f5087091a8573849a42c78f63992e1142 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 27 Oct 2022 06:38:50 +0800
Subject: [PATCH 298/332] DEV: Sidebar default tags and categories are
 determined at user creation (#18620)

The previous sidebar default tags and categories implementation did not
allow for a user to configure their sidebar to have no categories or
tags. This commit changes how the defaults are applied. When a user is being created,
we create the SidebarSectionLink records based on the `default_sidebar_categories` and
`default_sidebar_tags` site settings. SidebarSectionLink records are
only created for categories and tags which the user has visibility on at
the point of user creation.

With this change, we're also adding the ability for admins to apply
changes to the `default_sidebar_categories` and `default_sidebar_tags`
site settings historically when changing their site setting. When a new
category/tag has been added to the default, the new category/tag will be
added to the sidebar for all users if the admin elects to apply the changes historically.
Like wise when a tag/category is removed, the tag/category will be
removed from the sidebar for all users if the admin elects to apply the
changes historically.

Internal Ref: /t/73500
---
 .../admin/addon/mixins/setting-component.js   |   3 +
 .../admin/site_settings_controller.rb         |  10 +
 .../regular/backfill_sidebar_site_settings.rb |   9 +
 app/models/user.rb                            |  70 ++++--
 .../concerns/user_sidebar_tags_mixin.rb       |  14 +-
 app/serializers/current_user_serializer.rb    |   2 +-
 app/serializers/sidebar/tag_serializer.rb     |  11 -
 app/serializers/site_serializer.rb            |   4 +-
 .../sidebar_site_settings_backfiller.rb       |  93 +++++++
 spec/models/user_spec.rb                      | 101 ++++++++
 .../admin/site_settings_controller_spec.rb    |  62 +++++
 .../current_user_serializer_spec.rb           |  81 +++---
 spec/serializers/site_serializer_spec.rb      |  49 ++--
 .../sidebar_site_settings_backfiller_spec.rb  | 235 ++++++++++++++++++
 14 files changed, 637 insertions(+), 107 deletions(-)
 create mode 100644 app/jobs/regular/backfill_sidebar_site_settings.rb
 delete mode 100644 app/serializers/sidebar/tag_serializer.rb
 create mode 100644 app/services/sidebar_site_settings_backfiller.rb
 create mode 100644 spec/services/sidebar_site_settings_backfiller_spec.rb

diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index 3e2fd8f064..d651d1690c 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -157,7 +157,10 @@ export default Mixin.create({
       "default_tags_watching_first_post",
       "default_text_size",
       "default_title_count_mode",
+      "default_sidebar_categories",
+      "default_sidebar_tags",
     ];
+
     const key = this.buffered.get("setting");
 
     if (defaultUserPreferences.includes(key)) {
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 846f4953a5..a0a6ad9b86 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -23,9 +23,11 @@ class Admin::SiteSettingsController < Admin::AdminController
         if !override
           raise Discourse::InvalidParameters, "You cannot change this site setting because it is deprecated, use #{new_name} instead."
         end
+
         break new_name
       end
     end
+
     id = new_setting_name if new_setting_name
 
     raise_access_hidden_setting(id)
@@ -101,6 +103,8 @@ class Admin::SiteSettingsController < Admin::AdminController
             TagUser.insert_all!(tag_users)
           end
         end
+      elsif is_sidebar_default_setting?(id)
+        Jobs.enqueue(:backfill_sidebar_site_settings, setting_name: id, previous_value: previous_value, new_value: new_value)
       end
     end
 
@@ -159,6 +163,8 @@ class Admin::SiteSettingsController < Admin::AdminController
         .pluck("users.id")
 
       json[:user_count] = user_ids.uniq.count
+    elsif is_sidebar_default_setting?(id)
+      json[:user_count] = SidebarSiteSettingsBackfiller.new(id, previous_value: previous_value, new_value: new_value).number_of_users_to_backfill
     end
 
     render json: json
@@ -166,6 +172,10 @@ class Admin::SiteSettingsController < Admin::AdminController
 
   private
 
+  def is_sidebar_default_setting?(setting_name)
+    %w{default_sidebar_categories default_sidebar_tags}.include?(setting_name.to_s)
+  end
+
   def user_options
     {
       default_email_mailing_list_mode: "mailing_list_mode",
diff --git a/app/jobs/regular/backfill_sidebar_site_settings.rb b/app/jobs/regular/backfill_sidebar_site_settings.rb
new file mode 100644
index 0000000000..8e07427e83
--- /dev/null
+++ b/app/jobs/regular/backfill_sidebar_site_settings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Jobs::BackfillSidebarSiteSettings < Jobs::Base
+  def execute(args)
+    SidebarSiteSettingsBackfiller
+      .new(args[:setting_name], previous_value: args[:previous_value], new_value: args[:new_value])
+      .backfill!
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 3539bd3739..d92780a13b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -135,6 +135,11 @@ class User < ActiveRecord::Base
   after_create :ensure_in_trust_level_group
   after_create :set_default_categories_preferences
   after_create :set_default_tags_preferences
+  after_create :set_default_sidebar_section_links
+
+  after_update :set_default_sidebar_section_links, if: Proc.new  {
+    self.saved_change_to_staged?
+  }
 
   after_update :trigger_user_updated_event, if: Proc.new {
     self.human? && self.saved_change_to_uploaded_avatar_id?
@@ -279,6 +284,11 @@ class User < ActiveRecord::Base
 
   MAX_STAFF_DELETE_POST_COUNT ||= 5
 
+  def visible_sidebar_tags(user_guardian = nil)
+    user_guardian ||= guardian
+    DiscourseTagging.filter_visible(custom_sidebar_tags, user_guardian)
+  end
+
   def self.max_password_length
     200
   end
@@ -1670,27 +1680,6 @@ class User < ActiveRecord::Base
     SiteSetting.enable_experimental_sidebar_hamburger
   end
 
-  def sidebar_categories_ids
-    categories_ids = category_sidebar_section_links.pluck(:linkable_id)
-
-    if categories_ids.blank? && SiteSetting.default_sidebar_categories.present?
-      return SiteSetting.default_sidebar_categories.split("|").map(&:to_i) & guardian.allowed_category_ids
-    end
-
-    categories_ids
-  end
-
-  def sidebar_tags
-    return custom_sidebar_tags if custom_sidebar_tags.present?
-
-    if SiteSetting.default_sidebar_tags.present?
-      tag_names = SiteSetting.default_sidebar_tags.split("|") - DiscourseTagging.hidden_tag_names(guardian)
-      return Tag.where(name: tag_names)
-    end
-
-    Tag.none
-  end
-
   protected
 
   def badge_grant
@@ -1919,6 +1908,45 @@ class User < ActiveRecord::Base
 
   private
 
+  def set_default_sidebar_section_links
+    return if !SiteSetting.enable_experimental_sidebar_hamburger
+    return if staged? || bot?
+
+    records = []
+
+    if SiteSetting.default_sidebar_categories.present?
+      category_ids = SiteSetting.default_sidebar_categories.split("|")
+
+      # Filters out categories that user does not have access to or do not exist anymore
+      category_ids = Category.secured(self.guardian).where(id: category_ids).pluck(:id)
+
+      category_ids.each do |category_id|
+        records.push(
+          linkable_type: 'Category',
+          linkable_id: category_id,
+          user_id: self.id
+        )
+      end
+    end
+
+    if SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
+      tag_names = SiteSetting.default_sidebar_tags.split("|")
+
+      # Filters out tags that user cannot see or do not exist anymore
+      tag_ids = DiscourseTagging.filter_visible(Tag, self.guardian).where(name: tag_names).pluck(:id)
+
+      tag_ids.each do |tag_id|
+        records.push(
+          linkable_type: 'Tag',
+          linkable_id: tag_id,
+          user_id: self.id
+        )
+      end
+    end
+
+    SidebarSectionLink.insert_all!(records) if records.present?
+  end
+
   def stat
     user_stat || create_user_stat
   end
diff --git a/app/serializers/concerns/user_sidebar_tags_mixin.rb b/app/serializers/concerns/user_sidebar_tags_mixin.rb
index e387f01c31..05fa60afda 100644
--- a/app/serializers/concerns/user_sidebar_tags_mixin.rb
+++ b/app/serializers/concerns/user_sidebar_tags_mixin.rb
@@ -2,9 +2,19 @@
 
 module UserSidebarTagsMixin
   def self.included(base)
-    base.attributes :display_sidebar_tags
+    base.attributes :display_sidebar_tags,
+                    :sidebar_tags
+  end
 
-    base.has_many :sidebar_tags, serializer: Sidebar::TagSerializer, embed: :objects
+  def sidebar_tags
+    object.visible_sidebar_tags(scope)
+      .pluck(:name, :topic_count, :pm_topic_count)
+      .reduce([]) do |tags, sidebar_tag|
+        tags.push(
+          name: sidebar_tag[0],
+          pm_only: sidebar_tag[1] == 0 && sidebar_tag[2] > 0
+        )
+      end
   end
 
   def include_sidebar_tags?
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 62b358e165..0a607648e7 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -339,7 +339,7 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def sidebar_category_ids
-    object.sidebar_categories_ids
+    object.category_sidebar_section_links.pluck(:linkable_id) & scope.allowed_category_ids
   end
 
   def include_sidebar_category_ids?
diff --git a/app/serializers/sidebar/tag_serializer.rb b/app/serializers/sidebar/tag_serializer.rb
deleted file mode 100644
index 3e576cd247..0000000000
--- a/app/serializers/sidebar/tag_serializer.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Sidebar
-  class TagSerializer < ::ApplicationSerializer
-    attributes :name, :pm_only
-
-    def pm_only
-      object.topic_count == 0 && object.pm_topic_count > 0
-    end
-  end
-end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 0ac35515c1..de82619c9f 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -229,11 +229,11 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def anonymous_default_sidebar_tags
-    User.new.sidebar_tags.pluck(:name)
+    SiteSetting.default_sidebar_tags.split("|") - DiscourseTagging.hidden_tag_names(scope)
   end
 
   def include_anonymous_default_sidebar_tags?
-    scope.anonymous? && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
+    scope.anonymous? && SiteSetting.enable_experimental_sidebar_hamburger && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
   end
 
   private
diff --git a/app/services/sidebar_site_settings_backfiller.rb b/app/services/sidebar_site_settings_backfiller.rb
new file mode 100644
index 0000000000..3154e6a663
--- /dev/null
+++ b/app/services/sidebar_site_settings_backfiller.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# A service class that backfills the changes to the default sidebar categories and tags site settings.
+#
+# When a category/tag is removed from the site settings, the `SidebarSectionLink` records associated with the category/tag
+# are deleted.
+#
+# When a category/tag is added to the site settings, a `SidebarSectionLink` record for the associated category/tag are
+# created for all users that do not already have a `SidebarSectionLink` record for the category/tag.
+class SidebarSiteSettingsBackfiller
+  def initialize(setting_name, previous_value:, new_value:)
+    @setting_name = setting_name
+
+    @linkable_klass, previous_ids, new_ids =
+      case setting_name
+      when "default_sidebar_categories"
+        [
+          Category,
+          previous_value.split("|"),
+          new_value.split("|")
+        ]
+      when "default_sidebar_tags"
+        klass = Tag
+
+        [
+          klass,
+          klass.where(name: previous_value.split("|")).pluck(:id),
+          klass.where(name: new_value.split("|")).pluck(:id)
+        ]
+      else
+        raise 'Invalid setting_name'
+      end
+
+    @added_ids = new_ids - previous_ids
+    @removed_ids = previous_ids - new_ids
+  end
+
+  def backfill!
+    DistributedMutex.synchronize("backfill_sidebar_site_settings_#{@setting_name}") do
+      SidebarSectionLink.where(linkable_type: @linkable_klass.to_s, linkable_id: @removed_ids).delete_all
+
+      User.real.where(staged: false).select(:id).find_in_batches do |users|
+        rows = []
+
+        users.each do |user|
+          @added_ids.each do |linkable_id|
+            rows << { user_id: user[:id], linkable_type: @linkable_klass.to_s, linkable_id: linkable_id }
+          end
+        end
+
+        SidebarSectionLink.insert_all!(rows) if rows.present?
+      end
+    end
+  end
+
+  def number_of_users_to_backfill
+    select_statements = []
+
+    if @removed_ids.present?
+      select_statements.push(<<~SQL)
+      SELECT
+        sidebar_section_links.user_id
+      FROM sidebar_section_links
+      WHERE sidebar_section_links.linkable_type = '#{@linkable_klass.to_s}'
+      AND sidebar_section_links.linkable_id IN (#{@removed_ids.join(",")})
+      SQL
+    end
+
+    if @added_ids.present?
+      # Returns the ids of users that will receive the new additions by excluding the users that already have the additions
+      # Note that we want to avoid doing a left outer join against the "sidebar_section_links" table as PG will end up having
+      # to do a full table join for both tables first which is less efficient and can be slow on large sites.
+      select_statements.push(<<~SQL)
+      SELECT
+        users.id
+      FROM users
+      WHERE users.id NOT IN (
+        SELECT
+          sidebar_section_links.user_id
+        FROM sidebar_section_links
+        WHERE sidebar_section_links.linkable_type = '#{@linkable_klass.to_s}'
+        AND sidebar_section_links.linkable_id IN (#{@added_ids.join(",")})
+      ) AND users.id > 0 AND NOT users.staged
+      SQL
+    end
+
+    DB.query_single(<<~SQL)[0]
+    SELECT
+      COUNT(*)
+    FROM (#{select_statements.join("\nUNION DISTINCT\n")}) AS user_ids
+    SQL
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 60d6a9e202..ca58071bb1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -20,6 +20,90 @@ RSpec.describe User do
     end
   end
 
+  describe 'Callbacks' do
+    describe 'default sidebar section links' do
+      fab!(:category) { Fabricate(:category) }
+
+      fab!(:secured_category) do |category|
+        category = Fabricate(:category)
+        category.permissions = { "staff" => :full }
+        category.save!
+        category
+      end
+
+      fab!(:tag) { Fabricate(:tag) }
+      fab!(:hidden_tag) { Fabricate(:tag) }
+      fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+      before do
+        SiteSetting.enable_experimental_sidebar_hamburger = true
+        SiteSetting.tagging_enabled = true
+        SiteSetting.default_sidebar_categories = "#{category.id}|#{secured_category.id}"
+        SiteSetting.default_sidebar_tags = "#{tag.name}|#{hidden_tag.name}"
+      end
+
+      it 'creates the right sidebar section link records for categories and tags that a user can see' do
+        user = Fabricate(:user)
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
+          category.id
+        )
+
+        expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
+          tag.id
+        )
+
+        user = Fabricate(:admin)
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
+          category.id,
+          secured_category.id
+        )
+
+        expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
+          tag.id,
+          hidden_tag.id
+        )
+      end
+
+      it 'should not create any sidebar section link records when experimental sidebar is disabled' do
+        SiteSetting.enable_experimental_sidebar_hamburger = false
+
+        user = Fabricate(:user)
+
+        expect(SidebarSectionLink.exists?(user_id: user.id)).to eq(false)
+      end
+
+      it 'should not create any sidebar section link records for staged users' do
+        user = Fabricate(:user, staged: true)
+
+        expect(SidebarSectionLink.exists?).to eq(false)
+      end
+
+      it 'should create sidebar section link records when user has been unstaged' do
+        user = Fabricate(:user, staged: true)
+        user.unstage!
+
+        expect(SidebarSectionLink.exists?(user: user)).to eq(true)
+      end
+
+      it 'should not create any sidebar section link records for non human users' do
+        user = Fabricate(:user, id: -Time.now.to_i)
+
+        expect(SidebarSectionLink.exists?).to eq(false)
+      end
+
+      it 'should not create any tag sidebar section link records when tagging is disabled' do
+        SiteSetting.tagging_enabled = false
+
+        user = Fabricate(:user)
+
+        expect(SidebarSectionLink.exists?(linkable_type: 'Category', user_id: user.id)).to eq(true)
+        expect(SidebarSectionLink.exists?(linkable_type: 'Tag', user_id: user.id)).to eq(false)
+      end
+    end
+  end
+
   describe 'Validations' do
     describe '#username' do
       it { is_expected.to validate_presence_of :username }
@@ -2984,4 +3068,21 @@ RSpec.describe User do
       expect(user.reload.seen_notification_id).to eq(last_notification.id)
     end
   end
+
+  describe '#visible_sidebar_tags' do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:tag) { Fabricate(:tag) }
+    fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
+    fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"]) }
+    fab!(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
+    fab!(:tag_sidebar_section_link_2) { Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag) }
+
+    it 'should only return tag sidebar section link records of tags that the user is allowed to see' do
+      expect(user.visible_sidebar_tags).to contain_exactly(tag)
+
+      user.update!(admin: true)
+
+      expect(user.visible_sidebar_tags).to contain_exactly(tag, hidden_tag)
+    end
+  end
 end
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index c573a89701..8837fadf49 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -116,6 +116,44 @@ RSpec.describe Admin::SiteSettingsController do
         end
       end
 
+      context 'when updating default sidebar categories and tags' do
+        it 'does not enqueue the backfilling job if update_existing_user param is not present' do
+          expect_not_enqueued_with(job: :backfill_sidebar_site_settings) do
+            put "/admin/site_settings/default_sidebar_categories.json", params: {
+              default_sidebar_categories: "1|2",
+            }
+
+            expect(response.status).to eq(200)
+          end
+        end
+
+        it 'enqueus the backfilling job if update_existing_user param is present when updating default sidebar tags' do
+          SiteSetting.default_sidebar_tags = "tag3"
+
+          expect_enqueued_with(job: :backfill_sidebar_site_settings, args: { setting_name: 'default_sidebar_tags', new_value: 'tag1|tag2', previous_value: 'tag3' }) do
+            put "/admin/site_settings/default_sidebar_tags.json", params: {
+              default_sidebar_tags: "tag1|tag2",
+              update_existing_user: true
+            }
+
+            expect(response.status).to eq(200)
+          end
+        end
+
+        it 'enqueus the backfilling job if update_existing_user param is present when updating default sidebar categories' do
+          SiteSetting.default_sidebar_categories = "3|4"
+
+          expect_enqueued_with(job: :backfill_sidebar_site_settings, args: { setting_name: 'default_sidebar_categories', new_value: '1|2', previous_value: '3|4' }) do
+            put "/admin/site_settings/default_sidebar_categories.json", params: {
+              default_sidebar_categories: "1|2",
+              update_existing_user: true
+            }
+
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+
       describe 'default categories' do
         fab!(:user1) { Fabricate(:user) }
         fab!(:user2) { Fabricate(:user) }
@@ -265,6 +303,30 @@ RSpec.describe Admin::SiteSettingsController do
           SiteSetting.setting(:default_tags_watching, "")
         end
 
+        context "for sidebar defaults" do
+          it 'returns the right count for the default_sidebar_categories site setting' do
+            category = Fabricate(:category)
+
+            put "/admin/site_settings/default_sidebar_categories/user_count.json", params: {
+              default_sidebar_categories: "#{category.id}"
+            }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body["user_count"]).to eq(User.real.not_staged.count)
+          end
+
+          it 'returns the right count for the default_sidebar_tags site setting' do
+            tag = Fabricate(:tag)
+
+            put "/admin/site_settings/default_sidebar_tags/user_count.json", params: {
+              default_sidebar_tags: "#{tag.name}"
+            }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body["user_count"]).to eq(User.real.not_staged.count)
+          end
+        end
+
         context "with user options" do
           def expect_user_count(site_setting_name:, user_setting_name:, current_site_setting_value:, new_site_setting_value:,
                                 current_user_setting_value: nil, new_user_setting_value: nil)
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 68479524d8..3b6ce30583 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -221,15 +221,15 @@ RSpec.describe CurrentUserSerializer do
   end
 
   describe '#sidebar_tags' do
-    fab!(:tag_1) { Fabricate(:tag, name: "foo") }
-    fab!(:tag_2) { Fabricate(:tag, name: "bar") }
+    fab!(:tag) { Fabricate(:tag, name: "foo") }
+    fab!(:pm_tag) { Fabricate(:tag, name: "bar", pm_topic_count: 5, topic_count: 0) }
     fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
     fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"]) }
-    let(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user) }
-    let(:tag_sidebar_section_link_2) { Fabricate(:tag_sidebar_section_link, user: user) }
+    fab!(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
+    fab!(:tag_sidebar_section_link_2) { Fabricate(:tag_sidebar_section_link, user: user, linkable: pm_tag) }
+    fab!(:tag_sidebar_section_link_3) { Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag) }
 
     it "is not included when experimental sidebar has not been enabled" do
-      tag_sidebar_section_link
       SiteSetting.enable_experimental_sidebar_hamburger = false
       SiteSetting.tagging_enabled = true
 
@@ -239,7 +239,6 @@ RSpec.describe CurrentUserSerializer do
     end
 
     it "is not included when tagging has not been enabled" do
-      tag_sidebar_section_link
       SiteSetting.enable_experimental_sidebar_hamburger = true
       SiteSetting.tagging_enabled = false
 
@@ -248,54 +247,37 @@ RSpec.describe CurrentUserSerializer do
       expect(json[:sidebar_tags]).to eq(nil)
     end
 
-    it "is present when experimental sidebar and tagging has been enabled" do
-      tag_sidebar_section_link
+    it "serializes only the tags that the user can see when experimental sidebar and tagging has been enabled" do
       SiteSetting.enable_experimental_sidebar_hamburger = true
       SiteSetting.tagging_enabled = true
 
-      tag_sidebar_section_link_2.linkable.update!(pm_topic_count: 5, topic_count: 0)
-
       json = serializer.as_json
 
       expect(json[:sidebar_tags]).to contain_exactly(
-        { name: tag_sidebar_section_link.linkable.name, pm_only: false },
-        { name: tag_sidebar_section_link_2.linkable.name, pm_only: true }
+        { name: tag.name, pm_only: false },
+        { name: pm_tag.name, pm_only: true }
       )
-    end
 
-    it 'includes visible default sidebar tags' do
-      SiteSetting.enable_experimental_sidebar_hamburger = true
-      SiteSetting.tagging_enabled = true
-      SiteSetting.default_sidebar_tags = "foo|bar|secret"
+      user.update!(admin: true)
 
       json = serializer.as_json
 
-      expect(json[:sidebar_tags]).to eq([
-        { name: "foo", pm_only: false },
-        { name: "bar", pm_only: false }
-      ])
-    end
-
-    it 'includes tags choosen by user' do
-      SiteSetting.enable_experimental_sidebar_hamburger = true
-      SiteSetting.tagging_enabled = true
-      SiteSetting.default_sidebar_tags = "foo|bar|secret"
-      tag_sidebar_section_link = Fabricate(:tag_sidebar_section_link, user: user)
-
-      json = serializer.as_json
-
-      expect(json[:sidebar_tags]).to eq([
-        { name: tag_sidebar_section_link.linkable.name, pm_only: false }
-      ])
+      expect(json[:sidebar_tags]).to contain_exactly(
+        { name: tag.name, pm_only: false },
+        { name: pm_tag.name, pm_only: true },
+        { name: hidden_tag.name, pm_only: false }
+      )
     end
   end
 
   describe '#sidebar_category_ids' do
+    fab!(:group) { Fabricate(:group) }
     fab!(:category) { Fabricate(:category) }
     fab!(:category_2) { Fabricate(:category) }
-    fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
-    let(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user) }
-    let(:category_sidebar_section_link_2) { Fabricate(:category_sidebar_section_link, user: user) }
+    fab!(:private_category) { Fabricate(:private_category, group: group) }
+    fab!(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category) }
+    fab!(:category_sidebar_section_link_2) { Fabricate(:category_sidebar_section_link, user: user, linkable: category_2) }
+    fab!(:category_sidebar_section_link_3) { Fabricate(:category_sidebar_section_link, user: user, linkable: private_category) }
 
     it "is not included when SiteSetting.enable_experimental_sidebar_hamburger is false" do
       category_sidebar_section_link
@@ -307,7 +289,6 @@ RSpec.describe CurrentUserSerializer do
     end
 
     it "is not included when experimental sidebar has not been enabled" do
-      category_sidebar_section_link
       SiteSetting.enable_experimental_sidebar_hamburger = false
 
       json = serializer.as_json
@@ -315,23 +296,25 @@ RSpec.describe CurrentUserSerializer do
       expect(json[:sidebar_category_ids]).to eq(nil)
     end
 
-    it 'includes visible default sidebar categories' do
+    it 'serializes only the categories that the user can see when experimental sidebar and tagging has been enabled"' do
       SiteSetting.enable_experimental_sidebar_hamburger = true
-      SiteSetting.default_sidebar_categories = "#{category.id}|#{category_2.id}|#{private_category.id}"
 
       json = serializer.as_json
-      expect(json[:sidebar_category_ids]).to eq([category.id, category_2.id])
-    end
 
-    it 'includes categories choosen by user' do
-      SiteSetting.enable_experimental_sidebar_hamburger = true
-      SiteSetting.default_sidebar_categories = "#{category.id}|#{category_2.id}|#{private_category.id}"
-
-      category_sidebar_section_link
-      category_sidebar_section_link_2
+      expect(json[:sidebar_category_ids]).to eq([
+        category.id,
+        category_2.id
+      ])
 
+      group.add(user)
+      serializer = described_class.new(user, scope: Guardian.new(user), root: false)
       json = serializer.as_json
-      expect(json[:sidebar_category_ids]).to eq([category_sidebar_section_link.linkable.id, category_sidebar_section_link_2.linkable.id])
+
+      expect(json[:sidebar_category_ids]).to eq([
+        category.id,
+        category_2.id,
+        private_category.id
+      ])
     end
   end
 
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 8f367ec7e8..15bef392a7 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -141,6 +141,16 @@ RSpec.describe SiteSerializer do
 
   describe '#anonymous_default_sidebar_tags' do
     fab!(:user) { Fabricate(:user) }
+    fab!(:tag) { Fabricate(:tag, name: 'dev') }
+    fab!(:tag2) { Fabricate(:tag, name: 'random') }
+    fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
+    fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.enable_experimental_sidebar_hamburger = true
+      SiteSetting.tagging_enabled = true
+      SiteSetting.default_sidebar_tags = "#{tag.name}|#{tag2.name}|#{hidden_tag.name}"
+    end
 
     it 'is not included in the serialised object when tagging is not enabled' do
       SiteSetting.tagging_enabled = false
@@ -150,33 +160,30 @@ RSpec.describe SiteSerializer do
       expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
     end
 
-    describe 'when tagging is enabled and default sidebar tags have been configured' do
-      fab!(:tag) { Fabricate(:tag, name: 'dev') }
-      fab!(:tag2) { Fabricate(:tag, name: 'random') }
+    it 'is not included in the serialised object when experimental sidebar has not been enabled' do
+      SiteSetting.enable_experimental_sidebar_hamburger = false
 
-      before do
-        SiteSetting.tagging_enabled = true
-        SiteSetting.default_sidebar_tags = "#{tag.name}|#{tag2.name}"
-      end
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+    end
 
-      it 'is not included in the serialised object when user is not anonymous' do
-        guardian = Guardian.new(user)
+    it 'is not included in the serialised object when user is not anonymous' do
+      guardian = Guardian.new(user)
 
-        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-        expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
-      end
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+    end
 
-      it 'is not included in the serialisd object when default sidebar tags have not been configured' do
-        SiteSetting.default_sidebar_tags = ""
+    it 'is not included in the serialisd object when default sidebar tags have not been configured' do
+      SiteSetting.default_sidebar_tags = ""
 
-        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-        expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
-      end
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+    end
 
-      it 'is included in the serialised object when user is anonymous' do
-        serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-        expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
-      end
+    it 'includes only tags user can see in the serialised object when user is anonymous' do
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
     end
   end
 
diff --git a/spec/services/sidebar_site_settings_backfiller_spec.rb b/spec/services/sidebar_site_settings_backfiller_spec.rb
new file mode 100644
index 0000000000..42b614e6aa
--- /dev/null
+++ b/spec/services/sidebar_site_settings_backfiller_spec.rb
@@ -0,0 +1,235 @@
+# frozen_string_literal: true
+
+RSpec.describe SidebarSiteSettingsBackfiller do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:user2) { Fabricate(:user) }
+  fab!(:user3) { Fabricate(:user) }
+  fab!(:staged_user) { Fabricate(:user, staged: true) }
+  fab!(:category) { Fabricate(:category) }
+  fab!(:category2) { Fabricate(:category) }
+  fab!(:category3) { Fabricate(:category) }
+  fab!(:user_category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category) }
+  fab!(:user2_category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user2, linkable: category) }
+  fab!(:user3_category2_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user3, linkable: category2) }
+
+  let!(:category_sidebar_section_link_ids) do
+    [
+      user_category_sidebar_section_link.id,
+      user2_category_sidebar_section_link.id,
+      user3_category2_sidebar_section_link.id
+    ]
+  end
+
+  fab!(:tag) { Fabricate(:tag) }
+  fab!(:tag2) { Fabricate(:tag) }
+  fab!(:tag3) { Fabricate(:tag) }
+  fab!(:user_tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
+  fab!(:user2_tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user2, linkable: tag) }
+  fab!(:user3_tag2_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user3, linkable: tag2) }
+
+  let!(:tag_sidebar_section_link_ids) do
+    [
+      user_tag_sidebar_section_link.id,
+      user2_tag_sidebar_section_link.id,
+      user3_tag2_sidebar_section_link.id
+    ]
+  end
+
+  before do
+    # Clean up random users created as part of fabrication to make assertions easier to understand.
+    User.real.where("id NOT IN (?)", [user.id, user2.id, user3.id, staged_user.id]).delete_all
+  end
+
+  it 'raises an error when class is initialized with invalid setting name' do
+    expect do
+      described_class.new('some_random_setting_name', previous_value: '', new_value: '')
+    end.to raise_error(RuntimeError, "Invalid setting_name")
+  end
+
+  describe '#backfill!' do
+    context 'for default_sidebar_categories setting' do
+      it 'deletes the right sidebar section link records when categories are removed' do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "#{category.id}|#{category2.id}|#{category3.id}",
+          new_value: "#{category3.id}"
+        )
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.count }.by(-3)
+
+        expect(SidebarSectionLink.exists?(id: category_sidebar_section_link_ids)).to eq(false)
+      end
+
+      it 'creates the right sidebar section link records when categories are added' do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "#{category.id}|#{category2.id}",
+          new_value: "#{category.id}|#{category2.id}|#{category3.id}"
+        )
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.count }.by(3)
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+      end
+
+      it 'deletes and creates the right sidebar section link records when categories are added and removed' do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "#{category.id}|#{category2.id}",
+          new_value: "#{category3.id}"
+        )
+
+        original_count = SidebarSectionLink.count
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category.id).count }.by(-2)
+          .and change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category2.id).count }.by(-1)
+          .and change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).count }.by(3)
+
+        expect(SidebarSectionLink.count).to eq(original_count) # Net change of 0
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+      end
+    end
+
+    context 'for default_sidebar_tags setting' do
+      it 'deletes the right sidebar section link records when tags are removed' do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
+          new_value: "#{tag3.name}"
+        )
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.count }.by(-3)
+
+        expect(SidebarSectionLink.exists?(id: tag_sidebar_section_link_ids)).to eq(false)
+      end
+
+      it 'creates the right sidebar section link records when tags are added' do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "#{tag.name}|#{tag2.name}",
+          new_value: "#{tag.name}|#{tag2.name}|#{tag3.name}"
+        )
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.count }.by(3)
+
+        expect(SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+      end
+
+      it 'deletes and creates the right sidebar section link records when tags are added and removed' do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "#{tag.name}|#{tag2.name}",
+          new_value: "#{tag3.name}"
+        )
+
+        original_count = SidebarSectionLink.count
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag.id).count }.by(-2)
+          .and change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag2.id).count }.by(-1)
+          .and change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).count }.by(3)
+
+        expect(SidebarSectionLink.count).to eq(original_count) # net change of 0
+
+        expect(SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+      end
+    end
+  end
+
+  describe '#number_of_users_to_backfill' do
+    context 'for default_sidebar_categories setting' do
+      it "returns 3 for the user count when a new category for all users is added" do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "",
+          new_value: "#{category3.id}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(3)
+      end
+
+      it "returns 2 for the user count when category which 2 users have configured in sidebar is removed" do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "#{category.id}|#{category2.id}",
+          new_value: "#{category2.id}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(2)
+      end
+
+      # category, category2 => category2, category3
+      it "returns 3 for the user count when a new category is added and a category is removed" do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "#{category.id}|#{category2.id}",
+          new_value: "#{category2.id}|#{category3.id}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(3)
+      end
+    end
+
+    context 'for default_sidebar_tags setting' do
+      it "returns 3 for the user count when a new tag for all users is added" do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "",
+          new_value: "#{tag3.name}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(3)
+      end
+
+      # tag, tag2 => tag2
+      it "returns 2 for the user count when tag which 2 users have configured in sidebar is removed" do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "#{tag.name}|#{tag2.name}",
+          new_value: "#{tag2.name}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(2)
+      end
+
+      # tag, tag2 => tag2, tag3
+      it "returns 3 for the user count when a new tag is added and a tag is removed" do
+        backfiller = described_class.new(
+          "default_sidebar_tags",
+          previous_value: "#{tag.name}|#{tag2.name}",
+          new_value: "#{tag2.name}|#{tag3.name}"
+        )
+
+        expect(backfiller.number_of_users_to_backfill).to eq(3)
+      end
+    end
+  end
+end

From 101ec21bc9a7f6a2c673d3d643df5825dba019e6 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 27 Oct 2022 11:26:14 +0800
Subject: [PATCH 299/332] SECURITY: Restrict display of topic titles associated
 with user badges (#18768)

Before this commit, we did not have guardian checks in place to determine if a
topic's title associated with a user badge should be displayed or not.
This means that the topic title of topics with restricted access
could be leaked to anon and users without access if certain conditions
are met. While we will not specify the conditions required, we have internally
assessed that the odds of meeting such conditions are low.

With this commit, we will now apply a guardian check to ensure that the
current user is able to see a topic before the topic's title is included
in the serialized object of a `UserBadge`.
---
 app/controllers/user_badges_controller.rb     | 13 ++-
 ...r_badge_post_and_topic_attributes_mixin.rb | 27 ++++++
 .../detailed_user_badge_serializer.rb         | 25 ++++--
 app/serializers/user_badge_serializer.rb      |  8 +-
 spec/fabricators/user_badge_fabricator.rb     |  8 ++
 spec/requests/user_badges_controller_spec.rb  | 80 ++++++++++++++++-
 .../detailed_user_badge_serializer_spec.rb    | 89 +++++++++++++++++++
 .../serializers/user_badge_serializer_spec.rb | 89 +++++++++++++++++++
 8 files changed, 325 insertions(+), 14 deletions(-)
 create mode 100644 app/serializers/concerns/user_badge_post_and_topic_attributes_mixin.rb
 create mode 100644 spec/fabricators/user_badge_fabricator.rb
 create mode 100644 spec/serializers/detailed_user_badge_serializer_spec.rb
 create mode 100644 spec/serializers/user_badge_serializer_spec.rb

diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index abf2b9f054..d87504d9a2 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -24,11 +24,19 @@ class UserBadgesController < ApplicationController
       user_badges = user_badges.offset(offset.to_i)
     end
 
+    user_badges_topic_ids = user_badges.map { |user_badge| user_badge.post&.topic_id }.compact
+
     user_badges = UserBadges.new(user_badges: user_badges,
                                  username: params[:username],
                                  grant_count: grant_count)
 
-    render_serialized(user_badges, UserBadgesSerializer, root: :user_badge_info, include_long_description: true)
+    render_serialized(
+      user_badges,
+      UserBadgesSerializer,
+      root: :user_badge_info,
+      include_long_description: true,
+      allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: user_badges_topic_ids)
+    )
   end
 
   def username
@@ -46,9 +54,12 @@ class UserBadgesController < ApplicationController
       .includes(post: :topic)
       .includes(:granted_by)
 
+    user_badges_topic_ids = user_badges.map { |user_badge| user_badge.post&.topic_id }.compact
+
     render_serialized(
       user_badges,
       DetailedUserBadgeSerializer,
+      allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: user_badges_topic_ids),
       root: :user_badges,
     )
   end
diff --git a/app/serializers/concerns/user_badge_post_and_topic_attributes_mixin.rb b/app/serializers/concerns/user_badge_post_and_topic_attributes_mixin.rb
new file mode 100644
index 0000000000..3710dc5f23
--- /dev/null
+++ b/app/serializers/concerns/user_badge_post_and_topic_attributes_mixin.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Post and topic attributes are only included when the `allowed_user_badge_topic_ids` option is provided. The caller of the
+# serializer is responsible for ensuring that the topic ids in the options can be seen by the scope of the user by passing
+# the result of `Guardian#can_see_topic_ids` to the `allowed_user_badge_topic_ids` option.
+module UserBadgePostAndTopicAttributesMixin
+  private
+
+  def include_post_attributes?
+    return false if !object.badge.show_posts || !object.post
+    return true if scope.is_admin?
+
+    allowed_user_badge_topic_ids = options[:allowed_user_badge_topic_ids]
+
+    return false if allowed_user_badge_topic_ids.blank?
+
+    topic_id = object.post.topic_id
+
+    return false if topic_id.blank?
+
+    allowed_user_badge_topic_ids.include?(topic_id)
+  end
+
+  def include_topic_attributes?
+    include_post_attributes? && object.post.topic
+  end
+end
diff --git a/app/serializers/detailed_user_badge_serializer.rb b/app/serializers/detailed_user_badge_serializer.rb
index b924fffb26..e31d8f8e8a 100644
--- a/app/serializers/detailed_user_badge_serializer.rb
+++ b/app/serializers/detailed_user_badge_serializer.rb
@@ -1,27 +1,34 @@
 # frozen_string_literal: true
 
 class DetailedUserBadgeSerializer < BasicUserBadgeSerializer
+  include UserBadgePostAndTopicAttributesMixin
+
   has_one :granted_by, serializer: UserBadgeSerializer::UserSerializer
 
   attributes :post_number, :topic_id, :topic_title, :is_favorite, :can_favorite
 
-  def include_post_number?
-    object.post
+  def post_number
+    object.post.post_number
   end
 
-  alias :include_topic_id? :include_post_number?
-  alias :include_topic_title? :include_post_number?
-
-  def post_number
-    object.post.post_number if object.post
+  def include_post_number?
+    include_post_attributes?
   end
 
   def topic_id
-    object.post.topic_id if object.post
+    object.post.topic_id
+  end
+
+  def include_topic_id?
+    include_topic_attributes?
   end
 
   def topic_title
-    object.post.topic.title if object.post && object.post.topic
+    object.post.topic.title
+  end
+
+  def include_topic_title?
+    include_topic_id?
   end
 
   def can_favorite
diff --git a/app/serializers/user_badge_serializer.rb b/app/serializers/user_badge_serializer.rb
index 6f904b01b5..4b2b536ef5 100644
--- a/app/serializers/user_badge_serializer.rb
+++ b/app/serializers/user_badge_serializer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class UserBadgeSerializer < ApplicationSerializer
+  include UserBadgePostAndTopicAttributesMixin
 
   class UserSerializer < BasicUserSerializer
     include UserPrimaryGroupMixin
@@ -22,10 +23,9 @@ class UserBadgeSerializer < ApplicationSerializer
   end
 
   def include_post_id?
-    object.badge.show_posts && object.post_id && object.post
+    include_post_attributes?
   end
 
-  alias :include_topic? :include_post_id?
   alias :include_post_number? :include_post_id?
 
   def post_number
@@ -35,4 +35,8 @@ class UserBadgeSerializer < ApplicationSerializer
   def topic
     object.post.topic
   end
+
+  def include_topic?
+    include_topic_attributes?
+  end
 end
diff --git a/spec/fabricators/user_badge_fabricator.rb b/spec/fabricators/user_badge_fabricator.rb
new file mode 100644
index 0000000000..b1d8f259a4
--- /dev/null
+++ b/spec/fabricators/user_badge_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:user_badge) do
+  user
+  badge
+  granted_at { Time.zone.now }
+  granted_by(fabricator: :admin)
+end
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 119c6de0fa..e4452d1208 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -28,7 +28,18 @@ RSpec.describe UserBadgesController do
   end
 
   describe '#index' do
-    let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
+    fab!(:post) { Fabricate(:post) }
+    fab!(:private_message_post) { Fabricate(:private_message_post) }
+    let(:topic) { post.topic }
+    let(:private_message_topic) { private_message_post.topic }
+    fab!(:group) { Fabricate(:group) }
+    fab!(:private_category) { Fabricate(:private_category, group: group) }
+    fab!(:restricted_topic) { Fabricate(:topic, category: private_category) }
+    fab!(:restricted_post) { Fabricate(:post, topic: restricted_topic) }
+    fab!(:badge) { Fabricate(:badge, show_posts: true) }
+    fab!(:user_badge) { Fabricate(:user_badge, user: user, badge: badge, post: post) }
+    fab!(:user_badge_2) { Fabricate(:user_badge, badge: badge, post: private_message_post) }
+    fab!(:user_badge_3) { Fabricate(:user_badge, badge: badge, post: restricted_post) }
 
     it 'requires username or badge_id to be specified' do
       get "/user_badges.json"
@@ -57,7 +68,7 @@ RSpec.describe UserBadgesController do
 
       expect(response.status).to eq(200)
       parsed = response.parsed_body
-      expect(parsed["user_badge_info"]["user_badges"].length).to eq(1)
+      expect(parsed["user_badge_info"]["user_badges"].length).to eq(3)
     end
 
     it 'includes counts when passed the aggregate argument' do
@@ -70,6 +81,71 @@ RSpec.describe UserBadgesController do
       expect(parsed["user_badges"].first.has_key?('count')).to eq(true)
     end
 
+    context 'for post and topic attributes associated with user badge' do
+      it 'does not include the attributes for the private topic when user is anon' do
+        get "/user_badges.json", params: { badge_id: badge.id }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+
+        expect(parsed["topics"].map { |t| t["id"] }).to contain_exactly(post.topic_id)
+
+        parsed_user_badges = parsed["user_badge_info"]["user_badges"]
+
+        expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(post.id)
+        expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(post.post_number)
+      end
+
+      it 'does not include the attributes for topics which the current user cannot see' do
+        get "/user_badges.json", params: { badge_id: badge.id }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+
+        expect(parsed["topics"].map { |t| t["id"] }).to contain_exactly(post.topic_id)
+
+        parsed_user_badges = parsed["user_badge_info"]["user_badges"]
+
+        expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(post.id)
+        expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(post.post_number)
+      end
+
+      it 'includes the attributes for regular topic, private messages and restricted topics which the current user can see' do
+        group.add(user)
+        private_message_topic.allowed_users << user
+
+        sign_in(user)
+
+        get "/user_badges.json", params: { badge_id: badge.id }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+
+        expect(parsed["topics"].map { |t| t["id"] }).to contain_exactly(
+          post.topic_id,
+          private_message_post.topic_id,
+          restricted_post.topic_id
+        )
+
+        parsed_user_badges = parsed["user_badge_info"]["user_badges"]
+
+        expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(
+          post.id,
+          private_message_post.id,
+          restricted_post.id
+        )
+
+        expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(
+          post.post_number,
+          private_message_post.post_number,
+          restricted_post.post_number
+        )
+      end
+    end
+
     context 'with hidden profiles' do
       before do
         user.user_option.update_columns(hide_profile_and_presence: true)
diff --git a/spec/serializers/detailed_user_badge_serializer_spec.rb b/spec/serializers/detailed_user_badge_serializer_spec.rb
new file mode 100644
index 0000000000..6c4a713f10
--- /dev/null
+++ b/spec/serializers/detailed_user_badge_serializer_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+RSpec.describe DetailedUserBadgeSerializer do
+  describe '#topic_id and #topic_title attributes' do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:post) { Fabricate(:post) }
+    fab!(:badge) { Fabricate(:badge, show_posts: true) }
+    fab!(:user_badge) { Fabricate(:user_badge, badge: badge, post_id: post.id) }
+    let(:guardian) { Guardian.new(user_badge.user) }
+
+    it 'does not include attributes in serialized object when badge has not been configured to show posts' do
+      badge.update!(show_posts: false)
+
+      guardian = Guardian.new
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+        root: false,
+      ).as_json
+
+      expect(serialized[:topic_id]).to eq(nil)
+      expect(serialized[:topic_title]).to eq(nil)
+    end
+
+    it 'does not include attributes in serialized object when user badge is not associated with a post' do
+      user_badge.update!(post_id: nil)
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+        root: false
+      ).as_json
+
+      expect(serialized[:topic_id]).to eq(nil)
+      expect(serialized[:topic_title]).to eq(nil)
+    end
+
+    it 'does not include attributes in serialized object when user badge is not associated with a topic' do
+      post.topic.destroy!
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+        root: false
+      ).as_json
+
+      expect(serialized[:topic_id]).to eq(nil)
+      expect(serialized[:topic_title]).to eq(nil)
+    end
+
+    it 'does not include attributes in serialized object when allowed_user_badge_topic_ids option is not provided' do
+      serialized = described_class.new(user_badge, scope: guardian, root: false).as_json
+
+      expect(serialized[:topic_id]).to eq(nil)
+      expect(serialized[:topic_title]).to eq(nil)
+    end
+
+    it 'does not included attributes in serialized object when topic id is not present in allowed_user_badge_topic_ids option' do
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1]),
+        root: false
+      ).as_json
+
+      expect(serialized[:topic_id]).to eq(nil)
+      expect(serialized[:topic_title]).to eq(nil)
+    end
+
+    it 'includes attributes in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided' do
+      serialized = described_class.new(user_badge, scope: Guardian.new(admin), root: false).as_json
+
+      expect(serialized[:topic_id]).to eq(post.topic_id)
+      expect(serialized[:topic_title]).to eq(post.topic.title)
+    end
+
+    it 'includes attributes in serialized object when topic id is present in allowed_user_badge_topic_ids option' do
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+        root: false
+      ).as_json
+
+      expect(serialized[:topic_id]).to eq(post.topic_id)
+      expect(serialized[:topic_title]).to eq(post.topic.title)
+    end
+  end
+end
diff --git a/spec/serializers/user_badge_serializer_spec.rb b/spec/serializers/user_badge_serializer_spec.rb
new file mode 100644
index 0000000000..941c3445ef
--- /dev/null
+++ b/spec/serializers/user_badge_serializer_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+RSpec.describe UserBadgeSerializer do
+  describe '#topic' do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:post) { Fabricate(:post) }
+    fab!(:badge) { Fabricate(:badge, show_posts: true) }
+    fab!(:user_badge) { Fabricate(:user_badge, badge: badge, post_id: post.id) }
+    let(:guardian) { Guardian.new(user_badge.user) }
+
+    it 'is not included in serialized object when badge has not been configured to show posts' do
+      badge.update!(show_posts: false)
+
+      guardian = Guardian.new
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
+      ).as_json
+
+      expect(serialized[:topics]).to eq(nil)
+    end
+
+    it 'is not included in serialized object when user badge is not associated with a post' do
+      user_badge.update!(post_id: nil)
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
+      ).as_json
+
+      expect(serialized[:topics]).to eq(nil)
+    end
+
+    it 'is not included in serialized object when user badge is not associated with a topic' do
+      post.topic.destroy!
+
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
+      ).as_json
+
+      expect(serialized[:topics]).to eq(nil)
+    end
+
+    it 'is not included in serialized object when allowed_user_badge_topic_ids option is not provided' do
+      serialized = described_class.new(user_badge, scope: guardian).as_json
+
+      expect(serialized[:topics]).to eq(nil)
+    end
+
+    it 'is not included in serialized object when topic id is not present in allowed_user_badge_topic_ids option' do
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1])
+      ).as_json
+
+      expect(serialized[:topics]).to eq(nil)
+    end
+
+    it 'is included in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided' do
+      serialized = described_class.new(user_badge, scope: Guardian.new(admin)).as_json
+
+      serialized_topic = serialized[:topics][0]
+
+      expect(serialized_topic[:id]).to eq(post.topic_id)
+      expect(serialized_topic[:title]).to eq(post.topic.title)
+      expect(serialized_topic[:fancy_title]).to eq(post.topic.fancy_title)
+      expect(serialized_topic[:slug]).to eq(post.topic.slug)
+      expect(serialized_topic[:posts_count]).to eq(post.topic.reload.posts_count)
+    end
+
+    it 'is included in serialized object when topic id is present in allowed_user_badge_topic_ids option' do
+      serialized = described_class.new(user_badge,
+        scope: guardian,
+        allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
+      ).as_json
+
+      serialized_topic = serialized[:topics][0]
+
+      expect(serialized_topic[:id]).to eq(post.topic_id)
+      expect(serialized_topic[:title]).to eq(post.topic.title)
+      expect(serialized_topic[:fancy_title]).to eq(post.topic.fancy_title)
+      expect(serialized_topic[:slug]).to eq(post.topic.slug)
+      expect(serialized_topic[:posts_count]).to eq(post.topic.reload.posts_count)
+    end
+  end
+end

From 4b6a5f08faaae9264d1d35a394a4f35b455f1477 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Thu, 27 Oct 2022 14:59:27 +0800
Subject: [PATCH 300/332] FIX: Allow users already in automatic groups to log
 in (#18771)

---
 app/models/discourse_connect.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/discourse_connect.rb b/app/models/discourse_connect.rb
index fcdae32a4f..ff25698585 100644
--- a/app/models/discourse_connect.rb
+++ b/app/models/discourse_connect.rb
@@ -406,8 +406,12 @@ class DiscourseConnect < DiscourseConnectBase
 
   def add_user_to_groups(user, groups)
     groups.each do |group|
-      GroupUser.create!(user_id: user.id, group_id: group.id)
-      GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
+      begin
+        GroupUser.create!(user_id: user.id, group_id: group.id)
+        GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
+      rescue Exception => e
+        Discourse.warn_exception(e, message: "User already in group")
+      end
     end
   end
 

From 63886379316a1253510b2050e285c8405a140dc1 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 27 Oct 2022 13:07:24 +0100
Subject: [PATCH 301/332] FIX: Move group-box group name from class to data
 attribute (#18773)

Having the group name in the `class` attribute can cause a clash with 'real' CSS classes. Putting it in a data attribute is much safer, and can still be targetted via CSS if desired.
---
 app/assets/javascripts/discourse/app/templates/groups/index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index 2d818e83df..01a07552a8 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -22,7 +22,7 @@
         <div class="container">
           <div class="groups-boxes">
             {{#each this.groups as |group|}}
-              <LinkTo @route="group.members" @model={{group.name}} class={{concat "group-box " group.name}}>
+              <LinkTo @route="group.members" @model={{group.name}} class="group-box" data-group-name={{group.name}}>
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
                     {{#if group.flair_url}}

From 2556e5a715b926c775b7104cbe2c6178f8d4d2a7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 27 Oct 2022 10:59:58 -0400
Subject: [PATCH 302/332] FIX: a couple of topic elements are too wide (#18775)

---
 app/assets/stylesheets/common/base/topic-post.scss | 6 ++++--
 app/assets/stylesheets/desktop/topic-post.scss     | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 0468dee57b..9825e814e7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1221,8 +1221,10 @@ blockquote > *:last-child {
       border-bottom: 1px solid var(--danger-medium);
       line-height: 0.1em;
       margin: 1rem 0px;
-      width: 100%;
-
+      width: calc(
+        var(--topic-body-width) + var(--topic-avatar-width) +
+          (var(--topic-body-width-padding) * 2)
+      );
       .topic-post-visited-message {
         background-color: var(--secondary);
         color: var(--danger-medium);
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 6409b8a9f5..ebd6bb6571 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -509,10 +509,6 @@ blockquote {
       (var(--topic-body-width-padding) * 2)
   );
   max-width: 100%;
-  @media all and (max-width: 790px) {
-    // 32px is (left + right padding * 2) from .wrap in common/base/discourse.scss
-    max-width: calc(100vw - 32px);
-  }
 }
 
 /* hide the reply border above the time gap notices */

From a9f5af10659b864ddacbaf2782d5b6f1f826a1f4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 27 Oct 2022 18:16:18 +0100
Subject: [PATCH 303/332] UX: Allow linebreaks mid-word in github onebox file
 paths (#18777)

---
 app/assets/stylesheets/common/base/onebox.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index b8d75d913e..b35ae31a21 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -376,6 +376,10 @@ pre.onebox code ol.lines li:before {
   counter-increment: li-counter;
 }
 
+.onebox.githubblob h4 {
+  word-break: break-all;
+}
+
 pre.onebox code ol {
   margin-left: 0;
   line-height: var(--line-height-large);

From 9b1536fb833f00a1625fe198964e90a32bb5bc71 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 27 Oct 2022 12:29:50 -0600
Subject: [PATCH 304/332] DEV: Update expired reset password copy (#18778)

---
 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 b43b8f13a7..96184cd0d8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -826,7 +826,7 @@ en:
         other: "almost %{count} years ago"
 
   password_reset:
-    no_token: "Sorry, that password change link is too old. Select the Log In button and use 'I forgot my password' to get a new link."
+    no_token: 'Oops! The link you used no longer works. You can <a href="%{base_url}/login">Log In</a> now. If you forgot your password, you can <a href="%{base_url}/password-reset">request a link</a> to reset it.'
     choose_new: "Choose a new password"
     choose: "Choose a password"
     update: "Update Password"

From 952b033165c2b77872d8cc79b0678dc4293c5ee1 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Thu, 27 Oct 2022 15:12:34 -0400
Subject: [PATCH 305/332] FIX: Ensure that custom {{action}} modifier works
 with actions hash (#18779)

A callback that's provided as a string, such as `{{action "doSomething"}}`, may target the method `doSomething` on the context OR the context's `action` hash (if it exists).
---
 .../app/lib/ember-action-modifier.js          |   7 +-
 .../unit/lib/ember-action-modifer-test.js     | 107 ++++++++++++++++++
 2 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
index 61177cce93..2d3059befb 100644
--- a/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
+++ b/app/assets/javascripts/discourse/app/lib/ember-action-modifier.js
@@ -16,7 +16,12 @@ export const actionModifier = modifier(
     { on, bubbles, preventDefault, allowedKeys }
   ) => {
     const handler = (event) => {
-      const fn = typeof callback === "string" ? context[callback] : callback;
+      let fn;
+      if (typeof callback === "string") {
+        fn = context.actions?.[callback] ?? context[callback];
+      } else if (typeof callback === "function") {
+        fn = callback;
+      }
       if (fn === undefined) {
         throw new Error(
           "Unexpected callback for `action` modifier. Please provide either a function or the name of a method on the current context."
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
index 8ede3ff97b..6a865100e1 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
@@ -2,6 +2,7 @@ import { module, test } from "qunit";
 import { setupRenderingTest } from "ember-qunit";
 import { click, doubleClick, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
+import { default as ClassicComponent } from "@ember/component";
 
 module("Unit | Lib | ember-action-modifer", function (hooks) {
   setupRenderingTest(hooks);
@@ -73,4 +74,110 @@ module("Unit | Lib | ember-action-modifer", function (hooks) {
 
     assert.strictEqual(this.dblClicked, 0);
   });
+
+  module("used on a classic component", function () {
+    const ExampleClassicButton = ClassicComponent.extend({
+      tagName: "",
+      onDoSomething: null,
+
+      doSomething() {
+        this.onDoSomething?.("doSomething");
+      },
+    });
+    const ExampleClassicButtonWithActions = ClassicComponent.extend({
+      tagName: "",
+      onDoSomething: null,
+
+      doSomething() {
+        this.onDoSomething?.("doSomething");
+      },
+
+      actions: {
+        doSomething() {
+          this.onDoSomething?.("actions.doSomething");
+        },
+      },
+    });
+    const exampleClassicButtonTemplate = hbs`
+      <a
+        href
+        class="btn btn-default no-text mobile-gif-insert"
+        aria-label={{i18n "gif.composer_title"}}
+        {{action "doSomething"}}
+      >
+        {{d-icon "discourse-gifs-gif"}}
+      </a>
+    `;
+
+    hooks.beforeEach(function () {
+      this.owner.register(
+        "component:example-classic-button",
+        ExampleClassicButton
+      );
+      this.owner.register(
+        "template:components/example-classic-button",
+        exampleClassicButtonTemplate
+      );
+      this.owner.register(
+        "component:example-classic-button-with-actions",
+        ExampleClassicButtonWithActions
+      );
+      this.owner.register(
+        "template:components/example-classic-button-with-actions",
+        exampleClassicButtonTemplate
+      );
+    });
+
+    test("it can target a listener on the context", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onOneClick: (source) => {
+          assert.strictEqual(
+            source,
+            "doSomething",
+            "handler on context is invoked"
+          );
+          this.set("oneClicked", i++);
+        },
+        oneClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButton @onDoSomething={{this.onOneClick}} />
+      `);
+
+      assert.strictEqual(this.oneClicked, undefined);
+
+      await click("a.btn");
+
+      assert.strictEqual(this.oneClicked, 0);
+    });
+
+    test("it can target a listener on the actions hash", async function (assert) {
+      let i = 0;
+
+      this.setProperties({
+        onOneClick: (source) => {
+          assert.strictEqual(
+            source,
+            "actions.doSomething",
+            "handler on actions hash is given precedence"
+          );
+          this.set("oneClicked", i++);
+        },
+        oneClicked: undefined,
+      });
+
+      await render(hbs`
+        <ExampleClassicButtonWithActions @onDoSomething={{this.onOneClick}} />
+      `);
+
+      assert.strictEqual(this.oneClicked, undefined);
+
+      await click("a.btn");
+
+      assert.strictEqual(this.oneClicked, 0);
+    });
+  });
 });

From 9c2f0edbec240b85fde98c26a42d841f456a8ee5 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 27 Oct 2022 15:27:53 -0400
Subject: [PATCH 306/332] UX: make whole category box clickable (#18780)

---
 .../app/templates/components/categories-boxes-with-topics.hbs  | 2 +-
 app/assets/stylesheets/common/base/category-list.scss          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
index 5a3b241b2c..3fa9f3e0e7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
@@ -2,7 +2,7 @@
   <div data-notification-level={{c.notificationLevelString}} style={{unless this.noCategoryStyle (html-safe (concat (border-color c.color) (category-color-variable c.color)))}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if this.noCategoryStyle "no-category-boxes-style"}}">
     <div class="category-box-inner">
       <div class="category-box-heading">
-        <a href={{c.url}}>
+        <a class="parent-box-link" href={{c.url}}>
           {{#unless c.isMuted}}
             {{#if c.uploaded_logo.url}}
               <CategoryLogo @category={{c}} />
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 3c267fdf1a..d6c4154eb6 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -275,6 +275,9 @@
 
   .featured-topics {
     margin-bottom: 1em;
+    // we absolutely position the parent category's link so the whole box is clickable
+    // to prevent this covering topic links, we need to raise the z-index
+    z-index: 1;
     ul {
       color: var(--primary-medium);
       list-style: none;

From 3e5d0f2e9929e5e37d37ebd3677951ed4a59c034 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 06:36:18 +0800
Subject: [PATCH 307/332] Build(deps): Bump json_schemer from 0.2.21 to 0.2.22
 (#18782)

Bumps [json_schemer](https://github.com/davishmcclurg/json_schemer) from 0.2.21 to 0.2.22.
- [Release notes](https://github.com/davishmcclurg/json_schemer/releases)
- [Commits](https://github.com/davishmcclurg/json_schemer/compare/v0.2.21...v0.2.22)

---
updated-dependencies:
- dependency-name: json_schemer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f2c46fe56b..b7050cadf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
     json (2.6.2)
     json-schema (3.0.0)
       addressable (>= 2.8)
-    json_schemer (0.2.21)
+    json_schemer (0.2.22)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)

From 249f322ac91e7dc8dd5c04d0a8bfe9859a64d022 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 06:37:58 +0800
Subject: [PATCH 308/332] Build(deps-dev): Bump test-prof from 1.0.10 to 1.0.11
 (#18781)

Bumps [test-prof](https://github.com/test-prof/test-prof) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/test-prof/test-prof/releases)
- [Changelog](https://github.com/test-prof/test-prof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/test-prof/test-prof/compare/v1.0.10...v1.0.11)

---
updated-dependencies:
- dependency-name: test-prof
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b7050cadf7..16185f1f1e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -471,7 +471,7 @@ GEM
       sprockets (>= 3.0.0)
     sshkey (2.0.0)
     stackprof (0.2.22)
-    test-prof (1.0.10)
+    test-prof (1.0.11)
     thor (1.2.1)
     tilt (2.0.11)
     timeout (0.3.0)

From d99293d83749ef9746649c2ca4764ad1d6ee243d Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 28 Oct 2022 10:01:11 +1100
Subject: [PATCH 309/332] FEATURE: reduce suspicious distance logins warning to
 100km (#18767)

Suspicious login emails are incredibly rare, we are concerned they are in
fact too rare. Attempt to reduce the distance down to 100km.
---
 config/site_settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index e7bca7d67d..2145dbddd8 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -498,7 +498,7 @@ login:
     default: false
   max_suspicious_distance_km:
     hidden: true
-    default: 500
+    default: 100
   discourse_connect_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'

From 4244b1c57d40bda3b07d1b7de8fcdb24ebd800ad Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 28 Oct 2022 07:47:41 +0800
Subject: [PATCH 310/332] FIX: Ignore unique conflicts when backfilling sidebar
 defaults (#18785)

`insert_all!` raises an error when the insertion violates any unique
constraints which is not what we want here.

Follow-up to 1b56a55f5087091a8573849a42c78f63992e1142
---
 .../sidebar_site_settings_backfiller.rb       |  2 +-
 .../sidebar_site_settings_backfiller_spec.rb  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/services/sidebar_site_settings_backfiller.rb b/app/services/sidebar_site_settings_backfiller.rb
index 3154e6a663..f24383d84b 100644
--- a/app/services/sidebar_site_settings_backfiller.rb
+++ b/app/services/sidebar_site_settings_backfiller.rb
@@ -48,7 +48,7 @@ class SidebarSiteSettingsBackfiller
           end
         end
 
-        SidebarSectionLink.insert_all!(rows) if rows.present?
+        SidebarSectionLink.insert_all(rows) if rows.present?
       end
     end
   end
diff --git a/spec/services/sidebar_site_settings_backfiller_spec.rb b/spec/services/sidebar_site_settings_backfiller_spec.rb
index 42b614e6aa..b88bf74394 100644
--- a/spec/services/sidebar_site_settings_backfiller_spec.rb
+++ b/spec/services/sidebar_site_settings_backfiller_spec.rb
@@ -80,6 +80,36 @@ RSpec.describe SidebarSiteSettingsBackfiller do
         )
       end
 
+      it 'creates the right sidebar section link records when categories are added' do
+        backfiller = described_class.new(
+          "default_sidebar_categories",
+          previous_value: "",
+          new_value: "#{category.id}|#{category2.id}|#{category3.id}"
+        )
+
+        expect do
+          backfiller.backfill!
+        end.to change { SidebarSectionLink.count }.by(6)
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category2.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+
+        expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
+          user.id,
+          user2.id,
+          user3.id
+        )
+      end
+
       it 'deletes and creates the right sidebar section link records when categories are added and removed' do
         backfiller = described_class.new(
           "default_sidebar_categories",

From fa5f43e7c09914fe7ea6265b43961d29a3e1764e Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 28 Oct 2022 02:30:14 +0200
Subject: [PATCH 311/332] DEV: Delete old `buffered-render` attributes (#18786)

That mixin was removed in 1a31a403cefda7ead706076cc0a0decdb38a80c8 (January 2020)
---
 app/assets/javascripts/discourse/app/components/count-i18n.js    | 1 -
 .../javascripts/discourse/app/components/navigation-item.js      | 1 -
 .../javascripts/discourse/app/components/popup-input-tip.js      | 1 -
 .../javascripts/discourse/app/components/topic-post-badges.js    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js
index db3782df53..6fa2ca3141 100644
--- a/app/assets/javascripts/discourse/app/components/count-i18n.js
+++ b/app/assets/javascripts/discourse/app/components/count-i18n.js
@@ -4,7 +4,6 @@ import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   tagName: "span",
-  rerenderTriggers: ["count", "suffix"],
   i18nCount: null,
 
   didReceiveAttrs() {
diff --git a/app/assets/javascripts/discourse/app/components/navigation-item.js b/app/assets/javascripts/discourse/app/components/navigation-item.js
index 6c64f2c61b..dfad382460 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-item.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-item.js
@@ -13,7 +13,6 @@ export default Component.extend(FilterModeMixin, {
   ],
   attributeBindings: ["content.title:title"],
   hidden: false,
-  rerenderTriggers: ["content.count"],
   activeClass: "",
   hrefLink: null,
 
diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
index e92c143e9a..8508a7e761 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.js
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
@@ -8,7 +8,6 @@ export default Component.extend({
   tagName: "a",
   classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
   attributeBindings: ["role", "ariaLabel", "tabindex"],
-  rerenderTriggers: ["validation.reason"],
   tipReason: null,
   lastShownAt: or("shownAt", "validation.lastShownAt"),
   bad: reads("validation.failed"),
diff --git a/app/assets/javascripts/discourse/app/components/topic-post-badges.js b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
index aced410bbd..deb0238aad 100644
--- a/app/assets/javascripts/discourse/app/components/topic-post-badges.js
+++ b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
@@ -5,7 +5,6 @@ import { or } from "@ember/object/computed";
 export default Component.extend({
   tagName: "span",
   classNameBindings: [":topic-post-badges"],
-  rerenderTriggers: ["url", "unread", "newPosts", "unreadPosts", "unseen"],
   newDotText: null,
 
   init() {

From e120c942361f20ca727d6b806863d9f81b657f98 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 28 Oct 2022 13:27:12 +0300
Subject: [PATCH 312/332] FIX: Don't attempt to add user again to a group when
 syncing groups via SSO (#18772)

This commit fixes a regression introduced in 8979adc where under certain conditions the groups syncing logic in Discourse Connect would try to add users to groups they're already members of and cause errors when users try to sign in using Discourse Connect.
---
 app/models/discourse_connect.rb       | 22 ++++++++++------------
 spec/models/discourse_connect_spec.rb | 12 +++++++++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/models/discourse_connect.rb b/app/models/discourse_connect.rb
index ff25698585..ede77372f8 100644
--- a/app/models/discourse_connect.rb
+++ b/app/models/discourse_connect.rb
@@ -187,15 +187,17 @@ class DiscourseConnect < DiscourseConnectBase
   def synchronize_groups(user)
     names = (groups || "").split(",").map(&:downcase)
 
-    to_be_added = Group.where('LOWER(NAME) in (?) AND NOT automatic', names)
-    to_be_removed = Group.joins(:group_users).where(automatic: false, group_users: { user_id: user.id })
+    current_groups = user.groups.where(automatic: false)
+    desired_groups = Group.where('LOWER(NAME) in (?) AND NOT automatic', names)
 
-    if to_be_added.present?
-      to_be_removed = to_be_removed.where("groups.id NOT IN (?)", to_be_added.map(&:id)).to_a
+    to_be_added = desired_groups
+    if current_groups.present?
+      to_be_added = to_be_added.where("groups.id NOT IN (?)", current_groups.map(&:id))
     end
 
-    if to_be_removed.present?
-      to_be_added = to_be_added.where("groups.id NOT IN (?)", to_be_removed.map(&:id)).to_a
+    to_be_removed = current_groups
+    if desired_groups.present?
+      to_be_removed = to_be_removed.where("groups.id NOT IN (?)", desired_groups.map(&:id))
     end
 
     if to_be_added.present? || to_be_removed.present?
@@ -406,12 +408,8 @@ class DiscourseConnect < DiscourseConnectBase
 
   def add_user_to_groups(user, groups)
     groups.each do |group|
-      begin
-        GroupUser.create!(user_id: user.id, group_id: group.id)
-        GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
-      rescue Exception => e
-        Discourse.warn_exception(e, message: "User already in group")
-      end
+      GroupUser.create!(user_id: user.id, group_id: group.id)
+      GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
     end
   end
 
diff --git a/spec/models/discourse_connect_spec.rb b/spec/models/discourse_connect_spec.rb
index a55a50b519..81a679ba33 100644
--- a/spec/models/discourse_connect_spec.rb
+++ b/spec/models/discourse_connect_spec.rb
@@ -206,7 +206,7 @@ RSpec.describe DiscourseConnect do
     expect(group2.usernames).to eq("")
 
     group1.add(user)
-    group1.save
+    group1.save!
 
     sso.lookup_or_create_user(ip_address)
     expect(group1.usernames).to eq("")
@@ -216,6 +216,16 @@ RSpec.describe DiscourseConnect do
     sso.lookup_or_create_user(ip_address)
     expect(group1.usernames).to eq("")
     expect(group2.usernames).to eq("")
+
+    group1.add(user)
+    group1.save!
+    group2.add(user)
+    group2.save!
+    sso.groups = "#{group1.name},badname,trust_level_4"
+
+    sso.lookup_or_create_user(ip_address)
+    expect(group1.usernames).to eq(user.username)
+    expect(group2.usernames).to eq("")
   end
 
   it "can specify groups" do

From 0297c79cbec2b56437d53d0c9edbc31db206a06e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 28 Oct 2022 08:37:08 -0400
Subject: [PATCH 313/332] FIX: simplify display of multiple AJAX errors  
 (#18763)

Our dialog service doesn't accept HTML by default and we shouldn't include HTML in the error message string. And given that the Ajax error handler is called in multiple contexts, it's tricky to properly support line breaks via either HTML or `\n` so we are opting for plain text in AJAX error messages.
---
 app/assets/javascripts/discourse/app/lib/ajax-error.js | 10 ++++++++--
 .../discourse/tests/acceptance/category-edit-test.js   |  5 ++++-
 .../acceptance/group-manage-email-settings-test.js     |  6 ++++--
 config/locales/client.en.yml                           |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/ajax-error.js b/app/assets/javascripts/discourse/app/lib/ajax-error.js
index 55a9a80833..cf93622a8c 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax-error.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax-error.js
@@ -33,8 +33,14 @@ export function extractError(error, defaultMessage) {
   }
 
   if (parsedJSON) {
-    if (parsedJSON.errors && parsedJSON.errors.length > 0) {
-      parsedError = parsedJSON.errors.join("<br>");
+    if (parsedJSON.errors?.length > 1) {
+      parsedError = I18n.t("multiple_errors", {
+        errors: parsedJSON.errors.map((e, i) => `${i + 1}) ${e}`).join(" "),
+      });
+    } else if (parsedJSON.errors?.length > 0) {
+      parsedError = I18n.t("generic_error_with_reason", {
+        error: parsedJSON.errors[0],
+      });
     } else if (parsedJSON.error) {
       parsedError = parsedJSON.error;
     } else if (parsedJSON.message) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index 5042f2c614..9f777d5877 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   acceptance,
   count,
@@ -166,7 +167,9 @@ acceptance("Category Edit", function (needs) {
 
     assert.strictEqual(
       query(".dialog-body").textContent.trim(),
-      "duplicate email"
+      I18n.t("generic_error_with_reason", {
+        error: "duplicate email",
+      })
     );
 
     await click(".dialog-footer .btn-primary");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
index 9fb6577981..e7eaf493bc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
@@ -363,8 +363,10 @@ acceptance(
 
       assert.strictEqual(
         query(".dialog-body").innerText.trim(),
-        "There was an issue with the SMTP credentials provided, check the username and password and try again.",
-        "shows a dialogue with the error message from the server"
+        I18n.t("generic_error_with_reason", {
+          error:
+            "There was an issue with the SMTP credentials provided, check the username and password and try again.",
+        })
       );
       await click(".dialog-footer .btn-primary");
     });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7ac6707db4..f8da524387 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -257,6 +257,7 @@ en:
     delete: "Delete"
     generic_error: "Sorry, an error has occurred."
     generic_error_with_reason: "An error occurred: %{error}"
+    multiple_errors: "Multiple errors occurred: %{errors}"
     sign_up: "Sign Up"
     log_in: "Log In"
     age: "Age"

From f70d71c5e3054f5d6290511d685e1dc6257375a2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 28 Oct 2022 11:34:38 -0600
Subject: [PATCH 314/332] UX: Change emoji graphic on invite error page
 (#18790)

Switch to using the sweat-smile emoji instead of the cry emoji on the
error page when you have already redeemed your invite.
---
 app/views/invites/show.html.erb    | 2 +-
 public/images/sweat-smile-face.svg | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 public/images/sweat-smile-face.svg

diff --git a/app/views/invites/show.html.erb b/app/views/invites/show.html.erb
index e403e247db..08051aecfe 100644
--- a/app/views/invites/show.html.erb
+++ b/app/views/invites/show.html.erb
@@ -2,7 +2,7 @@
   <%if flash[:error]%>
     <div class='invite-error'>
       <div class="error-image">
-        <img src="/images/crying-face.svg" alt="crying-face emoji">
+        <img src="/images/sweat-smile-face.svg" alt="sweat-smile-face emoji">
       </div>
       <div class="error-info">
         <%=flash[:error].html_safe%>
diff --git a/public/images/sweat-smile-face.svg b/public/images/sweat-smile-face.svg
new file mode 100644
index 0000000000..c12a20dc33
--- /dev/null
+++ b/public/images/sweat-smile-face.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" width="6em" height="6em" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18-9.94 0-18-8.059-18-18C0 8.06 8.06 0 18 0c9.941 0 18 8.06 18 18"/><path fill="#664500" d="M28.457 17.797c-.06-.135-1.499-3.297-4.457-3.297-2.957 0-4.397 3.162-4.457 3.297-.092.207-.032.449.145.591.175.142.426.147.61.014.012-.009 1.262-.902 3.702-.902 2.426 0 3.674.881 3.702.901.088.066.194.099.298.099.11 0 .221-.037.312-.109.177-.142.238-.386.145-.594zm-12 0c-.06-.135-1.499-3.297-4.457-3.297-2.957 0-4.397 3.162-4.457 3.297-.092.207-.032.449.144.591.176.142.427.147.61.014.013-.009 1.262-.902 3.703-.902 2.426 0 3.674.881 3.702.901.088.066.194.099.298.099.11 0 .221-.037.312-.109.178-.142.237-.386.145-.594zM18 22c-3.623 0-6.027-.422-9-1-.679-.131-2 0-2 2 0 4 4.595 9 11 9 6.404 0 11-5 11-9 0-2-1.321-2.132-2-2-2.973.578-5.377 1-9 1z"/><path fill="#FFF" d="M9 23s3 1 9 1 9-1 9-1-2 4-9 4-9-4-9-4z"/><path fill="#5DADEC" d="M35 11c0 2.762-2.238 5-5 5s-5-2.238-5-5 4-10 5-10 5 7.238 5 10z"/></svg>

From f7a4fd1f496ef6e930a022181028b632c278e5e7 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 28 Oct 2022 15:41:26 -0600
Subject: [PATCH 315/332] FIX: Follow up fixes for password-reset error page
 (#18794)

* FIX: Follow up fixes for password-reset error page

Pass in `base_url` to the template
Use `.html_safe` since the message now contains html

Follow up to: 9b1536fb833f00a1625fe198964e90a32bb5bc71

* Update specs to pass in the base_url
---
 app/controllers/users_controller.rb     |  2 +-
 app/views/users/password_reset.html.erb |  2 +-
 spec/requests/users_controller_spec.rb  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 63f06911f3..49c7ea03c2 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1895,7 +1895,7 @@ class UsersController < ApplicationController
       @user = User.find(user_id) if user_id > 0
     end
 
-    @error = I18n.t('password_reset.no_token') if !@user
+    @error = I18n.t('password_reset.no_token', base_url: Discourse.base_url) if !@user
   end
 
   def respond_to_suspicious_request
diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index 43e09d7eae..9b9a5268f6 100644
--- a/app/views/users/password_reset.html.erb
+++ b/app/views/users/password_reset.html.erb
@@ -1,7 +1,7 @@
 <div id="simple-container">
   <%if @error%>
     <div class='alert alert-error'>
-      <%= @error %>
+      <%= @error.html_safe %>
     </div>
   <%end%>
   <% if @user.present? and @user.errors.present? %>
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 5c41f7d92b..f9c70f3355 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -178,7 +178,7 @@ RSpec.describe UsersController do
         SiteSetting.login_required = true
         get "/u/password-reset/#{token}"
         expect(response.status).to eq(200)
-        expect(CGI.unescapeHTML(response.body)).to include(I18n.t('password_reset.no_token'))
+        expect(CGI.unescapeHTML(response.body)).to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
       end
     end
 
@@ -189,7 +189,7 @@ RSpec.describe UsersController do
         expect(response.status).to eq(200)
 
         expect(CGI.unescapeHTML(response.body))
-          .to include(I18n.t('password_reset.no_token'))
+          .to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
 
         expect(response.body).to_not have_tag(:script, with: {
           src: '/assets/application.js'
@@ -202,7 +202,7 @@ RSpec.describe UsersController do
         get "/u/password-reset/#{token}.json"
 
         expect(response.status).to eq(200)
-        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
         expect(session[:current_user_id]).to be_blank
       end
     end
@@ -214,7 +214,7 @@ RSpec.describe UsersController do
         expect(response.status).to eq(200)
 
         expect(CGI.unescapeHTML(response.body))
-          .to include(I18n.t('password_reset.no_token'))
+          .to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
 
         expect(response.body).to_not have_tag(:script, with: {
           src: '/assets/application.js'
@@ -227,7 +227,7 @@ RSpec.describe UsersController do
         put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" }
 
         expect(response.status).to eq(200)
-        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
         expect(session[:current_user_id]).to be_blank
       end
     end

From cfe264ee39f17dbf30c1a369ed9f7487a446cfa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 30 Oct 2022 21:32:41 +0100
Subject: [PATCH 316/332] Build(deps): Bump @babel/standalone in
 /app/assets/javascripts (#18784)

Bumps [@babel/standalone](https://github.com/babel/babel/tree/HEAD/packages/babel-standalone) from 7.19.6 to 7.20.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.0/packages/babel-standalone)

---
updated-dependencies:
- dependency-name: "@babel/standalone"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 33615ed7fa..651b94c8df 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.19.6",
-    "@babel/standalone": "^7.19.6",
+    "@babel/standalone": "^7.20.0",
     "@discourse/itsatrap": "^2.0.10",
     "@discourse/backburner.js": "^2.7.1-0",
     "@ember/jquery": "^2.0.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index e6b5413738..85bea386b9 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -985,10 +985,10 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/standalone@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.19.6.tgz#88674a287d3875a635b62afb066ebf162cedf13c"
-  integrity sha512-SUOBMtHlxGpXf14X85c1vtHyxYgIODBUdclntETSEGkgI274MNPBUkOVWpvFmRhMuLokK3CL07qJoK2e5CIToA==
+"@babel/standalone@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.20.0.tgz#0d5b9b57bde3923503e84a9ef1eef6da244b7d61"
+  integrity sha512-8toFReoMyknVN538KZYS9HJLUlpvibQiPQqt8TYFeyV+FlZUmM8TG2zcS8q4vAijCRLoAKT1EzeBVvbxjMfi9A==
 
 "@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
   version "7.18.10"

From 128b97d8106807922a387311c3e38f052477e0ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 30 Oct 2022 22:24:42 +0100
Subject: [PATCH 317/332] Build(deps): Bump net-smtp from 0.3.2 to 0.3.3
 (#18798)

Bumps [net-smtp](https://github.com/ruby/net-smtp) from 0.3.2 to 0.3.3.
- [Release notes](https://github.com/ruby/net-smtp/releases)
- [Changelog](https://github.com/ruby/net-smtp/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/net-smtp/compare/v0.3.2...v0.3.3)

---
updated-dependencies:
- dependency-name: net-smtp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 16185f1f1e..c5cc6ac8dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ GEM
       net-protocol
     net-protocol (0.1.3)
       timeout
-    net-smtp (0.3.2)
+    net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.9)

From 20b083354d7a683310aabcbca5ac7ba154afa915 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 30 Oct 2022 22:24:50 +0100
Subject: [PATCH 318/332] Build(deps): Bump cose from 1.2.1 to 1.3.0 (#18799)

Bumps [cose](https://github.com/cedarcode/cose-ruby) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/cedarcode/cose-ruby/releases)
- [Changelog](https://github.com/cedarcode/cose-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cedarcode/cose-ruby/compare/v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: cose
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c5cc6ac8dc..413c4edbb5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.10)
     connection_pool (2.3.0)
-    cose (1.2.1)
+    cose (1.3.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
     cppjieba_rb (0.4.2)

From 33946efd28c071506c62490aa68d3ac0ce88799d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 30 Oct 2022 22:40:43 +0100
Subject: [PATCH 319/332] Build(deps): Bump jsdom from 20.0.1 to 20.0.2 in
 /app/assets/javascripts (#18800)

Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.1 to 20.0.2.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/20.0.1...20.0.2)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/assets/javascripts/discourse/package.json | 2 +-
 app/assets/javascripts/yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 651b94c8df..9eb859ce6e 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -72,7 +72,7 @@
     "eslint-plugin-qunit": "^6.2.0",
     "html-entities": "^2.3.3",
     "js-yaml": "^4.1.0",
-    "jsdom": "^20.0.1",
+    "jsdom": "^20.0.2",
     "loader.js": "^4.7.0",
     "markdown-it": "^13.0.1",
     "message-bus-client": "^4.2.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 85bea386b9..4dee6eb138 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -7143,10 +7143,10 @@ js-yaml@^4.0.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^20.0.1:
-  version "20.0.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.1.tgz#d95b4a3b6e1eec6520aa01d9d908eade8c6ba153"
-  integrity sha512-pksjj7Rqoa+wdpkKcLzQRHhJCEE42qQhl/xLMUKHgoSejaKOdaXEAnqs6uDNwMl/fciHTzKeR8Wm8cw7N+g98A==
+jsdom@^20.0.2:
+  version "20.0.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db"
+  integrity sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==
   dependencies:
     abab "^2.0.6"
     acorn "^8.8.0"

From 5ee5031bfa7d92bfb81fddf6740176e59c4cc99b Mon Sep 17 00:00:00 2001
From: Gaurang Tandon <1gaurangtandon@gmail.com>
Date: Mon, 31 Oct 2022 03:55:37 +0530
Subject: [PATCH 320/332] UX: Fix grammar typo in trust_level_unlocked_tip
 (#18793)

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

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f8da524387..37f70e1cfb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5524,7 +5524,7 @@ en:
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
-        trust_level_unlocked_tip: "trust level is unlocked, system will may promote or demote user"
+        trust_level_unlocked_tip: "trust level is unlocked, system may promote or demote user"
         lock_trust_level: "Lock Trust Level"
         unlock_trust_level: "Unlock Trust Level"
         silenced_count: "Silenced"

From fa9e708cb7abd8282554dd982fdc7a1171031939 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Mon, 31 Oct 2022 01:26:20 +0300
Subject: [PATCH 321/332] FIX: Don't notify topic author about small action
 posts (#18789)

---
 app/services/post_alerter.rb       |  4 ++--
 spec/services/post_alerter_spec.rb | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index edd0deb69b..8c31d579ce 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -146,8 +146,8 @@ class PostAlerter
     # replies
     reply_to_user = post.reply_notification_target
 
-    if new_record
-      if reply_to_user && !notified.include?(reply_to_user) && notify_about_reply?(post)
+    if new_record && notify_about_reply?(post)
+      if reply_to_user && !notified.include?(reply_to_user)
         notified += notify_non_pm_users(reply_to_user, :replied, post)
       end
 
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 4dac502dd8..8f2b5e6830 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -1343,6 +1343,21 @@ RSpec.describe PostAlerter do
         read: false
       )).to eq(true)
     end
+
+    it "it doesn't notify about small action posts when the topic author is watching the topic " do
+      Jobs.run_immediately!
+
+      u1 = Fabricate(:admin)
+      u2 = Fabricate(:admin)
+
+      topic = create_topic(user: u1)
+
+      u1.notifications.destroy_all
+
+      expect do
+        topic.update_status("closed", true, u2, message: "hello world")
+      end.not_to change { u1.reload.notifications.count }
+    end
   end
 
   context "with category" do

From cfefdf0832fc9fc95624dbc34fef52e325dd189d Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 31 Oct 2022 06:42:55 +0800
Subject: [PATCH 322/332] UX: Switch no categories/tags configured text in
 sidebar to a link (#18787)

Internal Ref: /t/73500
---
 .../sidebar/user/categories-section.hbs         | 11 ++++++++---
 .../sidebar/user/categories-section.js          | 12 ------------
 .../components/sidebar/user/tags-section.hbs    | 11 ++++++++---
 .../app/components/sidebar/user/tags-section.js | 10 ----------
 .../sidebar-user-categories-section-test.js     | 10 +++++++---
 .../sidebar-user-tags-section-test.js           | 17 ++++++++++-------
 config/locales/client.en.yml                    |  8 ++++++++
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 72708bf5f4..e44793bc4a 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -25,9 +25,14 @@
         </Sidebar::SectionLink>
       {{/each}}
     {{else}}
-      <Sidebar::SectionMessage>
-        {{html-safe this.noCategoriesText}}
-      </Sidebar::SectionMessage>
+      <Sidebar::SectionLink
+        @linkName="configure-categories"
+        @route="preferences.sidebar"
+        @prefixType="icon"
+        @prefixValue="pencil-alt"
+        @model={{this.currentUser}}
+        @content={{i18n "sidebar.sections.categories.links.add_categories.content"}}
+        @title={{i18n "sidebar.sections.categories.links.add_categories.title"}} />
     {{/if}}
 
     <Sidebar::Common::AllCategoriesSectionLink />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
index f20fc093b1..0877cfa82f 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
@@ -1,5 +1,3 @@
-import I18n from "I18n";
-
 import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
 
@@ -32,16 +30,6 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
     });
   }
 
-  get noCategoriesText() {
-    const url = `/u/${this.currentUser.username}/preferences/sidebar`;
-
-    return `${I18n.t(
-      "sidebar.sections.categories.none"
-    )} <a href="${url}">${I18n.t(
-      "sidebar.sections.categories.click_to_get_started"
-    )}</a>`;
-  }
-
   /**
    * If a site has no default sidebar categories configured, show categories section if the user has categories configured.
    * Otherwise, hide the categories section from the sidebar for the user.
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
index 0086cdd58e..c097fe86c0 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
@@ -21,9 +21,14 @@
         </Sidebar::SectionLink>
       {{/each}}
     {{else}}
-      <Sidebar::SectionMessage>
-        {{html-safe this.noTagsText}}
-      </Sidebar::SectionMessage>
+      <Sidebar::SectionLink
+        @linkName="configure-tags"
+        @route="preferences.sidebar"
+        @prefixType="icon"
+        @prefixValue="pencil-alt"
+        @model={{this.currentUser}}
+        @content={{i18n "sidebar.sections.tags.links.add_tags.content"}}
+        @title={{i18n "sidebar.sections.tags.links.add_tags.title"}} />
     {{/if}}
 
     <Sidebar::Common::AllTagsSectionLink />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index 0bd4150123..950d9fea91 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -1,5 +1,3 @@
-import I18n from "I18n";
-
 import { cached } from "@glimmer/tracking";
 import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
@@ -57,14 +55,6 @@ export default class SidebarUserTagsSection extends Component {
     return links;
   }
 
-  get noTagsText() {
-    const url = `/u/${this.currentUser.username}/preferences/sidebar`;
-
-    return `${I18n.t("sidebar.sections.tags.none")} <a href="${url}">${I18n.t(
-      "sidebar.sections.tags.click_to_get_started"
-    )}</a>`;
-  }
-
   /**
    * If a site has no default sidebar tags configured, show tags section if the user has personal sidebar tags configured.
    * Otherwise, hide the tags section from the sidebar for the user.
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index c5e11bf95d..1c4fe5086f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -159,11 +159,15 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.ok(
-      exists(".sidebar-section-message"),
-      "the no categories message is displayed"
+      exists(
+        ".sidebar-section-categories .sidebar-section-link-configure-categories"
+      ),
+      "section link to add categories to sidebar is displayed"
     );
 
-    await click(".sidebar-section-message a");
+    await click(
+      ".sidebar-section-categories .sidebar-section-link-configure-categories"
+    );
 
     assert.strictEqual(
       currentURL(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index fd96263148..2e6da6ed49 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -139,14 +139,17 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
     assert.ok(exists(".sidebar-section-tags"), "tags section is shown");
 
+    assert.ok(
+      exists(".sidebar-section-tags .sidebar-section-link-configure-tags"),
+      "section link to add tags to sidebar is displayed"
+    );
+
+    await click(".sidebar-section-tags .sidebar-section-link-configure-tags");
+
     assert.strictEqual(
-      query(
-        ".sidebar-section-tags .sidebar-section-message"
-      ).textContent.trim(),
-      `${I18n.t("sidebar.sections.tags.none")} ${I18n.t(
-        "sidebar.sections.tags.click_to_get_started"
-      )}`,
-      "the no tags message is displayed"
+      currentURL(),
+      "/u/eviltrout/preferences/sidebar",
+      "it should transition to user preferences sidebar page"
     );
   });
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 37f70e1cfb..c1ce439588 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4196,12 +4196,20 @@ en:
             unread_with_count: "Unread (%{count})"
             archive: "Archive"
         tags:
+          links:
+            add_tags:
+              content: "Add tags"
+              title: "You have not added any tags. Click to get started."
           none: "You have not added any tags."
           click_to_get_started: "Click here to get started."
           header_link_text: "Tags"
           header_action_title: "edit your sidebar tags"
           configure_defaults: "Configure defaults"
         categories:
+          links:
+            add_categories:
+              content: "Add categories"
+              title: "You have not added any categories. Click to get started."
           none: "You have not added any categories."
           click_to_get_started: "Click here to get started."
           header_link_text: "Categories"

From 5e4bad0d8f60a3f07140669a674af0278ec881f4 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@discourse.org>
Date: Mon, 31 Oct 2022 10:13:56 +0800
Subject: [PATCH 323/332] FIX: Evaluate all callbacks rather than override them
 (#18788)

---
 .../discourse/app/widgets/post-menu.js        | 40 ++++++++-----------
 .../components/widgets/post-menu-test.js      | 13 ++++++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index c3e186caed..aa7df8b223 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -19,7 +19,7 @@ const VIBRATE_DURATION = 5;
 const _builders = {};
 export let apiExtraButtons = {};
 let _extraButtons = {};
-let _buttonsToRemove = {};
+let _buttonsToRemoveCallbacks = {};
 
 export function addButton(name, builder) {
   _extraButtons[name] = builder;
@@ -31,17 +31,13 @@ export function resetPostMenuExtraButtons() {
   }
 
   _extraButtons = {};
-  _buttonsToRemove = {};
+  _buttonsToRemoveCallbacks = {};
 }
 
 export function removeButton(name, callback) {
-  if (callback) {
-    _buttonsToRemove[name] = callback;
-  } else {
-    _buttonsToRemove[name] = () => {
-      return true;
-    };
-  }
+  // 🏌️
+  _buttonsToRemoveCallbacks[name] ??= [];
+  _buttonsToRemoveCallbacks[name].push(callback || (() => true));
 }
 
 function registerButton(name, builder) {
@@ -53,13 +49,9 @@ export function buildButton(name, widget) {
 
   let shouldAddButton = true;
 
-  if (_buttonsToRemove[name]) {
-    shouldAddButton = !_buttonsToRemove[name](
-      attrs,
-      state,
-      siteSettings,
-      settings,
-      currentUser
+  if (_buttonsToRemoveCallbacks[name]) {
+    shouldAddButton = !_buttonsToRemoveCallbacks[name].some((c) =>
+      c(attrs, state, siteSettings, settings, currentUser)
     );
   }
 
@@ -555,13 +547,15 @@ export default createWidget("post-menu", {
     Object.values(_extraButtons).forEach((builder) => {
       let shouldAddButton = true;
 
-      if (_buttonsToRemove[name]) {
-        shouldAddButton = !_buttonsToRemove[name](
-          attrs,
-          this.state,
-          this.siteSettings,
-          this.settings,
-          this.currentUser
+      if (_buttonsToRemoveCallbacks[name]) {
+        shouldAddButton = !_buttonsToRemoveCallbacks[name].some((c) =>
+          c(
+            attrs,
+            this.state,
+            this.siteSettings,
+            this.settings,
+            this.currentUser
+          )
         );
       }
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
index 776d942cb7..60f26df3f6 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
@@ -75,4 +75,17 @@ module("Integration | Component | Widget | post-menu", function (hooks) {
 
     assert.ok(!exists(".actions .reply"), "it removes reply button");
   });
+
+  test("removes button when any callback evaluates to true", async function (assert) {
+    this.set("args", {});
+
+    withPluginApi("0.14.0", (api) => {
+      api.removePostMenuButton("reply", () => true);
+      api.removePostMenuButton("reply", () => false);
+    });
+
+    await render(hbs`<MountWidget @widget="post-menu" @args={{this.args}} />`);
+
+    assert.ok(!exists(".actions .reply"), "it removes reply button");
+  });
 });

From 586454bcf1dc56597bff59633a1f61b78ce8d894 Mon Sep 17 00:00:00 2001
From: Selase Krakani <849886+s3lase@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:02:26 +0000
Subject: [PATCH 324/332] Refactor admin base controller (#18453)

* DEV: Add a dedicated Admin::StaffController base controller

The current parent(Admin:AdminController) for all admin-related controllers
uses a filter that allows only staff(admin, moderator) users.

This refactor makes Admin::AdminController filter for only admins as the name suggests and
introduces a base controller dedicated for staff-related endpoints.

* DEV: Set staff-only controllers parent to Admin::StaffController

Refactor staff-only controllers to inherit newly introduced
Admin::StaffController abstract controller. This conveys the
purpose of the parent controller better unlike the previously used parent
controller.
---
 app/controllers/admin/admin_controller.rb     |  3 +-
 app/controllers/admin/dashboard_controller.rb |  2 +-
 app/controllers/admin/groups_controller.rb    |  2 +-
 app/controllers/admin/plugins_controller.rb   |  2 +-
 app/controllers/admin/reports_controller.rb   |  2 +-
 .../admin/screened_emails_controller.rb       |  2 +-
 .../admin/screened_ip_addresses_controller.rb |  2 +-
 .../admin/screened_urls_controller.rb         |  2 +-
 .../admin/search_logs_controller.rb           |  2 +-
 .../admin/staff_action_logs_controller.rb     |  2 +-
 app/controllers/admin/staff_controller.rb     |  6 ++
 app/controllers/admin/users_controller.rb     |  2 +-
 app/controllers/admin/versions_controller.rb  |  2 +-
 .../admin/watched_words_controller.rb         |  2 +-
 .../admin/dashboard_controller_spec.rb        |  4 +-
 .../admin/email_styles_controller_spec.rb     |  4 +
 .../admin/email_templates_controller_spec.rb  | 25 +++++++
 spec/requests/admin/groups_controller_spec.rb |  4 +
 .../requests/admin/plugins_controller_spec.rb |  4 +-
 .../requests/admin/reports_controller_spec.rb |  4 +-
 .../admin/robots_txt_controller_spec.rb       | 41 ++++++----
 .../admin/screened_emails_controller_spec.rb  |  4 +-
 .../screened_ip_addresses_controller_spec.rb  |  4 +-
 .../admin/screened_urls_controller_spec.rb    |  4 +-
 spec/requests/admin/search_logs_spec.rb       | 31 ++++++++
 .../staff_action_logs_controller_spec.rb      |  4 +-
 spec/requests/admin/themes_controller_spec.rb |  2 +-
 spec/requests/admin/users_controller_spec.rb  |  4 +-
 .../admin/versions_controller_spec.rb         |  4 +-
 .../admin/watched_words_controller_spec.rb    | 74 +++++++++++++++----
 30 files changed, 190 insertions(+), 60 deletions(-)
 create mode 100644 app/controllers/admin/staff_controller.rb

diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
index b4728b2d5a..d9b1d705d9 100644
--- a/app/controllers/admin/admin_controller.rb
+++ b/app/controllers/admin/admin_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::AdminController < ApplicationController
-
   requires_login
-  before_action :ensure_staff
+  before_action :ensure_admin
 
   def index
     render body: nil
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 38e3fe0f07..0d524109d2 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::DashboardController < Admin::AdminController
+class Admin::DashboardController < Admin::StaffController
   def index
     data = AdminDashboardIndexData.fetch_cached_stats
 
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 61b09fffb2..377ceccaac 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::GroupsController < Admin::AdminController
+class Admin::GroupsController < Admin::StaffController
   def create
     guardian.ensure_can_create_group!
 
diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb
index 8df6c9dd14..b9e4913cc9 100644
--- a/app/controllers/admin/plugins_controller.rb
+++ b/app/controllers/admin/plugins_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::PluginsController < Admin::AdminController
+class Admin::PluginsController < Admin::StaffController
 
   def index
     render_serialized(Discourse.visible_plugins, AdminPluginSerializer, root: 'plugins')
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index e9be087108..90e7c4de1f 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::ReportsController < Admin::AdminController
+class Admin::ReportsController < Admin::StaffController
   def index
     reports_methods = ['page_view_total_reqs'] +
       ApplicationRequest.req_types.keys
diff --git a/app/controllers/admin/screened_emails_controller.rb b/app/controllers/admin/screened_emails_controller.rb
index b09eeccf2f..0e2ccc9161 100644
--- a/app/controllers/admin/screened_emails_controller.rb
+++ b/app/controllers/admin/screened_emails_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::ScreenedEmailsController < Admin::AdminController
+class Admin::ScreenedEmailsController < Admin::StaffController
 
   def index
     screened_emails = ScreenedEmail.limit(200).order('last_match_at desc').to_a
diff --git a/app/controllers/admin/screened_ip_addresses_controller.rb b/app/controllers/admin/screened_ip_addresses_controller.rb
index ac850b1120..a270fb0193 100644
--- a/app/controllers/admin/screened_ip_addresses_controller.rb
+++ b/app/controllers/admin/screened_ip_addresses_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::ScreenedIpAddressesController < Admin::AdminController
+class Admin::ScreenedIpAddressesController < Admin::StaffController
 
   before_action :fetch_screened_ip_address, only: [:update, :destroy]
 
diff --git a/app/controllers/admin/screened_urls_controller.rb b/app/controllers/admin/screened_urls_controller.rb
index e730fbfe3f..cedd7b0dfa 100644
--- a/app/controllers/admin/screened_urls_controller.rb
+++ b/app/controllers/admin/screened_urls_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::ScreenedUrlsController < Admin::AdminController
+class Admin::ScreenedUrlsController < Admin::StaffController
 
   def index
     screened_urls = ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at").group(:domain).order('last_match_at DESC').to_a
diff --git a/app/controllers/admin/search_logs_controller.rb b/app/controllers/admin/search_logs_controller.rb
index 1836df6b54..a36b77d2b7 100644
--- a/app/controllers/admin/search_logs_controller.rb
+++ b/app/controllers/admin/search_logs_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::SearchLogsController < Admin::AdminController
+class Admin::SearchLogsController < Admin::StaffController
 
   def index
     period = params[:period] || "all"
diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index 117bdf8415..a01e38ca82 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::StaffActionLogsController < Admin::AdminController
+class Admin::StaffActionLogsController < Admin::StaffController
 
   def index
     filters = params.slice(*UserHistory.staff_filters + [:page, :limit])
diff --git a/app/controllers/admin/staff_controller.rb b/app/controllers/admin/staff_controller.rb
new file mode 100644
index 0000000000..01d18fc92c
--- /dev/null
+++ b/app/controllers/admin/staff_controller.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class Admin::StaffController < ApplicationController
+  requires_login
+  before_action :ensure_staff
+end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 45f050a438..86a9ad4df1 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::UsersController < Admin::AdminController
+class Admin::UsersController < Admin::StaffController
 
   before_action :fetch_user, only: [:suspend,
                                     :unsuspend,
diff --git a/app/controllers/admin/versions_controller.rb b/app/controllers/admin/versions_controller.rb
index f8da407745..0977dc406e 100644
--- a/app/controllers/admin/versions_controller.rb
+++ b/app/controllers/admin/versions_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::VersionsController < Admin::AdminController
+class Admin::VersionsController < Admin::StaffController
   def show
     render json: DiscourseUpdates.check_version
   end
diff --git a/app/controllers/admin/watched_words_controller.rb b/app/controllers/admin/watched_words_controller.rb
index 6b825faedb..badfcd2173 100644
--- a/app/controllers/admin/watched_words_controller.rb
+++ b/app/controllers/admin/watched_words_controller.rb
@@ -2,7 +2,7 @@
 
 require 'csv'
 
-class Admin::WatchedWordsController < Admin::AdminController
+class Admin::WatchedWordsController < Admin::StaffController
   skip_before_action :check_xhr, only: [:download]
 
   def index
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 93c872e9a8..6f9e34881a 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -6,8 +6,8 @@ RSpec.describe Admin::DashboardController do
     Jobs::VersionCheck.any_instance.stubs(:execute).returns(true)
   end
 
-  it "is a subclass of AdminController" do
-    expect(Admin::DashboardController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::DashboardController < Admin::StaffController).to eq(true)
   end
 
   context 'while logged in as an admin' do
diff --git a/spec/requests/admin/email_styles_controller_spec.rb b/spec/requests/admin/email_styles_controller_spec.rb
index e0abdc4e94..6f857ef320 100644
--- a/spec/requests/admin/email_styles_controller_spec.rb
+++ b/spec/requests/admin/email_styles_controller_spec.rb
@@ -14,6 +14,10 @@ RSpec.describe Admin::EmailStylesController do
     SiteSetting.remove_override!(:email_custom_css)
   end
 
+  it "is a subclass of AdminController" do
+    expect(Admin::EmailStylesController < Admin::AdminController).to eq(true)
+  end
+
   describe 'show' do
     it 'returns default values' do
       get '/admin/customize/email_style.json'
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index f6110e6142..acdb55bd56 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe Admin::EmailTemplatesController do
   fab!(:admin) { Fabricate(:admin) }
+  fab!(:moderator) { Fabricate(:moderator) }
   fab!(:user) { Fabricate(:user) }
 
   def original_text(key)
@@ -17,6 +18,10 @@ RSpec.describe Admin::EmailTemplatesController do
     I18n.reload!
   end
 
+  it "is a subclass of AdminController" do
+    expect(Admin::EmailTemplatesController < Admin::AdminController).to eq(true)
+  end
+
   describe "#index" do
     it "raises an error if you aren't logged in" do
       get '/admin/customize/email_templates.json'
@@ -29,6 +34,12 @@ RSpec.describe Admin::EmailTemplatesController do
       expect(response.status).to eq(404)
     end
 
+    it "raises an error if you are a moderator" do
+      sign_in(moderator)
+      get "/admin/customize/email_templates.json"
+      expect(response.status).to eq(404)
+    end
+
     it "should work if you are an admin" do
       sign_in(admin)
       get '/admin/customize/email_templates.json'
@@ -79,6 +90,14 @@ RSpec.describe Admin::EmailTemplatesController do
       expect(response.status).to eq(404)
     end
 
+    it "raises an error if you are a moderator" do
+      sign_in(moderator)
+      put "/admin/customize/email_templates/some_id", params: {
+        email_template: { subject: "Subject", body: "Body" }
+      }, headers: headers
+      expect(response.status).to eq(404)
+    end
+
     context "when logged in as admin" do
       before do
         sign_in(admin)
@@ -268,6 +287,12 @@ RSpec.describe Admin::EmailTemplatesController do
       expect(response.status).to eq(404)
     end
 
+    it "raises an error if you are a moderator" do
+      sign_in(moderator)
+      delete "/admin/customize/email_templates/some_id", headers: headers
+      expect(response.status).to eq(404)
+    end
+
     context "when logged in as admin" do
       before do
         sign_in(admin)
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 7687f1767d..89ff772ea0 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -5,6 +5,10 @@ RSpec.describe Admin::GroupsController do
   fab!(:user) { Fabricate(:user) }
   fab!(:group) { Fabricate(:group) }
 
+  it 'is a subclass of StaffController' do
+    expect(Admin::UsersController < Admin::StaffController).to eq(true)
+  end
+
   before do
     sign_in(admin)
   end
diff --git a/spec/requests/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rb
index fe419277d0..fe83c428f6 100644
--- a/spec/requests/admin/plugins_controller_spec.rb
+++ b/spec/requests/admin/plugins_controller_spec.rb
@@ -2,8 +2,8 @@
 
 RSpec.describe Admin::PluginsController do
 
-  it "is a subclass of AdminController" do
-    expect(Admin::PluginsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::PluginsController < Admin::StaffController).to eq(true)
   end
 
   context "while logged in as an admin" do
diff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rb
index a15f33929f..41c21946fb 100644
--- a/spec/requests/admin/reports_controller_spec.rb
+++ b/spec/requests/admin/reports_controller_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Admin::ReportsController do
-  it "is a subclass of AdminController" do
-    expect(Admin::ReportsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::ReportsController < Admin::StaffController).to eq(true)
   end
 
   context 'while logged in as an admin' do
diff --git a/spec/requests/admin/robots_txt_controller_spec.rb b/spec/requests/admin/robots_txt_controller_spec.rb
index cb52c40828..f39b369d3e 100644
--- a/spec/requests/admin/robots_txt_controller_spec.rb
+++ b/spec/requests/admin/robots_txt_controller_spec.rb
@@ -6,27 +6,40 @@ RSpec.describe Admin::RobotsTxtController do
   end
 
   fab!(:admin) { Fabricate(:admin) }
+  fab!(:moderator) { Fabricate(:moderator) }
   fab!(:user) { Fabricate(:user) }
 
-  describe "non-admin users" do
-    before { sign_in(user) }
+  context "when logged in as a non-admin user" do
+    shared_examples "access_forbidden" do
+      it "can't see #show" do
+        get "/admin/customize/robots.json"
+        expect(response.status).to eq(404)
+      end
 
-    it "can't see #show" do
-      get "/admin/customize/robots.json"
-      expect(response.status).to eq(404)
+      it "can't perform #update" do
+        put "/admin/customize/robots.json", params: { robots_txt: "adasdasd" }
+        expect(response.status).to eq(404)
+        expect(SiteSetting.overridden_robots_txt).to eq("")
+      end
+
+      it "can't perform #reset" do
+        SiteSetting.overridden_robots_txt = "overridden_content"
+        delete "/admin/customize/robots.json"
+        expect(response.status).to eq(404)
+        expect(SiteSetting.overridden_robots_txt).to eq("overridden_content")
+      end
     end
 
-    it "can't perform #update" do
-      put "/admin/customize/robots.json", params: { robots_txt: "adasdasd" }
-      expect(response.status).to eq(404)
-      expect(SiteSetting.overridden_robots_txt).to eq("")
+    context "when logged in as a moderator" do
+      before { sign_in(moderator) }
+
+      include_examples "access_forbidden"
     end
 
-    it "can't perform #reset" do
-      SiteSetting.overridden_robots_txt = "overridden_content"
-      delete "/admin/customize/robots.json"
-      expect(response.status).to eq(404)
-      expect(SiteSetting.overridden_robots_txt).to eq("overridden_content")
+    context "when logged in as non-staff user" do
+      before { sign_in(user) }
+
+      include_examples "access_forbidden"
     end
   end
 
diff --git a/spec/requests/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rb
index 16294398c5..8d9fc48270 100644
--- a/spec/requests/admin/screened_emails_controller_spec.rb
+++ b/spec/requests/admin/screened_emails_controller_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Admin::ScreenedEmailsController do
-  it "is a subclass of AdminController" do
-    expect(Admin::ScreenedEmailsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::ScreenedEmailsController < Admin::StaffController).to eq(true)
   end
 
   describe '#index' do
diff --git a/spec/requests/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
index aa2e29a4de..f6f2a06880 100644
--- a/spec/requests/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
@@ -2,8 +2,8 @@
 
 RSpec.describe Admin::ScreenedIpAddressesController do
 
-  it "is a subclass of AdminController" do
-    expect(Admin::ScreenedIpAddressesController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::ScreenedIpAddressesController < Admin::StaffController).to eq(true)
   end
 
   fab!(:admin) { Fabricate(:admin) }
diff --git a/spec/requests/admin/screened_urls_controller_spec.rb b/spec/requests/admin/screened_urls_controller_spec.rb
index e77dd4c8f8..a4d5cb2d17 100644
--- a/spec/requests/admin/screened_urls_controller_spec.rb
+++ b/spec/requests/admin/screened_urls_controller_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Admin::ScreenedUrlsController do
-  it "is a subclass of AdminController" do
-    expect(Admin::ScreenedUrlsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::ScreenedUrlsController < Admin::StaffController).to eq(true)
   end
 
   describe '#index' do
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index 6f7c08d0c2..7692d528d7 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe Admin::SearchLogsController do
   fab!(:admin) { Fabricate(:admin) }
+  fab!(:moderator) { Fabricate(:moderator) }
   fab!(:user) { Fabricate(:user) }
 
   before do
@@ -12,6 +13,10 @@ RSpec.describe Admin::SearchLogsController do
     SearchLog.clear_debounce_cache!
   end
 
+  it "is a subclass of StaffController" do
+    expect(Admin::SearchLogsController < Admin::StaffController).to eq(true)
+  end
+
   describe "#index" do
     it "raises an error if you aren't logged in" do
       get '/admin/logs/search_logs.json'
@@ -35,6 +40,18 @@ RSpec.describe Admin::SearchLogsController do
       expect(json[0]['searches']).to eq(1)
       expect(json[0]['ctr']).to eq(0)
     end
+
+    it "should work if you are a moderator" do
+      sign_in(moderator)
+      get "/admin/logs/search_logs.json"
+
+      expect(response.status).to eq(200)
+
+      json = response.parsed_body
+      expect(json[0]["term"]).to eq("ruby")
+      expect(json[0]["searches"]).to eq(1)
+      expect(json[0]["ctr"]).to eq(0)
+    end
   end
 
   describe "#term" do
@@ -69,5 +86,19 @@ RSpec.describe Admin::SearchLogsController do
       expect(json['term']['type']).to eq('search_log_term')
       expect(json['term']['search_result']).to be_present
     end
+
+    it "should work if you are a moderator" do
+      sign_in(moderator)
+
+      get "/admin/logs/search_logs/term.json", params: {
+        term: "ruby"
+      }
+
+      expect(response.status).to eq(200)
+
+      json = response.parsed_body
+      expect(json["term"]["type"]).to eq("search_log_term")
+      expect(json["term"]["search_result"]).to be_present
+    end
   end
 end
diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
index ea88562e81..e59ae0fca6 100644
--- a/spec/requests/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Admin::StaffActionLogsController do
-  it "is a subclass of AdminController" do
-    expect(Admin::StaffActionLogsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::StaffActionLogsController < Admin::StaffController).to eq(true)
   end
 
   fab!(:admin) { Fabricate(:admin) }
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 1fc23f2abb..bb6ae42592 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Admin::ThemesController do
   fab!(:admin) { Fabricate(:admin) }
 
   it "is a subclass of AdminController" do
-    expect(Admin::UsersController < Admin::AdminController).to eq(true)
+    expect(Admin::ThemesController < Admin::AdminController).to eq(true)
   end
 
   before do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index eb561f08bf..1fc3bb70b4 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe Admin::UsersController do
   fab!(:user) { Fabricate(:user) }
   fab!(:coding_horror) { Fabricate(:coding_horror) }
 
-  it 'is a subclass of AdminController' do
-    expect(Admin::UsersController < Admin::AdminController).to eq(true)
+  it 'is a subclass of StaffController' do
+    expect(Admin::UsersController < Admin::StaffController).to eq(true)
   end
 
   before do
diff --git a/spec/requests/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb
index 1f4d743cc5..60515532aa 100644
--- a/spec/requests/admin/versions_controller_spec.rb
+++ b/spec/requests/admin/versions_controller_spec.rb
@@ -9,8 +9,8 @@ RSpec.describe Admin::VersionsController do
     DiscourseUpdates.stubs(:critical_updates_available?).returns(false)
   end
 
-  it "is a subclass of AdminController" do
-    expect(Admin::VersionsController < Admin::AdminController).to eq(true)
+  it "is a subclass of StaffController" do
+    expect(Admin::VersionsController < Admin::StaffController).to eq(true)
   end
 
   context 'while logged in as an admin' do
diff --git a/spec/requests/admin/watched_words_controller_spec.rb b/spec/requests/admin/watched_words_controller_spec.rb
index 41f1c4bddc..24a153e11f 100644
--- a/spec/requests/admin/watched_words_controller_spec.rb
+++ b/spec/requests/admin/watched_words_controller_spec.rb
@@ -4,31 +4,65 @@ require 'csv'
 
 RSpec.describe Admin::WatchedWordsController do
   fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  it "is a subclass of StaffController" do
+    expect(Admin::WatchedWordsController < Admin::StaffController).to eq(true)
+  end
 
   describe '#destroy' do
     fab!(:watched_word) { Fabricate(:watched_word) }
 
-    before do
-      sign_in(admin)
+    context "when logged in as a non-staff user" do
+      before do
+        sign_in(user)
+      end
+
+      it "can't delete a watched word" do
+        delete "/admin/customize/watched_words/#{watched_word.id}.json"
+
+        expect(response.status).to eq(404)
+      end
     end
 
-    it 'should return the right response when given an invalid id param' do
-      delete '/admin/customize/watched_words/9999.json'
+    context "when logged in as staff user" do
+      before do
+        sign_in(admin)
+      end
 
-      expect(response.status).to eq(400)
-    end
+      it 'should return the right response when given an invalid id param' do
+        delete "/admin/customize/watched_words/9999.json"
 
-    it 'should be able to delete a watched word' do
-      delete "/admin/customize/watched_words/#{watched_word.id}.json"
+        expect(response.status).to eq(400)
+      end
 
-      expect(response.status).to eq(200)
-      expect(WatchedWord.find_by(id: watched_word.id)).to eq(nil)
-      expect(UserHistory.where(action: UserHistory.actions[:watched_word_destroy]).count).to eq(1)
+      it "should be able to delete a watched word" do
+        delete "/admin/customize/watched_words/#{watched_word.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(WatchedWord.find_by(id: watched_word.id)).to eq(nil)
+        expect(UserHistory.where(action: UserHistory.actions[:watched_word_destroy]).count).to eq(1)
+      end
     end
   end
 
   describe '#create' do
-    context 'when logged in as admin' do
+    context "when logged in as a non-staff user" do
+      before do
+        sign_in(user)
+      end
+
+      it "can't create a watched word" do
+        post "/admin/customize/watched_words.json", params: {
+          action_key: 'flag',
+          word: 'Fr33'
+        }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when logged in as a staff user" do
       before do
         sign_in(admin)
       end
@@ -54,11 +88,25 @@ RSpec.describe Admin::WatchedWordsController do
         expect(WatchedWord.take.case_sensitive?).to eq(true)
         expect(WatchedWord.take.word).to eq('PNG')
       end
-
     end
   end
 
   describe '#upload' do
+    context "when logged in as a non-staff user" do
+      before do
+        sign_in(user)
+      end
+
+      it "can't create watched words via file upload" do
+        post "/admin/customize/watched_words/upload.json", params: {
+          action_key: 'flag',
+          file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv"))
+        }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
     context 'when logged in as admin' do
       before do
         sign_in(admin)

From d22fddf00af8338627d36fa076ee8a54da21637e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 31 Oct 2022 17:55:24 +0000
Subject: [PATCH 325/332] UX: Ensure image size is maintained even after
 loading error (#18805)

---
 app/assets/stylesheets/common/base/topic-post.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 9825e814e7..d80440f25e 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -196,6 +196,7 @@ $quote-share-maxwidth: 150px;
   img:not(.thumbnail):not(.ytp-thumbnail-image):not(.emoji) {
     max-width: 100%;
     height: auto;
+    display: inline-block; // Ensure dimensions are maintained even after load error
 
     @supports not (aspect-ratio: 1) {
       // (see javascripts/discourse/app/initializers/image-aspect-ratio.js)

From b912bb955fce64eab254ea5ffddf6e7e8459c7ec Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 31 Oct 2022 14:08:35 -0400
Subject: [PATCH 326/332] DEV: Mark `bootbox` as deprecated (#18795)

---
 .../app/initializers/jquery-plugins.js        | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
index 7bcf4275f9..60487deb30 100644
--- a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
+++ b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
@@ -1,5 +1,7 @@
 import autocomplete from "discourse/lib/autocomplete";
 import bootbox from "bootbox";
+import { getOwner } from "discourse-common/lib/get-owner";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default {
   name: "jquery-plugins",
@@ -8,6 +10,36 @@ export default {
     bootbox.animate(false);
     bootbox.backdrop(true);
 
+    // Monkey-patching simple alerts
+    const originalAlert = bootbox.alert;
+    bootbox.alert = function () {
+      if (arguments.length === 1) {
+        const dialog = getOwner(this).lookup("service:dialog");
+        if (dialog) {
+          deprecated(
+            "`bootbox.alert` is deprecated, please use the dialog service instead.",
+            {
+              dropFrom: "3.1.0.beta5",
+            }
+          );
+          return dialog.alert(arguments[0]);
+        }
+      }
+      return originalAlert(...arguments);
+    };
+
+    // adding deprecation notice for all other dialogs
+    const originalDialog = bootbox.dialog;
+    bootbox.dialog = function () {
+      deprecated(
+        "`bootbox` is now deprecated, please use the dialog service instead.",
+        {
+          dropFrom: "3.1.0.beta5",
+        }
+      );
+      return originalDialog(...arguments);
+    };
+
     // Initialize the autocomplete tool
     $.fn.autocomplete = autocomplete;
   },

From d1c5529aadda4942e4981f4fd9f7f9699dc9e231 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 06:54:19 +0800
Subject: [PATCH 327/332] Build(deps): Bump zeitwerk from 2.6.1 to 2.6.3
 (#18809)

Bumps [zeitwerk](https://github.com/fxn/zeitwerk) from 2.6.1 to 2.6.3.
- [Release notes](https://github.com/fxn/zeitwerk/releases)
- [Changelog](https://github.com/fxn/zeitwerk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fxn/zeitwerk/compare/v2.6.1...v2.6.3)

---
updated-dependencies:
- dependency-name: zeitwerk
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 413c4edbb5..1121400e09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -506,7 +506,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yaml-lint (0.0.10)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.3)
 
 PLATFORMS
   aarch64-linux

From 02304cae83206ab8640e23dca36949fc4039ae6a Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 1 Nov 2022 07:15:53 +0800
Subject: [PATCH 328/332] FIX: Can't change notification level of categories
 set to regular (#18801)

This commit fixes a bug on the client site where we would include the
`regular_category_ids` field when trying to update the notification levels of
categories for a user. The `regulary_category_ids` field should only be
included when the `mute_all_categories_by_default` is enabled
---
 .../app/controllers/preferences/categories.js | 33 +++++---
 .../javascripts/discourse/app/models/user.js  | 18 +++--
 .../app/templates/preferences/categories.hbs  | 10 +--
 .../user-preferences-categories-test.js       | 75 +++++++++++++++++++
 4 files changed, 116 insertions(+), 20 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/acceptance/user-preferences-categories-test.js

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/categories.js b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
index 16555cdad9..3611af258f 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
@@ -4,26 +4,41 @@ import { or } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
-  init() {
-    this._super(...arguments);
-
-    this.saveAttrNames = [
-      "muted_category_ids",
-      "regular_category_ids",
+  @discourseComputed("siteSettings.mute_all_categories_by_default")
+  saveAttrNames(muteAllCategoriesByDefault) {
+    return [
       "watched_category_ids",
       "tracked_category_ids",
       "watched_first_post_category_ids",
+      muteAllCategoriesByDefault
+        ? "regular_category_ids"
+        : "muted_category_ids",
     ];
   },
 
   @discourseComputed(
+    "siteSettings.mute_all_categories_by_default",
     "model.watchedCategories",
     "model.watchedFirstPostCategories",
     "model.trackedCategories",
-    "model.mutedCategories"
+    "model.mutedCategories",
+    "model.regularCategories"
   )
-  selectedCategories(watched, watchedFirst, tracked, muted) {
-    return [].concat(watched, watchedFirst, tracked, muted).filter((t) => t);
+  selectedCategories(
+    muteAllCategoriesByDefault,
+    watched,
+    watchedFirst,
+    tracked,
+    muted,
+    regular
+  ) {
+    let categories = [].concat(watched, watchedFirst, tracked);
+
+    categories = categories.concat(
+      muteAllCategoriesByDefault ? regular : muted
+    );
+
+    return categories.filter((t) => t);
   },
 
   @discourseComputed
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 80b093c568..6be7b0398f 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -398,22 +398,28 @@ const User = RestModel.extend({
     let updatedState = {};
 
     ["muted", "regular", "watched", "tracked", "watched_first_post"].forEach(
-      (s) => {
-        if (fields === undefined || fields.includes(s + "_category_ids")) {
+      (categoryNotificationLevel) => {
+        if (
+          fields === undefined ||
+          fields.includes(`${categoryNotificationLevel}_category_ids`)
+        ) {
           let prop =
-            s === "watched_first_post"
+            categoryNotificationLevel === "watched_first_post"
               ? "watchedFirstPostCategories"
-              : s + "Categories";
+              : `${categoryNotificationLevel}Categories`;
+
           let cats = this.get(prop);
+
           if (cats) {
             let cat_ids = cats.map((c) => c.get("id"));
-            updatedState[s + "_category_ids"] = cat_ids;
+            updatedState[`${categoryNotificationLevel}_category_ids`] = cat_ids;
 
             // HACK: denote lack of categories
             if (cats.length === 0) {
               cat_ids = [-1];
             }
-            data[s + "_category_ids"] = cat_ids;
+
+            data[`${categoryNotificationLevel}_category_ids`] = cat_ids;
           }
         }
       }
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
index ac28c0b2ce..8a0b2b716b 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
@@ -1,7 +1,7 @@
 <div class="control-group category-notifications">
   <label class="control-label">{{i18n "user.categories_settings"}}</label>
 
-  <div class="controls tracking-controls">
+  <div class="controls tracking-controls tracking-controls--watched-categories">
     <label>{{d-icon "d-watching"}} {{i18n "user.watched_categories"}}</label>
     {{#if this.canSee}}
       <a class="show-tracking" href={{this.model.watchingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
@@ -10,7 +10,7 @@
   </div>
   <div class="instructions">{{i18n "user.watched_categories_instructions"}}</div>
 
-  <div class="controls tracking-controls">
+  <div class="controls tracking-controls tracking-controls--tracked-categories">
     <label>{{d-icon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>
     {{#if this.canSee}}
       <a class="show-tracking" href={{this.model.trackingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
@@ -19,20 +19,20 @@
   </div>
   <div class="instructions">{{i18n "user.tracked_categories_instructions"}}</div>
 
-  <div class="controls tracking-controls">
+  <div class="controls tracking-controls tracking-controls--watched-first-categories">
     <label>{{d-icon "d-watching-first"}} {{i18n "user.watched_first_post_categories"}}</label>
     <CategorySelector @categories={{this.model.watchedFirstPostCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.watchedFirstPostCategories)}} />
   </div>
   <div class="instructions">{{i18n "user.watched_first_post_categories_instructions"}}</div>
 
   {{#if this.siteSettings.mute_all_categories_by_default}}
-    <div class="controls tracking-controls">
+    <div class="controls tracking-controls tracking-controls--regular-categories">
       <label>{{d-icon "d-regular"}} {{i18n "user.regular_categories"}}</label>
       <CategorySelector @categories={{this.model.regularCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.regularCategories)}} />
     </div>
     <div class="instructions">{{i18n "user.regular_categories_instructions"}}</div>
   {{else}}
-    <div class="controls tracking-controls">
+    <div class="controls tracking-controls tracking-controls--muted-categories">
       <label>{{d-icon "d-muted"}} {{i18n "user.muted_categories"}}</label>
       {{#if this.canSee}}
         <a class="show-tracking" href={{this.model.mutedTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-categories-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-categories-test.js
new file mode 100644
index 0000000000..2674921aae
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-categories-test.js
@@ -0,0 +1,75 @@
+import { test } from "qunit";
+import { click, visit } from "@ember/test-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+acceptance("User Preferences - Categories", function (needs) {
+  needs.user();
+
+  let putRequestData;
+
+  needs.pretender((server, helper) => {
+    server.put("/u/eviltrout.json", (request) => {
+      putRequestData = helper.parsePostData(request.requestBody);
+      return helper.response({ user: {} });
+    });
+  });
+
+  needs.hooks.afterEach(() => {
+    putRequestData = null;
+  });
+
+  test("tracking category which is set to regular notification level for user when mute_all_categories_by_default site setting is enabled", async function (assert) {
+    this.siteSettings.mute_all_categories_by_default = true;
+
+    await visit("/u/eviltrout/preferences/categories");
+
+    const trackedCategoriesSelector = selectKit(
+      ".tracking-controls--tracked-categories .category-selector"
+    );
+
+    await trackedCategoriesSelector.expand();
+
+    assert.notOk(
+      trackedCategoriesSelector.rowByValue("4").exists(),
+      "category that is set to regular is not available for selection"
+    );
+
+    const regularCategoriesSelector = selectKit(
+      ".tracking-controls--regular-categories .category-selector"
+    );
+
+    await regularCategoriesSelector.expand();
+    await regularCategoriesSelector.deselectItemByValue("4");
+    await trackedCategoriesSelector.expand();
+    await trackedCategoriesSelector.selectRowByValue("4");
+    await click(".save-changes");
+
+    assert.deepEqual(putRequestData, {
+      "regular_category_ids[]": ["-1"],
+      "tracked_category_ids[]": ["4"],
+      "watched_category_ids[]": ["3"],
+      "watched_first_post_category_ids[]": ["-1"],
+    });
+  });
+
+  test("tracking category which is set to regular notification level for user when mute_all_categories_by_default site setting is disabled", async function (assert) {
+    await visit("/u/eviltrout/preferences/categories");
+
+    const categorySelector = selectKit(
+      ".tracking-controls--tracked-categories .category-selector"
+    );
+
+    await categorySelector.expand();
+    // User has `regular_category_ids` set to [4] in fixtures
+    await categorySelector.selectRowByValue(4);
+    await click(".save-changes");
+
+    assert.deepEqual(putRequestData, {
+      "muted_category_ids[]": ["-1"],
+      "tracked_category_ids[]": ["4"],
+      "watched_category_ids[]": ["3"],
+      "watched_first_post_category_ids[]": ["-1"],
+    });
+  });
+});

From 695b44269b9d09250a44aa40ff8a5ba4f96064f2 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 1 Nov 2022 13:56:33 +0000
Subject: [PATCH 329/332] DEV: Do not remove `debugger` statements from themes
 (#18814)

---
 app/models/theme.rb              | 2 +-
 lib/theme_javascript_compiler.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/theme.rb b/app/models/theme.rb
index 6dbe460a22..c8b577763f 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,7 +6,7 @@ require 'json_schemer'
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 66
+  BASE_COMPILER_VERSION = 67
 
   attr_accessor :child_components
 
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 25975dbb60..f4f7047fe2 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -52,6 +52,7 @@ class ThemeJavascriptCompiler
       compress: {
         negate_iife: false,
         sequences: 30,
+        drop_debugger: false,
       },
       output: {
         semicolons: false,

From 68b4fe4cf876ba4838dfc797655a038d34d2b27f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 1 Nov 2022 16:33:17 +0000
Subject: [PATCH 330/332] SECURITY: Expand and improve SSRF Protections
 (#18815)

See https://github.com/discourse/discourse/security/advisories/GHSA-rcc5-28r3-23rr

Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
Co-authored-by: Daniel Waterworth <me@danielwaterworth.com>
---
 Gemfile.lock                                  |   2 +-
 .../addon/controllers/admin-web-hooks-show.js |  40 +--
 .../controllers/modals/admin-install-theme.js |  52 ++--
 .../templates/modal/admin-install-theme.hbs   |  24 +-
 .../admin-install-theme-modal-test.js         |  16 --
 .../discourse/tests/acceptance/themes-test.js |   1 -
 app/controllers/admin/themes_controller.rb    |   6 +-
 app/controllers/admin/web_hooks_controller.rb |  16 +-
 app/jobs/regular/emit_web_hook_event.rb       |  37 +--
 app/models/remote_theme.rb                    |   9 +-
 app/models/web_hook.rb                        |  18 ++
 app/services/web_hook_emitter.rb              |  57 +++++
 config/initializers/000-zeitwerk.rb           |   4 +-
 config/locales/client.en.yml                  |   2 -
 config/locales/server.en.yml                  |   5 +
 lib/final_destination.rb                      |  96 ++-----
 lib/final_destination/faraday_adapter.rb      |  22 ++
 lib/final_destination/http.rb                 |  40 +++
 lib/final_destination/resolver.rb             |  54 ++++
 lib/final_destination/ssrf_detector.rb        |  88 +++++++
 lib/git_url.rb                                |  20 ++
 lib/onebox/engine/google_maps_onebox.rb       |   2 +-
 lib/onebox/helpers.rb                         |   4 +-
 lib/onebox/status_check.rb                    |   8 +-
 lib/theme_store/git_importer.rb               | 120 ++++++---
 spec/jobs/emit_web_hook_event_spec.rb         |  26 +-
 spec/lib/cooked_post_processor_spec.rb        |   1 -
 spec/lib/final_destination/http_spec.rb       | 110 ++++++++
 spec/lib/final_destination/resolver_spec.rb   |  44 ++++
 .../final_destination/ssrf_detector_spec.rb   | 104 ++++++++
 spec/lib/final_destination_spec.rb            | 241 +++++++-----------
 spec/lib/git_url_spec.rb                      |  15 ++
 spec/lib/onebox/helpers_spec.rb               |  22 +-
 spec/lib/onebox/status_check_spec.rb          |   6 +
 spec/lib/theme_store/git_importer_spec.rb     |  51 +++-
 spec/models/remote_theme_spec.rb              |  19 +-
 spec/models/web_hook_spec.rb                  |  29 +++
 spec/requests/admin/themes_controller_spec.rb |  18 +-
 .../admin/web_hooks_controller_spec.rb        |  58 +++++
 spec/services/themes_spec.rb                  |  35 ++-
 spec/support/final_destination_helper.rb      |  29 +++
 spec/support/mock_git_importer.rb             |  56 ++++
 42 files changed, 1164 insertions(+), 443 deletions(-)
 create mode 100644 app/services/web_hook_emitter.rb
 create mode 100644 lib/final_destination/faraday_adapter.rb
 create mode 100644 lib/final_destination/http.rb
 create mode 100644 lib/final_destination/resolver.rb
 create mode 100644 lib/final_destination/ssrf_detector.rb
 create mode 100644 lib/git_url.rb
 create mode 100644 spec/lib/final_destination/http_spec.rb
 create mode 100644 spec/lib/final_destination/resolver_spec.rb
 create mode 100644 spec/lib/final_destination/ssrf_detector_spec.rb
 create mode 100644 spec/lib/git_url_spec.rb
 create mode 100644 spec/support/final_destination_helper.rb
 create mode 100644 spec/support/mock_git_importer.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 1121400e09..84fa798d48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustache (1.1.1)
-    net-http (0.3.0)
+    net-http (0.2.2)
       uri
     net-imap (0.3.1)
       net-protocol
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
index ba75e29199..f1e8caadcf 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
@@ -3,8 +3,6 @@ import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
-import { extractDomainFromUrl } from "discourse/lib/utilities";
-import { isAbsoluteURL } from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
@@ -89,38 +87,20 @@ export default Controller.extend({
   actions: {
     save() {
       this.set("saved", false);
-      const url = this.get("model.payload_url");
-      const domain = extractDomainFromUrl(url);
       const model = this.model;
       const isNew = model.get("isNew");
 
-      const saveWebHook = () => {
-        return model
-          .save()
-          .then(() => {
-            this.set("saved", true);
-            this.adminWebHooks.get("model").addObject(model);
+      return model
+        .save()
+        .then(() => {
+          this.set("saved", true);
+          this.adminWebHooks.get("model").addObject(model);
 
-            if (isNew) {
-              this.transitionToRoute("adminWebHooks.show", model.get("id"));
-            }
-          })
-          .catch(popupAjaxError);
-      };
-
-      if (
-        domain === "localhost" ||
-        domain.match(/192\.168\.\d+\.\d+/) ||
-        domain.match(/127\.\d+\.\d+\.\d+/) ||
-        isAbsoluteURL(url)
-      ) {
-        return this.dialog.yesNoConfirm({
-          message: I18n.t("admin.web_hooks.warn_local_payload_url"),
-          didConfirm: () => saveWebHook(),
-        });
-      }
-
-      return saveWebHook();
+          if (isNew) {
+            this.transitionToRoute("adminWebHooks.show", model.get("id"));
+          }
+        })
+        .catch(popupAjaxError);
     },
 
     destroy() {
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
index d42446ddbb..a3553d8f7c 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
@@ -31,6 +31,7 @@ export default Controller.extend(ModalFunctionality, {
   advancedVisible: false,
   selectedType: alias("themesController.currentTab"),
   component: equal("selectedType", COMPONENTS),
+  urlPlaceholder: "https://github.com/discourse/sample_theme",
 
   init() {
     this._super(...arguments);
@@ -79,29 +80,6 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
-  @discourseComputed("privateChecked")
-  urlPlaceholder(privateChecked) {
-    return privateChecked
-      ? "git@github.com:discourse/sample_theme.git"
-      : "https://github.com/discourse/sample_theme";
-  },
-
-  @observes("privateChecked")
-  privateWasChecked() {
-    const checked = this.privateChecked;
-    if (checked && !this._keyLoading) {
-      this._keyLoading = true;
-      ajax(this.keyGenUrl, { type: "POST" })
-        .then((pair) => {
-          this.set("publicKey", pair.public_key);
-        })
-        .catch(popupAjaxError)
-        .finally(() => {
-          this._keyLoading = false;
-        });
-    }
-  },
-
   @discourseComputed("name")
   nameTooShort(name) {
     return !name || name.length < MIN_NAME_LENGTH;
@@ -116,6 +94,22 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  @observes("checkPrivate")
+  privateWasChecked() {
+    const checked = this.checkPrivate;
+    if (checked && !this._keyLoading && !this.publicKey) {
+      this._keyLoading = true;
+      ajax(this.keyGenUrl, { type: "POST" })
+        .then((pair) => {
+          this.set("publicKey", pair.public_key);
+        })
+        .catch(popupAjaxError)
+        .finally(() => {
+          this._keyLoading = false;
+        });
+    }
+  },
+
   @discourseComputed("selection", "themeCannotBeInstalled")
   submitLabel(selection, themeCannotBeInstalled) {
     if (themeCannotBeInstalled) {
@@ -127,15 +121,14 @@ export default Controller.extend(ModalFunctionality, {
     }`;
   },
 
-  @discourseComputed("privateChecked", "checkPrivate", "publicKey")
-  showPublicKey(privateChecked, checkPrivate, publicKey) {
-    return privateChecked && checkPrivate && publicKey;
+  @discourseComputed("checkPrivate", "publicKey")
+  showPublicKey(checkPrivate, publicKey) {
+    return checkPrivate && publicKey;
   },
 
   onClose() {
     this.setProperties({
       duplicateRemoteThemeWarning: null,
-      privateChecked: false,
       localFile: null,
       uploadUrl: null,
       publicKey: null,
@@ -209,11 +202,8 @@ export default Controller.extend(ModalFunctionality, {
         options.data = {
           remote: this.uploadUrl,
           branch: this.branch,
+          public_key: this.publicKey,
         };
-
-        if (this.privateChecked) {
-          options.data.public_key = this.publicKey;
-        }
       }
 
       // User knows that theme cannot be installed, but they want to continue
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
index cebb9a6121..5f0f0c5413 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
@@ -61,25 +61,15 @@
             <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
             <Input @value={{this.branch}} placeholder="main" />
           </div>
+        {{/if}}
 
-          <div class="check-private">
-            <label>
-              <Input @type="checkbox" @checked={{this.privateChecked}} />
-              {{i18n "admin.customize.theme.is_private"}}
-            </label>
-          </div>
-          {{#if this.showPublicKey}}
-            <div class="public-key">
-              <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
-              <div class="public-key-text-wrapper">
-                <Textarea class="public-key-value" readonly={{true}} @value={{this.publicKey}} />                <CopyButton @selector="textarea.public-key-value" />
-              </div>
+        {{#if this.showPublicKey}}
+          <div class="public-key">
+            <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
+            <div class="public-key-text-wrapper">
+              <Textarea class="public-key-value" readonly={{true}} @value={{this.publicKey}} />                <CopyButton @selector="textarea.public-key-value" />
             </div>
-          {{else}}
-            {{#if this.privateChecked}}
-              <div class="public-key-note">{{i18n "admin.customize.theme.public_key_note"}}</div>
-            {{/if}}
-          {{/if}}
+          </div>
         {{/if}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
index 7ecab0566e..b02f30355d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
@@ -8,7 +8,6 @@ acceptance("Admin - Themes - Install modal", function (needs) {
   test("closing the modal resets the modal inputs", async function (assert) {
     const urlInput = ".install-theme-content .repo input";
     const branchInput = ".install-theme-content .branch input";
-    const privateRepoCheckbox = ".install-theme-content .check-private input";
     const publicKey = ".install-theme-content .public-key textarea";
 
     const themeUrl = "git@github.com:discourse/discourse.git";
@@ -19,17 +18,12 @@ acceptance("Admin - Themes - Install modal", function (needs) {
     await fillIn(urlInput, themeUrl);
     await click(".install-theme-content .inputs .advanced-repo");
     await fillIn(branchInput, "tests-passed");
-    await click(privateRepoCheckbox);
     assert.strictEqual(query(urlInput).value, themeUrl, "url input is filled");
     assert.strictEqual(
       query(branchInput).value,
       "tests-passed",
       "branch input is filled"
     );
-    assert.ok(
-      query(privateRepoCheckbox).checked,
-      "private repo checkbox is checked"
-    );
     assert.ok(query(publicKey), "shows public key");
 
     await click(".modal-footer .d-modal-cancel");
@@ -38,16 +32,11 @@ acceptance("Admin - Themes - Install modal", function (needs) {
     await click("#remote");
     assert.strictEqual(query(urlInput).value, "", "url input is reset");
     assert.strictEqual(query(branchInput).value, "", "branch input is reset");
-    assert.ok(
-      !query(privateRepoCheckbox).checked,
-      "private repo checkbox unchecked"
-    );
     assert.notOk(query(publicKey), "hide public key");
   });
 
   test("show public key for valid ssh theme urls", async function (assert) {
     const urlInput = ".install-theme-content .repo input";
-    const privateRepoCheckbox = ".install-theme-content .check-private input";
     const publicKey = ".install-theme-content .public-key textarea";
 
     // Supports backlog repo ssh url format
@@ -59,12 +48,7 @@ acceptance("Admin - Themes - Install modal", function (needs) {
     await click("#remote");
     await fillIn(urlInput, themeUrl);
     await click(".install-theme-content .inputs .advanced-repo");
-    await click(privateRepoCheckbox);
     assert.strictEqual(query(urlInput).value, themeUrl, "url input is filled");
-    assert.ok(
-      query(privateRepoCheckbox).checked,
-      "private repo checkbox is checked"
-    );
     assert.ok(query(publicKey), "shows public key");
 
     // Supports AWS CodeCommit style repo URLs
diff --git a/app/assets/javascripts/discourse/tests/acceptance/themes-test.js b/app/assets/javascripts/discourse/tests/acceptance/themes-test.js
index 40595569dc..df8e401dd1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/themes-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/themes-test.js
@@ -188,7 +188,6 @@ acceptance("Theme", function (needs) {
       "git@github.com:discourse/discourse-inexistent-theme.git"
     );
     await click(".install-theme-content button.advanced-repo");
-    await click(".install-theme-content .check-private input");
 
     assert.notOk(
       exists(".admin-install-theme-modal .modal-footer .install-theme-warning"),
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 49da3418fa..7f3013e65f 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -102,8 +102,10 @@ class Admin::ThemesController < Admin::AdminController
         private_key = params[:public_key] ? Discourse.redis.get("ssh_key_#{params[:public_key]}") : nil
         return render_json_error I18n.t("themes.import_error.ssh_key_gone") if params[:public_key].present? && private_key.blank?
 
-        @theme = RemoteTheme.import_theme(remote, theme_user, private_key: private_key, branch: branch)
-        render json: @theme, status: :created
+        hijack do
+          @theme = RemoteTheme.import_theme(remote, theme_user, private_key: private_key, branch: branch)
+          render json: @theme, status: :created
+        end
       rescue RemoteTheme::ImportError => e
         if params[:force]
           theme_name = params[:remote].gsub(/.git$/, "").split("/").last
diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index 084af1d085..c4889a47dd 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -84,22 +84,12 @@ class Admin::WebHooksController < Admin::AdminController
   end
 
   def redeliver_event
-    web_hook_event = WebHookEvent.find(params[:event_id])
+    web_hook_event = WebHookEvent.find_by(id: params[:event_id])
 
     if web_hook_event
       web_hook = web_hook_event.web_hook
-      conn = Excon.new(URI(web_hook.payload_url).to_s,
-                       ssl_verify_peer: web_hook.verify_certificate,
-                       retry_limit: 0)
-
-      now = Time.zone.now
-      response = conn.post(headers: MultiJson.load(web_hook_event.headers), body: web_hook_event.payload)
-      web_hook_event.update!(
-        status: response.status,
-        response_headers: MultiJson.dump(response.headers),
-        response_body: response.body,
-        duration: ((Time.zone.now - now) * 1000).to_i
-      )
+      emitter = WebHookEmitter.new(web_hook, web_hook_event)
+      emitter.emit!(headers: MultiJson.load(web_hook_event.headers), body: web_hook_event.payload)
       render_serialized(web_hook_event, AdminWebHookEventSerializer, root: 'web_hook_event')
     else
       render json: failed_json
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index c291037f95..806765309b 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -9,7 +9,6 @@ module Jobs
     PING_EVENT = 'ping'
     MAX_RETRY_COUNT = 4
     RETRY_BACKOFF = 5
-    REQUEST_TIMEOUT = 20
 
     def execute(args)
       @arguments = args
@@ -43,39 +42,13 @@ module Jobs
     end
 
     def send_webhook!
-      uri = URI(@web_hook.payload_url.strip)
-      conn = Excon.new(
-        uri.to_s,
-        ssl_verify_peer: @web_hook.verify_certificate,
-        retry_limit: 0,
-        write_timeout: REQUEST_TIMEOUT,
-        read_timeout: REQUEST_TIMEOUT,
-        connect_timeout: REQUEST_TIMEOUT
-      )
-
       web_hook_body = build_webhook_body
       web_hook_event = create_webhook_event(web_hook_body)
+      uri = URI(@web_hook.payload_url.strip)
       web_hook_headers = build_webhook_headers(uri, web_hook_body, web_hook_event)
-      web_hook_response = nil
 
-      begin
-        now = Time.zone.now
-        web_hook_response = conn.post(headers: web_hook_headers, body: web_hook_body)
-        web_hook_event.update!(
-          headers: MultiJson.dump(web_hook_headers),
-          status: web_hook_response.status,
-          response_headers: MultiJson.dump(web_hook_response.headers),
-          response_body: web_hook_response.body,
-          duration: ((Time.zone.now - now) * 1000).to_i
-        )
-      rescue => e
-        web_hook_event.update!(
-          headers: MultiJson.dump(web_hook_headers),
-          status: -1,
-          response_headers: MultiJson.dump(error: e),
-          duration: ((Time.zone.now - now) * 1000).to_i
-        )
-      end
+      emitter = WebHookEmitter.new(@web_hook, web_hook_event)
+      web_hook_response = emitter.emit!(headers: web_hook_headers, body: web_hook_body)
 
       publish_webhook_event(web_hook_event)
       process_webhook_response(web_hook_response)
@@ -151,12 +124,12 @@ module Jobs
       headers = {
         'Accept' => '*/*',
         'Connection' => 'close',
-        'Content-Length' => web_hook_body.bytesize,
+        'Content-Length' => web_hook_body.bytesize.to_s,
         'Content-Type' => content_type,
         'Host' => uri.host,
         'User-Agent' => "Discourse/#{Discourse::VERSION::STRING}",
         'X-Discourse-Instance' => Discourse.base_url,
-        'X-Discourse-Event-Id' => web_hook_event.id,
+        'X-Discourse-Event-Id' => web_hook_event.id.to_s,
         'X-Discourse-Event-Type' => @arguments[:event_type]
       }
 
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index f72f77c1bc..2c7f4e1ed1 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -15,7 +15,7 @@ class RemoteTheme < ActiveRecord::Base
   ALLOWED_FIELDS = %w{scss embedded_scss head_tag header after_header body_tag footer}
 
   GITHUB_REGEXP = /^https?:\/\/github\.com\//
-  GITHUB_SSH_REGEXP = /^git@github\.com:/
+  GITHUB_SSH_REGEXP = /^ssh:\/\/git@github\.com:/
 
   has_one :theme, autosave: false
   scope :joined_remotes, -> {
@@ -25,8 +25,10 @@ class RemoteTheme < ActiveRecord::Base
   validates_format_of :minimum_discourse_version, :maximum_discourse_version, with: Discourse::VERSION_REGEXP, allow_nil: true
 
   def self.extract_theme_info(importer)
-    JSON.parse(importer["about.json"])
-  rescue TypeError, JSON::ParserError
+    json = JSON.parse(importer["about.json"])
+    json.fetch("name")
+    json
+  rescue TypeError, JSON::ParserError, KeyError
     raise ImportError.new I18n.t("themes.import_error.about_json")
   end
 
@@ -80,6 +82,7 @@ class RemoteTheme < ActiveRecord::Base
     importer.import!
 
     theme_info = RemoteTheme.extract_theme_info(importer)
+
     component = [true, "true"].include?(theme_info["component"])
     theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"], component: component)
     theme.child_components = theme_info["components"].presence || []
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index ac8dadeb2c..d14a0dddad 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -15,6 +15,7 @@ class WebHook < ActiveRecord::Base
   validates_presence_of :content_type
   validates_presence_of :last_delivery_status
   validates_presence_of :web_hook_event_types, unless: :wildcard_web_hook?
+  validate :ensure_payload_url_allowed, if: :payload_url_changed?
 
   before_save :strip_url
 
@@ -113,6 +114,23 @@ class WebHook < ActiveRecord::Base
   def self.guardian
     Guardian.new(Discourse.system_user)
   end
+
+  # This check is to improve UX
+  # IPs are re-checked at request time
+  def ensure_payload_url_allowed
+    return if payload_url.blank?
+    uri = URI(payload_url.strip)
+
+    allowed = begin
+      FinalDestination::SSRFDetector.lookup_and_filter_ips(uri.hostname).present?
+    rescue FinalDestination::SSRFDetector::DisallowedIpError
+      false
+    end
+
+    if !allowed
+      self.errors.add(:base, I18n.t("webhooks.payload_url.blocked_or_internal"))
+    end
+  end
 end
 
 # == Schema Information
diff --git a/app/services/web_hook_emitter.rb b/app/services/web_hook_emitter.rb
new file mode 100644
index 0000000000..d8ac652e1c
--- /dev/null
+++ b/app/services/web_hook_emitter.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class WebHookEmitter
+  REQUEST_TIMEOUT = 20
+
+  def initialize(webhook, webhook_event)
+    @webhook = webhook
+    @webhook_event = webhook_event
+  end
+
+  def emit!(headers:, body:)
+    uri = URI(@webhook.payload_url.strip)
+
+    connection_opts = {
+      request: {
+        write_timeout: REQUEST_TIMEOUT,
+        read_timeout: REQUEST_TIMEOUT,
+        open_timeout: REQUEST_TIMEOUT
+      },
+    }
+
+    if !@webhook.verify_certificate
+      connection_opts[:ssl] = { verify: false }
+    end
+
+    conn = Faraday.new(nil, connection_opts) do |f|
+      f.adapter FinalDestination::FaradayAdapter
+    end
+
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+    error = nil
+    response = nil
+    begin
+      response = conn.post(uri.to_s, body, headers)
+    rescue => e
+      error = e
+    end
+    duration = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond) - start
+    event_update_args = {
+      headers: MultiJson.dump(headers),
+      duration: duration,
+    }
+    if response
+      event_update_args[:response_headers] = MultiJson.dump(response.headers)
+      event_update_args[:response_body] = response.body
+      event_update_args[:status] = response.status
+    else
+      event_update_args[:status] = -1
+      if error.is_a?(Faraday::Error) && error.wrapped_exception.is_a?(FinalDestination::SSRFDetector::DisallowedIpError)
+        error = I18n.t("webhooks.payload_url.blocked_or_internal")
+      end
+      event_update_args[:response_headers] = MultiJson.dump(error: error)
+    end
+    @webhook_event.update!(**event_update_args)
+    response
+  end
+end
diff --git a/config/initializers/000-zeitwerk.rb b/config/initializers/000-zeitwerk.rb
index 0d5e55d3d5..130ba2d5c7 100644
--- a/config/initializers/000-zeitwerk.rb
+++ b/config/initializers/000-zeitwerk.rb
@@ -40,7 +40,9 @@ Rails.autoloaders.each do |autoloader|
     'omniauth_strategies' => 'OmniAuthStrategies',
     'csrf_token_verifier' => 'CSRFTokenVerifier',
     'html' => 'HTML',
-    'json' => 'JSON'
+    'json' => 'JSON',
+    'ssrf_detector' => 'SSRFDetector',
+    'http' => 'HTTP',
   )
 end
 Rails.autoloaders.main.ignore("lib/tasks",
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c1ce439588..2653d79eb3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4539,7 +4539,6 @@ en:
         go_back: "Back to list"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "It seems you are trying to set up the webhook to a local url. Event delivered to a local address may cause side-effect or unexpected behaviors. Continue?"
         secret_invalid: "Secret must not have any blank characters."
         secret_too_short: "Secret should be at least 12 characters."
         secret_placeholder: "An optional string, used for generating signature"
@@ -4833,7 +4832,6 @@ en:
           last_attempt: "Installation process did not finish, last attempted:"
           remote_branch: "Branch name (optional)"
           public_key: "Grant the following public key access to the repo:"
-          public_key_note: "After entering a valid private repository URL above, an SSH key will be generated and displayed here."
           install: "Install"
           installed: "Installed"
           install_popular: "Popular"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 96184cd0d8..6e55cf5ed9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -76,6 +76,7 @@ en:
       modifier_values: "about.json modifiers contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"
       git_ref_not_found: "Unable to checkout git reference: %{ref}"
+      git_unsupported_scheme: "Unable to clone git repo: scheme unsupported"
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
       unknown_file_type: "The file you uploaded does not appear to be a valid Discourse theme."
@@ -5209,3 +5210,7 @@ en:
   user_status:
     errors:
       ends_at_should_be_greater_than_set_at: "ends_at should be greater than set_at"
+  webhooks:
+    payload_url:
+      blocked_or_internal: "Payload URL cannot be used because it resolves to a blocked or internal IP"
+      unsafe: "Payload URL cannot be used because it's unsafe"
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index aa516d9cc2..94fd0e04bf 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -44,7 +44,6 @@ class FinalDestination
     @force_custom_user_agent_hosts = @opts[:force_custom_user_agent_hosts] || []
     @default_user_agent = @opts[:default_user_agent] || DEFAULT_USER_AGENT
     @opts[:max_redirects] ||= 5
-    @opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
     @https_redirect_ignore_limit = @opts[:initial_https_redirect_ignore_limit]
 
     @max_redirects = @opts[:max_redirects]
@@ -83,6 +82,10 @@ class FinalDestination
     20
   end
 
+  def self.resolve(url)
+    new(url).resolve
+  end
+
   def http_verb(force_get_hosts, follow_canonical)
     if follow_canonical || force_get_hosts.any? { |host| hostname_matches?(host) }
       :get
@@ -116,7 +119,7 @@ class FinalDestination
     status_code, response_headers = nil
 
     catch(:done) do
-      Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS), open_timeout: timeout) do |http|
+      FinalDestination::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS), open_timeout: timeout) do |http|
         http.read_timeout = timeout
         http.request_get(@uri.request_uri, request_headers) do |resp|
           status_code = resp.code.to_i
@@ -226,13 +229,25 @@ class FinalDestination
       raise Excon::Errors::ExpectationFailed.new("connect timeout reached: #{@uri.to_s}") if Time.now - request_start_time > MAX_REQUEST_TIME_SECONDS
     end
 
+    # This technique will only use the first resolved IP
+    # TODO: Can we standardise this by using FinalDestination::HTTP?
+    begin
+      resolved_ip = SSRFDetector.lookup_and_filter_ips(@uri.hostname).first
+    rescue SSRFDetector::DisallowedIpError, SocketError, Timeout::Error
+      @status = :invalid_address
+      return
+    end
+    request_uri = @uri.dup
+    request_uri.hostname = resolved_ip unless Rails.env.test? # WebMock doesn't understand the IP-based requests
+
     response = Excon.public_send(@http_verb,
-      @uri.to_s,
+      request_uri.to_s,
       read_timeout: timeout,
       connect_timeout: timeout,
-      headers: headers,
+      headers: { "Host" => @uri.hostname }.merge(headers),
       middlewares: middlewares,
-      response_block: request_validator
+      response_block: request_validator,
+      ssl_verify_peer_host: @uri.hostname
     )
 
     if @stop_at_blocked_pages
@@ -351,12 +366,16 @@ class FinalDestination
     nil
   end
 
+  def skip_validations?
+    !@validate_uri
+  end
+
   def validate_uri
-    !@validate_uri || (validate_uri_format && is_dest_valid?)
+    skip_validations? || validate_uri_format
   end
 
   def validate_uri_format
-    return false unless @uri
+    return false unless @uri && @uri.host
     return false unless ['https', 'http'].include?(@uri.scheme)
     return false if @uri.scheme == 'http' && @uri.port != 80
     return false if @uri.scheme == 'https' && @uri.port != 443
@@ -384,48 +403,10 @@ class FinalDestination
     end
   end
 
-  def is_dest_valid?
-    return false unless @uri && @uri.host
-
-    # Allowlisted hosts
-    return true if hostname_matches?(SiteSetting.Upload.s3_cdn_url) ||
-      hostname_matches?(GlobalSetting.try(:cdn_url)) ||
-      hostname_matches?(Discourse.base_url_no_prefix)
-
-    if SiteSetting.allowed_internal_hosts.present?
-      return true if SiteSetting.allowed_internal_hosts.split("|").any? { |h| h.downcase == @uri.hostname.downcase }
-    end
-
-    address_s = @opts[:lookup_ip].call(@uri.hostname)
-    return false unless address_s
-
-    address = IPAddr.new(address_s)
-
-    if private_ranges.any? { |r| r === address }
-      @status = :invalid_address
-      return false
-    end
-
-    # Rate limit how often this IP can be crawled
-    if !@opts[:skip_rate_limit] && !@limited_ips.include?(address)
-      @limited_ips << address
-      RateLimiter.new(nil, "crawl-destination-ip:#{address_s}", 1000, 1.hour).performed!
-    end
-
-    true
-  rescue RateLimiter::LimitExceeded
-    false
-  end
-
   def normalized_url
     UrlHelper.normalized_encode(@url)
   end
 
-  def private_ranges
-    FinalDestination.standard_private_ranges +
-      SiteSetting.blocked_ip_blocks.split('|').map { |r| IPAddr.new(r) rescue nil }.compact
-  end
-
   def log(log_level, message)
     return unless @verbose
     return if @status_code == 404
@@ -436,27 +417,6 @@ class FinalDestination
     )
   end
 
-  def self.standard_private_ranges
-    @private_ranges ||= [
-      IPAddr.new('0.0.0.0/8'),
-      IPAddr.new('127.0.0.1'),
-      IPAddr.new('172.16.0.0/12'),
-      IPAddr.new('192.168.0.0/16'),
-      IPAddr.new('10.0.0.0/8'),
-      IPAddr.new('fc00::/7')
-    ]
-  end
-
-  def self.lookup_ip(host)
-    if Rails.env.test?
-      "1.1.1.1"
-    else
-      IPSocket::getaddress(host)
-    end
-  rescue SocketError
-    nil
-  end
-
   protected
 
   def safe_get(uri)
@@ -470,7 +430,7 @@ class FinalDestination
         'Host' => uri.host
       )
 
-      req = Net::HTTP::Get.new(uri.request_uri, headers)
+      req = FinalDestination::HTTP::Get.new(uri.request_uri, headers)
 
       http.request(req) do |resp|
         headers_subset.set_cookie = resp['Set-Cookie']
@@ -530,7 +490,7 @@ class FinalDestination
   end
 
   def safe_session(uri)
-    Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https"), open_timeout: timeout) do |http|
+    FinalDestination::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https"), open_timeout: timeout) do |http|
       http.read_timeout = timeout
       yield http
     end
diff --git a/lib/final_destination/faraday_adapter.rb b/lib/final_destination/faraday_adapter.rb
new file mode 100644
index 0000000000..1177a6b490
--- /dev/null
+++ b/lib/final_destination/faraday_adapter.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FinalDestination
+  class FaradayAdapter < Faraday::Adapter::NetHttp
+    def net_http_connection(env)
+      proxy = env[:request][:proxy]
+      port = env[:url].port || (env[:url].scheme == "https" ? 443 : 80)
+      if proxy
+        FinalDestination::HTTP.new(
+          env[:url].hostname,
+          port,
+          proxy[:uri].hostname,
+          proxy[:uri].port,
+          proxy[:user],
+          proxy[:password],
+        )
+      else
+        FinalDestination::HTTP.new(env[:url].hostname, port, nil)
+      end
+    end
+  end
+end
diff --git a/lib/final_destination/http.rb b/lib/final_destination/http.rb
new file mode 100644
index 0000000000..ffceff99de
--- /dev/null
+++ b/lib/final_destination/http.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class FinalDestination::HTTP < Net::HTTP
+  def connect
+    original_open_timeout = @open_timeout
+    return super if @ipaddr
+
+    timeout_at = current_time + @open_timeout
+
+    # This iteration through addresses would normally happen in Socket#tcp
+    # We do it here because we're tightly controlling addresses rather than
+    # handing Socket#tcp a hostname
+    ips = FinalDestination::SSRFDetector.lookup_and_filter_ips(@address, timeout: @connect_timeout)
+
+    ips.each_with_index do |ip, index|
+      debug "[FinalDestination] Attempting connection to #{ip}..."
+      self.ipaddr = ip
+
+      remaining_time = timeout_at - current_time
+      if remaining_time <= 0
+        raise Net::OpenTimeout.new("Operation timed out - FinalDestination::HTTP")
+      end
+
+      @open_timeout = remaining_time
+      return super
+    rescue SystemCallError, Net::OpenTimeout => e
+      debug "[FinalDestination] Error connecting to #{ip}... #{e.message}"
+      was_last_attempt = index == ips.length - 1
+      raise if was_last_attempt
+    end
+  ensure
+    @open_timeout = original_open_timeout
+  end
+
+  private
+
+  def current_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+end
diff --git a/lib/final_destination/resolver.rb b/lib/final_destination/resolver.rb
new file mode 100644
index 0000000000..551eb0270d
--- /dev/null
+++ b/lib/final_destination/resolver.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class FinalDestination::Resolver
+  @mutex = Mutex.new
+  def self.lookup(addr, timeout: nil)
+    timeout ||= 2
+    @mutex.synchronize do
+      @result = nil
+
+      @queue ||= Queue.new
+      @queue << ""
+      ensure_lookup_thread
+
+      @lookup = addr
+      @parent = Thread.current
+
+      # This sleep will be interrupted by the lookup thread
+      # if completed within timeout
+      sleep timeout
+      if !@result
+        @thread.kill
+        @thread.join
+        @thread = nil
+        if @error
+          @error.backtrace.push(*caller)
+          raise @error
+        else
+          raise Timeout::Error
+        end
+      end
+      @result
+    end
+  end
+
+  private
+
+  def self.ensure_lookup_thread
+    return if @thread&.alive?
+
+    @thread = Thread.new do
+      while true
+        @queue.deq
+        @error = nil
+        begin
+          @result = Addrinfo.getaddrinfo(@lookup, 80, nil, :STREAM).map(&:ip_address)
+        rescue => e
+          @error = e
+        end
+        @parent.wakeup
+      end
+    end
+    @thread.name = "final-destination_resolver_thread"
+  end
+end
diff --git a/lib/final_destination/ssrf_detector.rb b/lib/final_destination/ssrf_detector.rb
new file mode 100644
index 0000000000..8ee0a3f49b
--- /dev/null
+++ b/lib/final_destination/ssrf_detector.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class FinalDestination
+  module SSRFDetector
+    class DisallowedIpError < SocketError
+    end
+
+    def self.standard_private_ranges
+      @private_ranges ||= [
+        IPAddr.new("0.0.0.0/8"),
+        IPAddr.new("127.0.0.1"),
+        IPAddr.new("172.16.0.0/12"),
+        IPAddr.new("192.168.0.0/16"),
+        IPAddr.new("10.0.0.0/8"),
+        IPAddr.new("::1"),
+        IPAddr.new("fc00::/7"),
+        IPAddr.new("fe80::/10"),
+      ]
+    end
+
+    def self.blocked_ip_blocks
+      SiteSetting
+        .blocked_ip_blocks
+        .split(/[|\n]/)
+        .filter_map do |r|
+          IPAddr.new(r.strip)
+        rescue IPAddr::InvalidAddressError
+          nil
+        end
+    end
+
+    def self.allowed_internal_hosts
+      hosts =
+        [
+          SiteSetting.Upload.s3_cdn_url,
+          GlobalSetting.try(:cdn_url),
+          Discourse.base_url_no_prefix,
+        ].filter_map do |url|
+          URI.parse(url).hostname if url
+        rescue URI::Error
+          nil
+        end
+
+      hosts += SiteSetting.allowed_internal_hosts.split(/[|\n]/).filter_map { |h| h.strip.presence }
+
+      hosts
+    end
+
+    def self.host_bypasses_checks?(hostname)
+      allowed_internal_hosts.any? { |h| h.downcase == hostname.downcase }
+    end
+
+    def self.ip_allowed?(ip)
+      ip = ip.is_a?(IPAddr) ? ip : IPAddr.new(ip)
+
+      if ip_in_ranges?(ip, blocked_ip_blocks) || ip_in_ranges?(ip, standard_private_ranges)
+        return false
+      end
+
+      true
+    end
+
+    def self.lookup_and_filter_ips(name, timeout: nil)
+      ips = lookup_ips(name, timeout: timeout)
+      return ips if host_bypasses_checks?(name)
+
+      ips.filter! { |ip| FinalDestination::SSRFDetector.ip_allowed?(ip) }
+
+      raise DisallowedIpError, "FinalDestination: all resolved IPs were disallowed" if ips.empty?
+
+      ips
+    end
+
+    private
+
+    def self.ip_in_ranges?(ip, ranges)
+      ranges.any? { |r| r === ip }
+    end
+
+    def self.lookup_ips(name, timeout: nil)
+      if Rails.env.test?
+        ["1.2.3.4"]
+      else
+        FinalDestination::Resolver.lookup(name, timeout: timeout)
+      end
+    end
+  end
+end
diff --git a/lib/git_url.rb b/lib/git_url.rb
new file mode 100644
index 0000000000..9d600cd7a7
--- /dev/null
+++ b/lib/git_url.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module GitUrl
+  class << self
+    SSH_REGEXP = /(\w+@(\w+\.)*\w+):(.*)/
+
+    def normalize(url)
+      if m = SSH_REGEXP.match(url)
+        url = "ssh://#{m[1]}/#{m[3]}"
+      end
+
+      if url.start_with?("https://github.com/") && !url.end_with?(".git")
+        url = url.gsub(/\/$/, '')
+        url += ".git"
+      end
+
+      url
+    end
+  end
+end
diff --git a/lib/onebox/engine/google_maps_onebox.rb b/lib/onebox/engine/google_maps_onebox.rb
index bbf8e21c1b..0c4fbcf16d 100644
--- a/lib/onebox/engine/google_maps_onebox.rb
+++ b/lib/onebox/engine/google_maps_onebox.rb
@@ -162,7 +162,7 @@ module Onebox
 
       def follow_redirect!
         begin
-          http = Net::HTTP.start(
+          http = FinalDestination::HTTP.start(
             uri.host,
             uri.port,
             use_ssl: uri.scheme == 'https',
diff --git a/lib/onebox/helpers.rb b/lib/onebox/helpers.rb
index fab4b63f50..9067f7b263 100644
--- a/lib/onebox/helpers.rb
+++ b/lib/onebox/helpers.rb
@@ -66,7 +66,7 @@ module Onebox
       end
 
       result = StringIO.new
-      Net::HTTP.start(uri.host, uri.port, open_timeout: Onebox.options.connect_timeout, use_ssl: uri.normalized_scheme == 'https') do |http|
+      FinalDestination::HTTP.start(uri.host, uri.port, open_timeout: Onebox.options.connect_timeout, use_ssl: uri.normalized_scheme == 'https') do |http|
         http.read_timeout = Onebox.options.timeout
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE  # Work around path building bugs
 
@@ -120,7 +120,7 @@ module Onebox
     def self.fetch_content_length(location)
       uri = URI(location)
 
-      Net::HTTP.start(uri.host, uri.port, open_timeout: Onebox.options.connect_timeout, use_ssl: uri.is_a?(URI::HTTPS)) do |http|
+      FinalDestination::HTTP.start(uri.host, uri.port, open_timeout: Onebox.options.connect_timeout, use_ssl: uri.is_a?(URI::HTTPS)) do |http|
         http.read_timeout = Onebox.options.timeout
         if uri.is_a?(URI::HTTPS)
           http.use_ssl = true
diff --git a/lib/onebox/status_check.rb b/lib/onebox/status_check.rb
index 0980b8d135..b774232ff8 100644
--- a/lib/onebox/status_check.rb
+++ b/lib/onebox/status_check.rb
@@ -35,11 +35,9 @@ module Onebox
     private
 
     def check
-      res = URI.parse(@url).open(read_timeout: (@options.timeout || Onebox.options.timeout))
-      @status = res.status.first.to_i
-    rescue OpenURI::HTTPError => e
-      @status = e.io.status.first.to_i
-    rescue Timeout::Error, Errno::ECONNREFUSED, Net::HTTPError
+      status, headers = FinalDestination.new(@url).small_get({})
+      @status = status
+    rescue Timeout::Error, Errno::ECONNREFUSED, Net::HTTPError, SocketError
       @status = 0
     end
   end
diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index 6ef40d2c16..c386fea5ee 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -8,22 +8,15 @@ class ThemeStore::GitImporter
   attr_reader :url
 
   def initialize(url, private_key: nil, branch: nil)
-    @url = url
-    if @url.start_with?("https://github.com") && !@url.end_with?(".git")
-      @url = @url.gsub(/\/$/, '')
-      @url += ".git"
-    end
+    @url = GitUrl.normalize(url)
     @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}"
     @private_key = private_key
     @branch = branch
   end
 
   def import!
-    if @private_key
-      import_private!
-    else
-      import_public!
-    end
+    clone!
+
     if version = Discourse.find_compatible_git_resource(@temp_folder)
       begin
         execute "git", "cat-file", "-e", version
@@ -84,35 +77,104 @@ class ThemeStore::GitImporter
 
   protected
 
-  def import_public!
+  def raise_import_error!
+    raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git"))
+  end
+
+  def clone!
     begin
-      if @branch.present?
-        Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder)
-      else
-        Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", @url, @temp_folder)
-      end
-    rescue RuntimeError
-      raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git"))
+      @uri = URI.parse(@url)
+    rescue URI::Error
+      raise_import_error!
+    end
+
+    case @uri&.scheme
+    when "http", "https"
+      clone_http!
+    when "ssh"
+      clone_ssh!
+    else
+      raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git_unsupported_scheme"))
     end
   end
 
-  def import_private!
+  def clone_args(config = {})
+    args = ["git"]
+
+    config.each do |key, value|
+      args.concat(['-c', "#{key}=#{value}"])
+    end
+
+    args << "clone"
+
+    if @branch.present?
+      args.concat(["-b", @branch])
+    end
+
+    args.concat([@url, @temp_folder])
+
+    args
+  end
+
+  def clone_http!
+    begin
+      @uri = FinalDestination.resolve(@uri.to_s)
+    rescue
+      raise_import_error!
+    end
+
+    @url = @uri.to_s
+
+    unless ["http", "https"].include?(@uri.scheme)
+      raise_import_error!
+    end
+
+    addresses = FinalDestination::SSRFDetector.lookup_and_filter_ips(@uri.host)
+
+    if addresses.empty?
+      raise_import_error!
+    end
+
+    env = { "GIT_TERMINAL_PROMPT" => "0" }
+
+    args = clone_args(
+      "http.followRedirects" => "false",
+      "http.curloptResolve" => "#{@uri.host}:#{@uri.port}:#{addresses.join(',')}",
+    )
+
+    begin
+      Discourse::Utils.execute_command(env, *args, timeout: COMMAND_TIMEOUT_SECONDS)
+    rescue RuntimeError
+      raise_import_error!
+    end
+  end
+
+  def clone_ssh!
+    unless @private_key.present?
+      raise_import_error!
+    end
+
+    with_ssh_private_key do |ssh_folder|
+      # Use only the specified SSH key
+      env = { 'GIT_SSH_COMMAND' => "ssh -i #{ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{ssh_folder}/id_rsa -o StrictHostKeyChecking=no" }
+      args = clone_args
+
+      begin
+        Discourse::Utils.execute_command(env, *args, timeout: COMMAND_TIMEOUT_SECONDS)
+      rescue RuntimeError
+        raise_import_error!
+      end
+    end
+  end
+
+  def with_ssh_private_key
     ssh_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_ssh_#{SecureRandom.hex}"
     FileUtils.mkdir_p ssh_folder
 
     File.write("#{ssh_folder}/id_rsa", @private_key)
     FileUtils.chmod(0600, "#{ssh_folder}/id_rsa")
 
-    begin
-      git_ssh_command = { 'GIT_SSH_COMMAND' => "ssh -i #{ssh_folder}/id_rsa -o StrictHostKeyChecking=no" }
-      if @branch.present?
-        Discourse::Utils.execute_command(git_ssh_command, "git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder)
-      else
-        Discourse::Utils.execute_command(git_ssh_command, "git", "clone", @url, @temp_folder)
-      end
-    rescue RuntimeError
-      raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git"))
-    end
+    yield ssh_folder
   ensure
     FileUtils.rm_rf ssh_folder
   end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 031c98c524..5abe40e996 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -168,6 +168,20 @@ RSpec.describe Jobs::EmitWebHookEvent do
     )
   end
 
+  it "doesn't emit if the payload URL resolves to a disallowed IP" do
+    FinalDestination::TestHelper.stub_to_fail do
+      subject.execute(
+        web_hook_id: post_hook.id,
+        event_type: 'post',
+        payload: { test: "some payload" }.to_json
+      )
+    end
+    event = post_hook.web_hook_events.last
+    expect(event.response_headers).to eq({ error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json)
+    expect(event.response_body).to eq(nil)
+    expect(event.status).to eq(-1)
+  end
+
   context 'with category filters' do
     fab!(:category) { Fabricate(:category) }
     fab!(:topic) { Fabricate(:topic) }
@@ -299,20 +313,20 @@ RSpec.describe Jobs::EmitWebHookEvent do
 
       event = WebHookEvent.last
       headers = MultiJson.load(event.headers)
-      expect(headers['Content-Length']).to eq(13)
+      expect(headers['Content-Length']).to eq("13")
       expect(headers['Host']).to eq("meta.discourse.org")
-      expect(headers['X-Discourse-Event-Id']).to eq(event.id)
+      expect(headers['X-Discourse-Event-Id']).to eq(event.id.to_s)
       expect(headers['X-Discourse-Event-Type']).to eq(described_class::PING_EVENT)
       expect(headers['X-Discourse-Event']).to eq(described_class::PING_EVENT)
       expect(headers['X-Discourse-Event-Signature']).to eq('sha256=162f107f6b5022353274eb1a7197885cfd35744d8d08e5bcea025d309386b7d6')
       expect(event.payload).to eq(MultiJson.dump(ping: 'OK'))
       expect(event.status).to eq(200)
-      expect(MultiJson.load(event.response_headers)['Test']).to eq('string')
+      expect(MultiJson.load(event.response_headers)['test']).to eq('string')
       expect(event.response_body).to eq('OK')
     end
 
     it 'sets up proper request headers when an error raised' do
-      Excon::Connection.any_instance.expects(:post).raises("error")
+      stub_request(:post, post_hook.payload_url).to_raise("error")
 
       subject.execute(
         web_hook_id: post_hook.id,
@@ -323,9 +337,9 @@ RSpec.describe Jobs::EmitWebHookEvent do
 
       event = WebHookEvent.last
       headers = MultiJson.load(event.headers)
-      expect(headers['Content-Length']).to eq(13)
+      expect(headers['Content-Length']).to eq("13")
       expect(headers['Host']).to eq("meta.discourse.org")
-      expect(headers['X-Discourse-Event-Id']).to eq(event.id)
+      expect(headers['X-Discourse-Event-Id']).to eq(event.id.to_s)
       expect(headers['X-Discourse-Event-Type']).to eq(described_class::PING_EVENT)
       expect(headers['X-Discourse-Event']).to eq(described_class::PING_EVENT)
       expect(headers['X-Discourse-Event-Signature']).to eq('sha256=162f107f6b5022353274eb1a7197885cfd35744d8d08e5bcea025d309386b7d6')
diff --git a/spec/lib/cooked_post_processor_spec.rb b/spec/lib/cooked_post_processor_spec.rb
index 9dcf775933..0d8c740274 100644
--- a/spec/lib/cooked_post_processor_spec.rb
+++ b/spec/lib/cooked_post_processor_spec.rb
@@ -1295,7 +1295,6 @@ RSpec.describe CookedPostProcessor do
 
       stub_request(:head, url)
       stub_request(:get , url).to_return(body: body)
-      FinalDestination.stubs(:lookup_ip).returns('1.2.3.4')
 
       # not an ideal stub but shipping the whole image to fast image can add
       # a lot of cost to this test
diff --git a/spec/lib/final_destination/http_spec.rb b/spec/lib/final_destination/http_spec.rb
new file mode 100644
index 0000000000..08df54e17b
--- /dev/null
+++ b/spec/lib/final_destination/http_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+describe FinalDestination::HTTP do
+  before do
+    # We need to test low-level stuff, switch off WebMock for FinalDestination::HTTP
+    WebMock.enable!(except: [:final_destination])
+    Socket.stubs(:tcp).never
+    Addrinfo.stubs(:getaddrinfo).never
+  end
+
+  after do
+    WebMock.enable!
+  end
+
+  def expect_tcp_and_abort(stub_addr, &blk)
+    success = Class.new(StandardError)
+    Socket.stubs(:tcp).with { |addr| stub_addr == addr }.once.raises(success)
+    begin
+      yield
+    rescue success
+    end
+  end
+
+  def stub_ip_lookup(stub_addr, ips)
+    FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |addr| stub_addr == addr }.returns(ips)
+  end
+
+  def stub_tcp_to_raise(stub_addr, exception)
+    Socket.stubs(:tcp).with { |addr| addr == stub_addr }.once.raises(exception)
+  end
+
+  it "works through each IP address until success" do
+    stub_ip_lookup("example.com", %w[1.1.1.1 2.2.2.2 3.3.3.3])
+    stub_tcp_to_raise("1.1.1.1", Errno::ETIMEDOUT)
+    stub_tcp_to_raise("2.2.2.2", Errno::EPIPE)
+    expect_tcp_and_abort("3.3.3.3") { FinalDestination::HTTP.get(URI("https://example.com")) }
+  end
+
+  it "handles nxdomain with SocketError" do
+    FinalDestination::SSRFDetector
+      .stubs(:lookup_ips)
+      .with { |addr| addr == "example.com" }
+      .raises(SocketError)
+    expect { FinalDestination::HTTP.get(URI("https://example.com")) }.to raise_error(SocketError)
+  end
+
+  it "raises the normal error when all IPs fail" do
+    stub_ip_lookup("example.com", %w[1.1.1.1 2.2.2.2])
+    stub_tcp_to_raise("1.1.1.1", Errno::ETIMEDOUT)
+    stub_tcp_to_raise("2.2.2.2", Errno::EPIPE)
+    expect { FinalDestination::HTTP.get(URI("https://example.com")) }.to raise_error(Errno::EPIPE)
+  end
+
+  it "ignores private IPs" do
+    stub_ip_lookup("example.com", %w[0.0.0.0 2.2.2.2])
+    expect_tcp_and_abort("2.2.2.2") { FinalDestination::HTTP.get(URI("https://example.com")) }
+  end
+
+  it "raises DisallowedIpError if all IPs are private" do
+    stub_ip_lookup("example.com", %w[0.0.0.0 127.0.0.1])
+    expect { FinalDestination::HTTP.get(URI("https://example.com")) }.to raise_error(
+      FinalDestination::SSRFDetector::DisallowedIpError,
+    )
+    expect(FinalDestination::SSRFDetector::DisallowedIpError.new).to be_a(SocketError)
+  end
+
+  it "handles short IPs" do
+    stub_ip_lookup("0", %w[0.0.0.0])
+    expect { FinalDestination::HTTP.get(URI("https://0/path")) }.to raise_error(
+      FinalDestination::SSRFDetector::DisallowedIpError,
+    )
+    expect(FinalDestination::SSRFDetector::DisallowedIpError.new).to be_a(SocketError)
+  end
+
+  it "raises DisallowedIpError if all IPs are blocked" do
+    SiteSetting.blocked_ip_blocks = "98.0.0.0/8|78.13.47.0/24|9001:82f3::/32"
+    stub_ip_lookup("ip6.example.com", %w[9001:82f3:8873::3])
+    stub_ip_lookup("ip4.example.com", %w[98.23.19.111])
+    expect { FinalDestination::HTTP.get(URI("https://ip4.example.com")) }.to raise_error(
+      FinalDestination::SSRFDetector::DisallowedIpError,
+    )
+    expect { FinalDestination::HTTP.get(URI("https://ip6.example.com")) }.to raise_error(
+      FinalDestination::SSRFDetector::DisallowedIpError,
+    )
+  end
+
+  it "allows specified hosts to bypass IP checks" do
+    SiteSetting.blocked_ip_blocks = "98.0.0.0/8|78.13.47.0/24|9001:82f3::/32"
+    SiteSetting.allowed_internal_hosts = "internal.example.com|blocked-ip.example.com"
+    stub_ip_lookup("internal.example.com", %w[0.0.0.0 127.0.0.1])
+    stub_ip_lookup("blocked-ip.example.com", %w[98.23.19.111])
+    expect_tcp_and_abort("0.0.0.0") do
+      FinalDestination::HTTP.get(URI("https://internal.example.com"))
+    end
+    expect_tcp_and_abort("98.23.19.111") do
+      FinalDestination::HTTP.get(URI("https://blocked-ip.example.com"))
+    end
+  end
+
+  it "stops iterating over DNS records once timeout reached" do
+    stub_ip_lookup("example.com", %w[1.1.1.1 2.2.2.2 3.3.3.3 4.4.4.4])
+    Socket.stubs(:tcp).with { |addr| addr == "1.1.1.1" }.raises(Errno::ECONNREFUSED)
+    Socket.stubs(:tcp).with { |addr| addr == "2.2.2.2" }.raises(Errno::ECONNREFUSED)
+    Socket.stubs(:tcp).with { |*args, **kwargs| kwargs[:open_timeout] == 0 }.raises(Errno::ETIMEDOUT)
+    FinalDestination::HTTP.any_instance.stubs(:current_time).returns(0, 1, 5)
+    expect do
+      FinalDestination::HTTP.start("example.com", 80, open_timeout: 5) {}
+    end.to raise_error(Net::OpenTimeout)
+  end
+end
diff --git a/spec/lib/final_destination/resolver_spec.rb b/spec/lib/final_destination/resolver_spec.rb
new file mode 100644
index 0000000000..6d1139fa93
--- /dev/null
+++ b/spec/lib/final_destination/resolver_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+describe FinalDestination::Resolver do
+  let(:mock_response) { [Addrinfo.ip("1.1.1.1"), Addrinfo.ip("2.2.2.2")] }
+
+  before do
+    # No DNS lookups in tests
+    Addrinfo.stubs(:getaddrinfo).never
+  end
+
+  def alive_thread_count
+    Thread.list.filter(&:alive?).count
+  end
+
+  it "handles timeouts correctly" do
+    Addrinfo.stubs(:getaddrinfo).with { |addr| sleep if addr == "sleep.example.com" } # timeout
+    Addrinfo.stubs(:getaddrinfo).with { |addr| addr == "example.com" }.returns(mock_response)
+
+    expect {
+      FinalDestination::Resolver.lookup("sleep.example.com", timeout: 0.001)
+    }.to raise_error(Timeout::Error)
+
+    start_thread_count = alive_thread_count
+
+    expect {
+      FinalDestination::Resolver.lookup("sleep.example.com", timeout: 0.001)
+    }.to raise_error(Timeout::Error)
+
+    expect(alive_thread_count).to eq(start_thread_count)
+
+    expect(FinalDestination::Resolver.lookup("example.com")).to eq(
+      %w[1.1.1.1 2.2.2.2],
+    )
+
+    # Thread available for reuse after successful lookup
+    expect(alive_thread_count).to eq(start_thread_count + 1)
+  end
+
+  it "can lookup correctly" do
+    Addrinfo.stubs(:getaddrinfo).with { |addr| addr == "example.com" }.returns(mock_response)
+
+    expect(FinalDestination::Resolver.lookup("example.com")).to eq(%w[1.1.1.1 2.2.2.2])
+  end
+end
diff --git a/spec/lib/final_destination/ssrf_detector_spec.rb b/spec/lib/final_destination/ssrf_detector_spec.rb
new file mode 100644
index 0000000000..bd4b5e12a8
--- /dev/null
+++ b/spec/lib/final_destination/ssrf_detector_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+describe FinalDestination::SSRFDetector do
+  describe "site setting parsing" do
+    it "can parse the blocked_ip_blocks and allowed_internal_hosts settings when the delimiter is pipe" do
+      SiteSetting.blocked_ip_blocks = "13.134.89.0/24|73.234.19.0/30\n"
+      SiteSetting.allowed_internal_hosts = "awesomesauce.com\n|goodbye.net"
+
+      expect(subject.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
+      expect(subject.allowed_internal_hosts).to eq(
+        [
+          "test.localhost", # Discourse.base_url
+          "awesomesauce.com",
+          "goodbye.net",
+        ],
+      )
+    end
+
+    it "can parse the blocked_ip_blocks and allowed_internal_hosts settings when the delimiter is newline" do
+      SiteSetting.blocked_ip_blocks = "13.134.89.0/24\n73.234.19.0/30\n\n"
+      SiteSetting.allowed_internal_hosts = "awesomesauce.com\n\ngoodbye.net\n\n"
+
+      expect(subject.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
+      expect(subject.allowed_internal_hosts).to eq(
+        [
+          "test.localhost", # Discourse.base_url
+          "awesomesauce.com",
+          "goodbye.net",
+        ],
+      )
+    end
+
+    it "ignores invalid IP blocks" do
+      SiteSetting.blocked_ip_blocks = "2001:abc:de::/48|notanip"
+      expect(subject.blocked_ip_blocks).to eq(%w[2001:abc:de::/48])
+    end
+  end
+
+  describe ".ip_allowed?" do
+    it "returns false for blocked IPs" do
+      SiteSetting.blocked_ip_blocks = "98.0.0.0/8|78.13.47.0/24|9001:82f3::/32"
+      expect(subject.ip_allowed?("98.23.19.111")).to eq(false)
+      expect(subject.ip_allowed?("9001:82f3:8873::3")).to eq(false)
+    end
+
+    it "returns false for standard internal IPs" do
+      expect(subject.ip_allowed?("172.31.100.31")).to eq(false)
+      expect(subject.ip_allowed?("fd02:77fa:ffea::f")).to eq(false)
+    end
+  end
+
+  describe ".host_bypasses_checks?" do
+    it "returns true for URLs when allowed_internal_hosts allows the host" do
+      SiteSetting.allowed_internal_hosts = "allowedhost1.com|allowedhost2.com"
+      expect(subject.host_bypasses_checks?("allowedhost1.com")).to eq(true)
+      expect(subject.host_bypasses_checks?("allowedhost2.com")).to eq(true)
+    end
+
+    it "returns false for other hosts" do
+      expect(subject.host_bypasses_checks?("otherhost.com")).to eq(false)
+    end
+
+    it "returns true for the base uri" do
+      SiteSetting.force_hostname = "final-test.example.com"
+      expect(subject.host_bypasses_checks?("final-test.example.com")).to eq(true)
+    end
+
+    it "returns true for the S3 CDN url" do
+      SiteSetting.enable_s3_uploads = true
+      SiteSetting.s3_cdn_url = "https://s3.example.com"
+      expect(subject.host_bypasses_checks?("s3.example.com")).to eq(true)
+    end
+
+    it "returns true for the CDN url" do
+      GlobalSetting.stubs(:cdn_url).returns("https://cdn.example.com/discourse")
+      expect(subject.host_bypasses_checks?("cdn.example.com")).to eq(true)
+    end
+  end
+
+  describe ".lookup_and_filter_ips" do
+    it "returns a fake response in tests" do
+      expect(subject.lookup_and_filter_ips("example.com")).to eq(["1.2.3.4"])
+    end
+
+    it "correctly filters private and blocked IPs" do
+      SiteSetting.blocked_ip_blocks = "9.10.11.12/24"
+      subject.stubs(:lookup_ips).returns(%w[127.0.0.1 5.6.7.8 9.10.11.12])
+      expect(subject.lookup_and_filter_ips("example.com")).to eq(["5.6.7.8"])
+    end
+
+    it "raises an exception if all IPs are blocked" do
+      subject.stubs(:lookup_ips).returns(["127.0.0.1"])
+      expect { subject.lookup_and_filter_ips("example.com") }.to raise_error(
+        subject::DisallowedIpError,
+      )
+    end
+
+    it "bypasses filtering for allowlisted hosts" do
+      SiteSetting.allowed_internal_hosts = "example.com"
+      subject.stubs(:lookup_ips).returns(["127.0.0.1"])
+      expect(subject.lookup_and_filter_ips("example.com")).to eq(["127.0.0.1"])
+    end
+  end
+end
diff --git a/spec/lib/final_destination_spec.rb b/spec/lib/final_destination_spec.rb
index 0429a3124e..a81be718ce 100644
--- a/spec/lib/final_destination_spec.rb
+++ b/spec/lib/final_destination_spec.rb
@@ -10,26 +10,6 @@ RSpec.describe FinalDestination do
       force_get_hosts: ['https://force.get.com', 'https://*.ihaveawildcard.com/'],
 
       preserve_fragment_url_hosts: ['https://eviltrout.com'],
-
-      # avoid IP lookups in test
-      lookup_ip: lambda do |host|
-        case host
-        when 'eviltrout.com' then '52.84.143.152'
-        when 'particularly.eviltrout.com' then '52.84.143.152'
-        when 'codinghorror.com' then '91.146.108.148'
-        when 'discourse.org' then '104.25.152.10'
-        when 'some_thing.example.com' then '104.25.152.10'
-        when 'private-host.com' then '192.168.10.1'
-        when 'internal-ipv6.com' then '2001:abc:de:01:3:3d0:6a65:c2bf'
-        when 'ignore-me.com' then '53.84.143.152'
-        when 'force.get.com' then '22.102.29.40'
-        when 'any-subdomain.ihaveawildcard.com' then '104.25.152.11'
-        when 'wikipedia.com' then '1.2.3.4'
-        else
-          _as_ip = IPAddr.new(host)
-          host
-        end
-      end
     }
   end
 
@@ -54,15 +34,32 @@ RSpec.describe FinalDestination do
     }
   end
 
+  def fd_stub_request(method, url)
+    uri = URI.parse(url)
+
+    host = uri.hostname
+    ip = "1.2.3.4"
+
+    # In Excon we pass the IP in the URL, so we need to stub
+    # that version as well
+    uri.hostname = "HOSTNAME_PLACEHOLDER"
+    matcher = Regexp.escape(uri.to_s).sub(
+      "HOSTNAME_PLACEHOLDER",
+      "(#{Regexp.escape(host)}|#{Regexp.escape(ip)})"
+    )
+
+    stub_request(method, /\A#{matcher}\z/).with(headers: { "Host" => host })
+  end
+
   def canonical_follow(from, dest)
-    stub_request(:get, from).to_return(
+    fd_stub_request(:get, from).to_return(
       status: 200,
       body: "<head><link rel=\"canonical\" href=\"#{dest}\"></head>"
     )
   end
 
   def redirect_response(from, dest)
-    stub_request(:head, from).to_return(
+    fd_stub_request(:head, from).to_return(
       status: 302,
       headers: { "Location" => dest }
     )
@@ -90,6 +87,16 @@ RSpec.describe FinalDestination do
       expect(fd('asdf').resolve).to be_nil
     end
 
+    it "returns nil for unresolvable url" do
+      FinalDestination::SSRFDetector.stubs(:lookup_ips).raises(SocketError)
+      expect(fd("https://example.com").resolve).to eq(nil)
+    end
+
+    it "returns nil for url timeout" do
+      FinalDestination::SSRFDetector.stubs(:lookup_ips).raises(Timeout::Error)
+      expect(fd("https://example.com").resolve).to eq(nil)
+    end
+
     it "returns nil when read timeouts" do
       Excon.expects(:public_send).raises(Excon::Errors::Timeout)
 
@@ -98,7 +105,7 @@ RSpec.describe FinalDestination do
 
     context "without redirects" do
       before do
-        stub_request(:head, "https://eviltrout.com").to_return(doc_response)
+        fd_stub_request(:head, "https://eviltrout.com/").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -118,7 +125,7 @@ RSpec.describe FinalDestination do
 
     context "with underscores in URLs" do
       before do
-        stub_request(:head, 'https://some_thing.example.com').to_return(doc_response)
+        fd_stub_request(:head, 'https://some_thing.example.com').to_return(doc_response)
       end
 
       it "doesn't raise errors with underscores in urls" do
@@ -133,7 +140,7 @@ RSpec.describe FinalDestination do
       before do
         redirect_response("https://eviltrout.com", "https://codinghorror.com/blog")
         redirect_response("https://codinghorror.com/blog", "https://discourse.org")
-        stub_request(:head, "https://discourse.org").to_return(doc_response)
+        fd_stub_request(:head, "https://discourse.org").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -148,7 +155,7 @@ RSpec.describe FinalDestination do
       before do
         redirect_response("https://eviltrout.com", "https://codinghorror.com/blog")
         redirect_response("https://codinghorror.com/blog", "https://discourse.org")
-        stub_request(:head, "https://discourse.org").to_return(doc_response)
+        fd_stub_request(:head, "https://discourse.org").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -162,7 +169,8 @@ RSpec.describe FinalDestination do
     context "with a redirect to an internal IP" do
       before do
         redirect_response("https://eviltrout.com", "https://private-host.com")
-        stub_request(:head, "https://private-host.com").to_return(doc_response)
+        FinalDestination::SSRFDetector.stubs(:lookup_and_filter_ips).with("eviltrout.com").returns(["1.2.3.4"])
+        FinalDestination::SSRFDetector.stubs(:lookup_and_filter_ips).with("private-host.com").raises(FinalDestination::SSRFDetector::DisallowedIpError)
       end
 
       it "returns the final url" do
@@ -188,14 +196,14 @@ RSpec.describe FinalDestination do
 
     it 'raises error when response is too big' do
       stub_const(described_class, "MAX_REQUEST_SIZE_BYTES", 1) do
-        stub_request(:get, "https://codinghorror.com/blog").to_return(body_response)
+        fd_stub_request(:get, "https://codinghorror.com/blog").to_return(body_response)
         final = FinalDestination.new('https://codinghorror.com/blog', opts.merge(follow_canonical: true))
         expect { final.resolve }.to raise_error(Excon::Errors::ExpectationFailed, "response size too big: https://codinghorror.com/blog")
       end
     end
 
     it 'raises error when response is too slow' do
-      stub_request(:get, "https://codinghorror.com/blog").to_return(lambda { |request| freeze_time(11.seconds.from_now) ; body_response })
+      fd_stub_request(:get, "https://codinghorror.com/blog").to_return(lambda { |request| freeze_time(11.seconds.from_now) ; body_response })
       final = FinalDestination.new('https://codinghorror.com/blog', opts.merge(follow_canonical: true))
       expect { final.resolve }.to raise_error(Excon::Errors::ExpectationFailed, "connect timeout reached: https://codinghorror.com/blog")
     end
@@ -203,7 +211,7 @@ RSpec.describe FinalDestination do
     context 'when following canonical links' do
       it 'resolves the canonical link as the final destination' do
         canonical_follow("https://eviltrout.com", "https://codinghorror.com/blog")
-        stub_request(:head, "https://codinghorror.com/blog").to_return(doc_response)
+        fd_stub_request(:head, "https://codinghorror.com/blog").to_return(doc_response)
 
         final = FinalDestination.new('https://eviltrout.com', opts.merge(follow_canonical: true))
 
@@ -216,7 +224,7 @@ RSpec.describe FinalDestination do
         host = "https://codinghorror.com"
 
         canonical_follow("#{host}/blog", "/blog/canonical")
-        stub_request(:head, "#{host}/blog/canonical").to_return(doc_response)
+        fd_stub_request(:head, "#{host}/blog/canonical").to_return(doc_response)
 
         final = FinalDestination.new("#{host}/blog", opts.merge(follow_canonical: true))
 
@@ -228,7 +236,7 @@ RSpec.describe FinalDestination do
       it 'resolves the canonical link when the URL is relative and does not start with the / symbol' do
         host = "https://codinghorror.com"
         canonical_follow("#{host}/blog", "blog/canonical")
-        stub_request(:head, "#{host}/blog/canonical").to_return(doc_response)
+        fd_stub_request(:head, "#{host}/blog/canonical").to_return(doc_response)
 
         final = FinalDestination.new("#{host}/blog", opts.merge(follow_canonical: true))
 
@@ -259,65 +267,71 @@ RSpec.describe FinalDestination do
     end
 
     context "when forcing GET" do
-      before do
-        stub_request(:head, 'https://force.get.com/posts?page=4')
-        stub_request(:get, 'https://force.get.com/posts?page=4')
-        stub_request(:get, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
-        stub_request(:head, 'https://eviltrout.com/posts?page=2')
-        stub_request(:get, 'https://eviltrout.com/posts?page=2')
-        stub_request(:head, 'https://particularly.eviltrout.com/has/a/secret/plan')
-        stub_request(:get, 'https://particularly.eviltrout.com/has/a/secret/plan')
-      end
-
       it "will do a GET when forced" do
-        final = FinalDestination.new('https://force.get.com/posts?page=4', opts)
-        expect(final.resolve.to_s).to eq('https://force.get.com/posts?page=4')
+        url = 'https://force.get.com/posts?page=4'
+        get_stub = fd_stub_request(:get, url)
+        head_stub = fd_stub_request(:head, url)
+
+        final = FinalDestination.new(url, opts)
+        expect(final.resolve.to_s).to eq(url)
         expect(final.status).to eq(:resolved)
-        expect(WebMock).to have_requested(:get, 'https://force.get.com/posts?page=4')
-        expect(WebMock).to_not have_requested(:head, 'https://force.get.com/posts?page=4')
+        expect(get_stub).to have_been_requested
+        expect(head_stub).to_not have_been_requested
       end
 
       it "will do a HEAD if not forced" do
-        final = FinalDestination.new('https://eviltrout.com/posts?page=2', opts)
-        expect(final.resolve.to_s).to eq('https://eviltrout.com/posts?page=2')
+        url = 'https://eviltrout.com/posts?page=2'
+        get_stub = fd_stub_request(:get, url)
+        head_stub = fd_stub_request(:head, url)
+
+        final = FinalDestination.new(url, opts)
+        expect(final.resolve.to_s).to eq(url)
         expect(final.status).to eq(:resolved)
-        expect(WebMock).to_not have_requested(:get, 'https://eviltrout.com/posts?page=2')
-        expect(WebMock).to have_requested(:head, 'https://eviltrout.com/posts?page=2')
+        expect(get_stub).to_not have_been_requested
+        expect(head_stub).to have_been_requested
       end
 
       it "will do a GET when forced on a wildcard subdomain" do
-        final = FinalDestination.new('https://any-subdomain.ihaveawildcard.com/some/other/content', opts)
-        expect(final.resolve.to_s).to eq('https://any-subdomain.ihaveawildcard.com/some/other/content')
+        url = 'https://any-subdomain.ihaveawildcard.com/some/other/content'
+        get_stub = fd_stub_request(:get, url)
+        head_stub = fd_stub_request(:head, url)
+
+        final = FinalDestination.new(url, opts)
+        expect(final.resolve.to_s).to eq(url)
         expect(final.status).to eq(:resolved)
-        expect(WebMock).to have_requested(:get, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
-        expect(WebMock).to_not have_requested(:head, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
+        expect(get_stub).to have_been_requested
+        expect(head_stub).to_not have_been_requested
       end
 
       it "will do a HEAD if on a subdomain of a forced get domain without a wildcard" do
-        final = FinalDestination.new('https://particularly.eviltrout.com/has/a/secret/plan', opts)
-        expect(final.resolve.to_s).to eq('https://particularly.eviltrout.com/has/a/secret/plan')
+        url = 'https://particularly.eviltrout.com/has/a/secret/plan'
+        get_stub = fd_stub_request(:get, url)
+        head_stub = fd_stub_request(:head, url)
+
+        final = FinalDestination.new(url, opts)
+        expect(final.resolve.to_s).to eq(url)
         expect(final.status).to eq(:resolved)
-        expect(WebMock).to_not have_requested(:get, 'https://particularly.eviltrout.com/has/a/secret/plan')
-        expect(WebMock).to have_requested(:head, 'https://particularly.eviltrout.com/has/a/secret/plan')
+        expect(get_stub).to_not have_been_requested
+        expect(head_stub).to have_been_requested
       end
 
     end
 
     context "when HEAD not supported" do
       before do
-        stub_request(:get, 'https://eviltrout.com').to_return(
+        fd_stub_request(:get, 'https://eviltrout.com').to_return(
           status: 301,
           headers: {
             "Location" => 'https://discourse.org',
             'Set-Cookie' => 'evil=trout'
           }
         )
-        stub_request(:head, 'https://discourse.org')
+        fd_stub_request(:head, 'https://discourse.org')
       end
 
       context "when the status code is 405" do
         before do
-          stub_request(:head, 'https://eviltrout.com').to_return(status: 405)
+          fd_stub_request(:head, 'https://eviltrout.com').to_return(status: 405)
         end
 
         it "will try a GET" do
@@ -330,7 +344,7 @@ RSpec.describe FinalDestination do
 
       context "when the status code is 501" do
         before do
-          stub_request(:head, 'https://eviltrout.com').to_return(status: 501)
+          fd_stub_request(:head, 'https://eviltrout.com').to_return(status: 501)
         end
 
         it "will try a GET" do
@@ -342,9 +356,9 @@ RSpec.describe FinalDestination do
       end
 
       it "correctly extracts cookies during GET" do
-        stub_request(:head, "https://eviltrout.com").to_return(status: 405)
+        fd_stub_request(:head, "https://eviltrout.com").to_return(status: 405)
 
-        stub_request(:get, "https://eviltrout.com")
+        fd_stub_request(:get, "https://eviltrout.com")
           .to_return(status: 302, body: "" , headers: {
             "Location" => "https://eviltrout.com",
             "Set-Cookie" => ["foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com",
@@ -352,7 +366,7 @@ RSpec.describe FinalDestination do
                              "baz=2; expires=Tue, 19-Feb-2019 10:14:24 GMT; path=/; domain=eviltrout.com"]
           })
 
-        stub_request(:head, "https://eviltrout.com")
+        fd_stub_request(:head, "https://eviltrout.com")
           .with(headers: { "Cookie" => "bar=1; baz=2; foo=219ffwef9w0f" })
 
         final = FinalDestination.new("https://eviltrout.com", opts)
@@ -363,13 +377,13 @@ RSpec.describe FinalDestination do
     end
 
     it "should use the correct format for cookies when there is only one cookie" do
-      stub_request(:head, "https://eviltrout.com")
+      fd_stub_request(:head, "https://eviltrout.com")
         .to_return(status: 302, headers: {
           "Location" => "https://eviltrout.com",
           "Set-Cookie" => "foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com"
         })
 
-      stub_request(:head, "https://eviltrout.com")
+      fd_stub_request(:head, "https://eviltrout.com")
         .with(headers: { "Cookie" => "foo=219ffwef9w0f" })
 
       final = FinalDestination.new("https://eviltrout.com", opts)
@@ -379,7 +393,7 @@ RSpec.describe FinalDestination do
     end
 
     it "should use the correct format for cookies when there are multiple cookies" do
-      stub_request(:head, "https://eviltrout.com")
+      fd_stub_request(:head, "https://eviltrout.com")
         .to_return(status: 302, headers: {
           "Location" => "https://eviltrout.com",
           "Set-Cookie" => ["foo=219ffwef9w0f; expires=Mon, 19-Feb-2018 10:44:24 GMT; path=/; domain=eviltrout.com",
@@ -387,7 +401,7 @@ RSpec.describe FinalDestination do
                            "baz=2; expires=Tue, 19-Feb-2019 10:14:24 GMT; path=/; domain=eviltrout.com"]
         })
 
-      stub_request(:head, "https://eviltrout.com")
+      fd_stub_request(:head, "https://eviltrout.com")
         .with(headers: { "Cookie" => "bar=1; baz=2; foo=219ffwef9w0f" })
 
       final = FinalDestination.new("https://eviltrout.com", opts)
@@ -401,7 +415,7 @@ RSpec.describe FinalDestination do
       upstream_url = "https://eviltrout.com/upstream/lib/code/foobar.rb"
 
       redirect_response(origin_url, upstream_url)
-      stub_request(:head, upstream_url).to_return(doc_response)
+      fd_stub_request(:head, upstream_url).to_return(doc_response)
 
       final = FinalDestination.new("#{origin_url}#L154-L205", opts)
       expect(final.resolve.to_s).to eq("#{upstream_url}#L154-L205")
@@ -410,7 +424,7 @@ RSpec.describe FinalDestination do
 
     context "with content_type" do
       before do
-        stub_request(:head, "https://eviltrout.com/this/is/an/image").to_return(image_response)
+        fd_stub_request(:head, "https://eviltrout.com/this/is/an/image").to_return(image_response)
       end
 
       it "returns a content_type" do
@@ -489,15 +503,6 @@ RSpec.describe FinalDestination do
     end
   end
 
-  describe '.validate_uri' do
-    context "with host lookups" do
-      it "works for various hosts" do
-        expect(fd('https://private-host.com').validate_uri).to eq(false)
-        expect(fd('https://eviltrout.com:443').validate_uri).to eq(true)
-      end
-    end
-  end
-
   describe ".validate_url_format" do
     it "supports http urls" do
       expect(fd('http://eviltrout.com').validate_uri_format).to eq(true)
@@ -535,89 +540,19 @@ RSpec.describe FinalDestination do
     end
   end
 
-  describe ".is_dest_valid" do
-    it "returns false for a valid ipv4" do
-      expect(fd("https://52.84.143.67").is_dest_valid?).to eq(true)
-      expect(fd("https://104.25.153.10").is_dest_valid?).to eq(true)
-    end
-
-    it "returns false for short ip" do
-      lookup = lambda do |host|
-        # How IPs are looked up for single digits
-        if host == "0"
-          "0.0.0.0"
-        elsif host == "1"
-          "0.0.0.1"
-        end
-      end
-
-      expect(FinalDestination.new('https://0/logo.png', lookup_ip: lookup).is_dest_valid?).to eq(false)
-      expect(FinalDestination.new('https://1/logo.png', lookup_ip: lookup).is_dest_valid?).to eq(false)
-    end
-
-    it "returns false for private ipv4" do
-      expect(fd("https://127.0.0.1").is_dest_valid?).to eq(false)
-      expect(fd("https://192.168.1.3").is_dest_valid?).to eq(false)
-      expect(fd("https://10.0.0.5").is_dest_valid?).to eq(false)
-      expect(fd("https://172.16.0.1").is_dest_valid?).to eq(false)
-    end
-
-    it "returns false for IPV6 via site settings" do
-      SiteSetting.blocked_ip_blocks = '2001:abc:de::/48|2002:abc:de::/48'
-      expect(fd('https://[2001:abc:de:01:0:3f0:6a65:c2bf]').is_dest_valid?).to eq(false)
-      expect(fd('https://[2002:abc:de:01:0:3f0:6a65:c2bf]').is_dest_valid?).to eq(false)
-      expect(fd('https://internal-ipv6.com').is_dest_valid?).to eq(false)
-      expect(fd('https://[2003:abc:de:01:0:3f0:6a65:c2bf]').is_dest_valid?).to eq(true)
-    end
-
-    it "ignores invalid ranges" do
-      SiteSetting.blocked_ip_blocks = '2001:abc:de::/48|eviltrout'
-      expect(fd('https://[2001:abc:de:01:0:3f0:6a65:c2bf]').is_dest_valid?).to eq(false)
-    end
-
-    it "returns true for public ipv6" do
-      expect(fd("https://[2001:470:1:3a8::251]").is_dest_valid?).to eq(true)
-    end
-
-    it "returns false for private ipv6" do
-      expect(fd("https://[fdd7:b450:d4d1:6b44::1]").is_dest_valid?).to eq(false)
-    end
-
-    it "returns true for the base uri" do
-      SiteSetting.force_hostname = "final-test.example.com"
-      expect(fd("https://final-test.example.com/onebox").is_dest_valid?).to eq(true)
-    end
-
-    it "returns true for the S3 CDN url" do
-      SiteSetting.enable_s3_uploads = true
-      SiteSetting.s3_cdn_url = "https://s3.example.com"
-      expect(fd("https://s3.example.com/some/thing").is_dest_valid?).to eq(true)
-    end
-
-    it "returns true for the CDN url" do
-      GlobalSetting.stubs(:cdn_url).returns("https://cdn.example.com/discourse")
-      expect(fd("https://cdn.example.com/some/asset").is_dest_valid?).to eq(true)
-    end
-
-    it 'supports allowlisting via a site setting' do
-      SiteSetting.allowed_internal_hosts = 'private-host.com'
-      expect(fd("https://private-host.com/some/url").is_dest_valid?).to eq(true)
-    end
-  end
-
   describe "https cache" do
     it 'will cache https lookups' do
 
       FinalDestination.clear_https_cache!("wikipedia.com")
 
-      stub_request(:head, "http://wikipedia.com/image.png")
+      fd_stub_request(:head, "http://wikipedia.com/image.png")
         .to_return(status: 302, body: "", headers: { location: 'https://wikipedia.com/image.png' })
 
-      stub_request(:head, "https://wikipedia.com/image.png")
+      fd_stub_request(:head, "https://wikipedia.com/image.png")
 
       fd('http://wikipedia.com/image.png').resolve
 
-      stub_request(:head, "https://wikipedia.com/image2.png")
+      fd_stub_request(:head, "https://wikipedia.com/image2.png")
 
       fd('http://wikipedia.com/image2.png').resolve
     end
diff --git a/spec/lib/git_url_spec.rb b/spec/lib/git_url_spec.rb
new file mode 100644
index 0000000000..5d7ab3f964
--- /dev/null
+++ b/spec/lib/git_url_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RSpec.describe GitUrl do
+  it "handles the discourse github repo by ssh" do
+    expect(GitUrl.normalize("git@github.com:discourse/discourse.git")).to eq(
+      "ssh://git@github.com/discourse/discourse.git"
+    )
+  end
+
+  it "handles the discourse github repo by https" do
+    expect(GitUrl.normalize("https://github.com/discourse/discourse.git")).to eq(
+      "https://github.com/discourse/discourse.git"
+    )
+  end
+end
diff --git a/spec/lib/onebox/helpers_spec.rb b/spec/lib/onebox/helpers_spec.rb
index 22f97cebde..4be556a29b 100644
--- a/spec/lib/onebox/helpers_spec.rb
+++ b/spec/lib/onebox/helpers_spec.rb
@@ -41,6 +41,14 @@ RSpec.describe Onebox::Helpers do
         described_class.fetch_response('http://example.com/large-file')
       }.to raise_error(Onebox::Helpers::DownloadTooLarge)
     end
+
+    it "raises an exception when private url requested" do
+      FinalDestination::TestHelper.stub_to_fail do
+        expect {
+          described_class.fetch_response('http://example.com/large-file')
+        }.to raise_error(FinalDestination::SSRFDetector::DisallowedIpError)
+      end
+    end
   end
 
   describe "fetch_html_doc" do
@@ -63,13 +71,25 @@ RSpec.describe Onebox::Helpers do
 
       it "does not follow canonical link pointing at localhost" do
         uri = 'https://www.example.com'
-        stub_request(:get, uri).to_return(status: 200, body: "<!DOCTYPE html><link rel='canonical' href='http://localhost:3000/'/><p>success</p>")
+        FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "localhost" }.returns(["127.0.0.1"])
+        stub_request(:get, uri).to_return(status: 200, body: "<!DOCTYPE html><link rel='canonical' href='http://localhost/test'/><p>success</p>")
 
         expect(described_class.fetch_html_doc(uri).to_s).to match("success")
       end
     end
   end
 
+  describe ".fetch_content_length" do
+    it "does not connect to private IP" do
+      uri = 'https://www.example.com'
+      FinalDestination::TestHelper.stub_to_fail do
+        expect {
+          described_class.fetch_content_length(uri)
+        }.to raise_error(FinalDestination::SSRFDetector::DisallowedIpError)
+      end
+    end
+  end
+
   describe "redirects" do
     describe "redirect limit" do
       before do
diff --git a/spec/lib/onebox/status_check_spec.rb b/spec/lib/onebox/status_check_spec.rb
index 2d7fc0b917..ffda6db581 100644
--- a/spec/lib/onebox/status_check_spec.rb
+++ b/spec/lib/onebox/status_check_spec.rb
@@ -54,6 +54,12 @@ RSpec.describe Onebox::StatusCheck do
     it 'returns :connection_error if there is a general HTTP error' do
       expect(described_class.new("http://www.amazon.com/http-error").human_status).to eq(:connection_error)
     end
+
+    it 'returns :connection_error for private ips' do
+      FinalDestination::TestHelper.stub_to_fail do
+        expect(described_class.new("http://www.amazon.com/http-error").human_status).to eq(:connection_error)
+      end
+    end
   end
 
   describe '#ok?' do
diff --git a/spec/lib/theme_store/git_importer_spec.rb b/spec/lib/theme_store/git_importer_spec.rb
index 72ad7e7e22..59ed357313 100644
--- a/spec/lib/theme_store/git_importer_spec.rb
+++ b/spec/lib/theme_store/git_importer_spec.rb
@@ -16,44 +16,67 @@ RSpec.describe ThemeStore::GitImporter do
     before do
       hex = "xxx"
       SecureRandom.stubs(:hex).returns(hex)
+      FinalDestination.stubs(:resolve).with(url).returns(URI.parse(url))
+      FinalDestination::SSRFDetector.stubs(:lookup_and_filter_ips).with("github.com").returns(["192.0.2.100"])
       @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{hex}"
       @ssh_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_ssh_#{hex}"
     end
 
-    it "should import from http url" do
-      Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder)
+    it "imports http urls" do
+      Discourse::Utils
+        .expects(:execute_command)
+        .with(
+          { "GIT_TERMINAL_PROMPT" => "0" },
+          "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "https://github.com/example/example.git", @temp_folder, { timeout: 20 }
+        )
 
       importer = ThemeStore::GitImporter.new(url)
       importer.import!
     end
 
-    it "should work with trailing slash url" do
-      Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder)
+    it "imports when the url has a trailing slash" do
+      Discourse::Utils
+        .expects(:execute_command)
+        .with(
+          { "GIT_TERMINAL_PROMPT" => "0" },
+          "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "https://github.com/example/example.git", @temp_folder, { timeout: 20 }
+        )
 
       importer = ThemeStore::GitImporter.new(trailing_slash_url)
       importer.import!
     end
 
-    it "should import from ssh url" do
-      Discourse::Utils.expects(:execute_command).with({
-        'GIT_SSH_COMMAND' => "ssh -i #{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no"
-      }, "git", "clone", ssh_url, @temp_folder)
+    it "imports ssh urls" do
+      Discourse::Utils
+        .expects(:execute_command)
+        .with(
+          { "GIT_SSH_COMMAND" => "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no" },
+          "git", "clone", "ssh://git@github.com/example/example.git", @temp_folder, { timeout: 20 }
+        )
 
       importer = ThemeStore::GitImporter.new(ssh_url, private_key: "private_key")
       importer.import!
     end
 
-    it "should import branch from http url" do
-      Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", branch, url, @temp_folder)
+    it "imports http urls with a particular branch" do
+      Discourse::Utils
+        .expects(:execute_command)
+        .with(
+          { "GIT_TERMINAL_PROMPT" => "0" },
+          "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "-b", branch, "https://github.com/example/example.git", @temp_folder, { timeout: 20 }
+        )
 
       importer = ThemeStore::GitImporter.new(url, branch: branch)
       importer.import!
     end
 
-    it "should import branch from ssh url" do
-      Discourse::Utils.expects(:execute_command).with({
-        'GIT_SSH_COMMAND' => "ssh -i #{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no"
-      }, "git", "clone", "--single-branch", "-b", branch, ssh_url, @temp_folder)
+    it "imports ssh urls with a particular branch" do
+      Discourse::Utils
+        .expects(:execute_command)
+        .with(
+          { "GIT_SSH_COMMAND" => "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no" },
+          "git", "clone", "-b", branch, "ssh://git@github.com/example/example.git", @temp_folder, { timeout: 20 }
+        )
 
       importer = ThemeStore::GitImporter.new(ssh_url, private_key: "private_key", branch: branch)
       importer.import!
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 1ef821d84f..b45e714bc9 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -49,20 +49,29 @@ RSpec.describe RemoteTheme do
       )
     end
 
+    let :initial_repo_url do
+      MockGitImporter.register("https://example.com/initial_repo.git", initial_repo)
+    end
+
     after do
       `rm -fr #{initial_repo}`
     end
 
-    it 'can correctly import a remote theme' do
+    around(:each) do |group|
+      MockGitImporter.with_mock do
+        group.run
+      end
+    end
 
+    it 'can correctly import a remote theme' do
       time = Time.new('2000')
       freeze_time time
 
-      @theme = RemoteTheme.import_theme(initial_repo)
+      @theme = RemoteTheme.import_theme(initial_repo_url)
       remote = @theme.remote_theme
 
       expect(@theme.name).to eq('awesome theme')
-      expect(remote.remote_url).to eq(initial_repo)
+      expect(remote.remote_url).to eq(initial_repo_url)
       expect(remote.remote_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
       expect(remote.local_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
 
@@ -160,12 +169,12 @@ RSpec.describe RemoteTheme do
     end
 
     it "can update themes with overwritten history" do
-      theme = RemoteTheme.import_theme(initial_repo)
+      theme = RemoteTheme.import_theme(initial_repo_url)
       remote = theme.remote_theme
 
       old_version = `cd #{initial_repo} && git rev-parse HEAD`.strip
       expect(theme.name).to eq('awesome theme')
-      expect(remote.remote_url).to eq(initial_repo)
+      expect(remote.remote_url).to eq(initial_repo_url)
       expect(remote.local_version).to eq(old_version)
       expect(remote.remote_version).to eq(old_version)
 
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index bd8743ee64..22f0ffc149 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -658,4 +658,33 @@ RSpec.describe WebHook do
       end
     end
   end
+
+  describe '#payload_url_safety' do
+    fab!(:post_hook) { Fabricate(:web_hook, payload_url: "https://example.com") }
+
+    it 'errors if payload_url resolves to a blocked IP' do
+      SiteSetting.blocked_ip_blocks = "92.110.0.0/16"
+      FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "badhostname.com" }.returns(["92.110.44.17"])
+      post_hook.payload_url = "https://badhostname.com"
+      post_hook.save
+      expect(post_hook.errors.full_messages).to contain_exactly(
+        I18n.t("webhooks.payload_url.blocked_or_internal")
+      )
+    end
+
+    it 'errors if payload_url resolves to an internal IP' do
+      FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "badhostname.com" }.returns(["172.18.11.39"])
+      post_hook.payload_url = "https://badhostname.com"
+      post_hook.save
+      expect(post_hook.errors.full_messages).to contain_exactly(
+        I18n.t("webhooks.payload_url.blocked_or_internal")
+      )
+    end
+
+    it "doesn't error if payload_url resolves to an allowed IP" do
+      FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "goodhostname.com" }.returns(["172.32.11.39"])
+      post_hook.payload_url = "https://goodhostname.com"
+      post_hook.save!
+    end
+  end
 end
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index bb6ae42592..f61a50ecd9 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -11,6 +11,22 @@ RSpec.describe Admin::ThemesController do
     sign_in(admin)
   end
 
+  let! :repo do
+    setup_git_repo(
+      "about.json" => { name: "discourse-branch-header" }.to_json,
+    )
+  end
+
+  let! :repo_url do
+    MockGitImporter.register('https://github.com/discourse/discourse-brand-header.git', repo)
+  end
+
+  around(:each) do |group|
+    MockGitImporter.with_mock do
+      group.run
+    end
+  end
+
   describe '#generate_key_pair' do
     it 'can generate key pairs' do
       post "/admin/themes/generate_key_pair.json"
@@ -111,8 +127,8 @@ RSpec.describe Admin::ThemesController do
           remote: '    https://github.com/discourse/discourse-brand-header.git       '
         }
 
-        expect(Theme.allowed_remote_theme_ids.length).to eq(1)
         expect(response.status).to eq(201)
+        expect(Theme.allowed_remote_theme_ids.length).to eq(1)
       end
 
       it "prevents adding disallowed themes" do
diff --git a/spec/requests/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb
index 31674f86ea..ec1abb9fcf 100644
--- a/spec/requests/admin/web_hooks_controller_spec.rb
+++ b/spec/requests/admin/web_hooks_controller_spec.rb
@@ -94,5 +94,63 @@ RSpec.describe Admin::WebHooksController do
         expect(job_args["event_type"]).to eq("ping")
       end
     end
+
+    describe '#redeliver_event' do
+      let!(:web_hook_event) do
+        WebHookEvent.create!(
+          web_hook: web_hook,
+          payload: "abc",
+          headers: JSON.dump(aa: "1", bb: "2"),
+        )
+      end
+
+      it 'emits the web hook and updates the response headers and body' do
+        stub_request(:post, web_hook.payload_url)
+          .with(body: "abc", headers: { "aa" => 1, "bb" => 2 })
+          .to_return(
+            status: 402,
+            body: "efg",
+            headers: { "Content-Type" => "application/json", "yoo" => "man" }
+          )
+        post "/admin/api/web_hooks/#{web_hook.id}/events/#{web_hook_event.id}/redeliver.json"
+        expect(response.status).to eq(200)
+
+        parsed_event = response.parsed_body["web_hook_event"]
+        expect(parsed_event["id"]).to eq(web_hook_event.id)
+        expect(parsed_event["status"]).to eq(402)
+
+        expect(JSON.parse(parsed_event["headers"])).to eq({ "aa" => "1", "bb" => "2" })
+        expect(parsed_event["payload"]).to eq("abc")
+
+        expect(JSON.parse(parsed_event["response_headers"])).to eq({ "content-type" => "application/json", "yoo" => "man" })
+        expect(parsed_event["response_body"]).to eq("efg")
+      end
+
+      it "doesn't emit the web hook if the payload URL resolves to an internal IP" do
+        FinalDestination::TestHelper.stub_to_fail do
+          post "/admin/api/web_hooks/#{web_hook.id}/events/#{web_hook_event.id}/redeliver.json"
+        end
+        expect(response.status).to eq(200)
+
+        parsed_event = response.parsed_body["web_hook_event"]
+        expect(parsed_event["id"]).to eq(web_hook_event.id)
+        expect(parsed_event["response_headers"]).to eq({ error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json)
+        expect(parsed_event["status"]).to eq(-1)
+        expect(parsed_event["response_body"]).to eq(nil)
+      end
+
+      it "doesn't emit the web hook if the payload URL resolves to a blocked IP" do
+        FinalDestination::TestHelper.stub_to_fail do
+          post "/admin/api/web_hooks/#{web_hook.id}/events/#{web_hook_event.id}/redeliver.json"
+        end
+        expect(response.status).to eq(200)
+
+        parsed_event = response.parsed_body["web_hook_event"]
+        expect(parsed_event["id"]).to eq(web_hook_event.id)
+        expect(parsed_event["response_headers"]).to eq({ error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json)
+        expect(parsed_event["status"]).to eq(-1)
+        expect(parsed_event["response_body"]).to eq(nil)
+      end
+    end
   end
 end
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index 62ac85f633..e2857ec949 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -56,6 +56,10 @@ RSpec.describe ThemesInstallTask do
       )
     end
 
+    let :theme_repo_url do
+      MockGitImporter.register("https://example.com/theme_repo.git", theme_repo)
+    end
+
     let :component_repo do
       setup_git_repo(
         "about.json" => about_json(component: true),
@@ -73,6 +77,10 @@ RSpec.describe ThemesInstallTask do
       )
     end
 
+    let :component_repo_url do
+      MockGitImporter.register("https://example.com/component_repo.git", component_repo)
+    end
+
     after do
       `rm -fr #{theme_repo}`
       `rm -fr #{component_repo}`
@@ -83,39 +91,50 @@ RSpec.describe ThemesInstallTask do
       expect(Theme.where(name: "fail!").exists?).to eq(false)
     end
 
+    before do
+      FinalDestination.stubs(:resolve).with(theme_repo_url).returns(URI.parse(theme_repo_url))
+      FinalDestination.stubs(:resolve).with(component_repo_url).returns(URI.parse(component_repo_url))
+    end
+
+    around(:each) do |group|
+      MockGitImporter.with_mock do
+        group.run
+      end
+    end
+
     describe "no options" do
       it 'installs a theme' do
-        ThemesInstallTask.install("some_theme": theme_repo)
+        ThemesInstallTask.install("some_theme": theme_repo_url)
         expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
     end
 
     describe "with options" do
       it 'installs a theme from only a url' do
-        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url } })
         expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
 
       it 'does not set the theme to default if the key/value is not present' do
-        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url } })
         theme = Theme.find_by(name: THEME_NAME)
         expect(theme.default?).to eq(false)
       end
 
       it 'sets the theme to default if the key/value is true' do
-        ThemesInstallTask.install({ "some_theme": { "url": theme_repo, default: true } })
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url, default: true } })
         theme = Theme.find_by(name: THEME_NAME)
         expect(theme.default?).to eq(true)
       end
 
       it 'installs theme components, but does not add them to themes' do
-        ThemesInstallTask.install({ "some_theme": { "url": component_repo } })
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo_url } })
         theme = Theme.find_by(name: THEME_NAME)
         expect(theme.component).to eq(true)
       end
 
       it 'adds component to all themes if "add_to_all_themes" is true' do
-        ThemesInstallTask.install({ "some_theme": { "url": component_repo, add_to_all_themes: true } })
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo_url, add_to_all_themes: true } })
         theme = Theme.find_by(name: THEME_NAME)
         Theme.where(component: false).each do |parent_theme|
           expect(ChildTheme.find_by(parent_theme_id: parent_theme.id, child_theme_id: theme.id).nil?).to eq(false)
@@ -123,7 +142,7 @@ RSpec.describe ThemesInstallTask do
       end
 
       it 'updates theme fields' do
-        ThemesInstallTask.install({ "some_theme": component_repo })
+        ThemesInstallTask.install({ "some_theme": component_repo_url })
         theme = Theme.find_by(name: THEME_NAME)
         remote = theme.remote_theme
 
@@ -140,7 +159,7 @@ RSpec.describe ThemesInstallTask do
         expect(remote.commits_behind).to eq(1)
         expect(remote.remote_version).to eq(`cd #{component_repo} && git rev-parse HEAD`.strip)
 
-        ThemesInstallTask.install({ "some_theme": component_repo })
+        ThemesInstallTask.install({ "some_theme": component_repo_url })
 
         expect(theme.theme_fields.find_by(name: 'scss', value: scss)).not_to be_nil
         expect(remote.reload.commits_behind).to eq(0)
diff --git a/spec/support/final_destination_helper.rb b/spec/support/final_destination_helper.rb
new file mode 100644
index 0000000000..7b586a3b1f
--- /dev/null
+++ b/spec/support/final_destination_helper.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+WebMock::HttpLibAdapterRegistry.instance.register(
+  :final_destination,
+  Class.new do
+    OriginalHTTP = FinalDestination::HTTP unless const_defined?(:OriginalHTTP)
+
+    def self.enable!
+      FinalDestination.send(:remove_const, :HTTP)
+      FinalDestination.send(:const_set, :HTTP, Net::HTTP)
+    end
+
+    def self.disable!
+      FinalDestination.send(:remove_const, :HTTP)
+      FinalDestination.send(:const_set, :HTTP, OriginalHTTP)
+    end
+  end,
+)
+
+module FinalDestination::TestHelper
+  def self.stub_to_fail(&blk)
+    WebMock::HttpLibAdapterRegistry.instance.http_lib_adapters[:final_destination].disable!
+    FinalDestination::SSRFDetector.stubs(:lookup_ips).returns(["0.0.0.0"])
+    yield
+  ensure
+    WebMock::HttpLibAdapterRegistry.instance.http_lib_adapters[:final_destination].enable!
+    FinalDestination::SSRFDetector.unstub(:lookup_ips)
+  end
+end
diff --git a/spec/support/mock_git_importer.rb b/spec/support/mock_git_importer.rb
new file mode 100644
index 0000000000..2f7c9bb487
--- /dev/null
+++ b/spec/support/mock_git_importer.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class MockGitImporter < ThemeStore::GitImporter
+  attr_reader :s3_client
+
+  class << self
+    def with_mock
+      git_importer = ThemeStore::GitImporter
+      ThemeStore.send(:remove_const, :GitImporter)
+      ThemeStore.const_set(:GitImporter, MockGitImporter)
+
+      begin
+        yield
+      ensure
+        ThemeStore.send(:remove_const, :GitImporter)
+        ThemeStore.const_set(:GitImporter, git_importer)
+      end
+    end
+
+    def register(url, path)
+      repos[url] = path
+      url
+    end
+
+    def [](url)
+      repos.fetch(url)
+    end
+
+    def reset!
+      repos = nil
+    end
+
+    private
+
+    def repos
+      @repos ||= {}
+    end
+  end
+
+  def initialize(url, private_key: nil, branch: nil)
+    @url = url
+    @private_key = private_key
+    @branch = branch
+    @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}"
+  end
+
+  def import!
+    begin
+      path = MockGitImporter[@url]
+    rescue KeyError
+      raise_import_error!
+    end
+
+    Discourse::Utils.execute_command("git", "clone", path, @temp_folder)
+  end
+end

From 07ef1a80a1461123d602c57e366974aed265a91e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 1 Nov 2022 16:33:32 +0000
Subject: [PATCH 331/332] SECURITY: Fix invite link email validation (#18817)

See https://github.com/discourse/discourse/security/advisories/GHSA-x8w7-rwmr-w278

Co-authored-by: Martin Brennan <martin@discourse.org>
---
 .../discourse/app/controllers/invites-show.js |  65 +++++-
 .../discourse/app/templates/invites/show.hbs  |   9 +-
 app/controllers/invites_controller.rb         | 208 +++++++++---------
 app/controllers/session_controller.rb         |   9 +-
 app/models/email_token.rb                     |   2 +-
 app/models/invite.rb                          |  37 +++-
 app/models/invite_redeemer.rb                 | 125 +++++++----
 config/locales/client.en.yml                  |   2 +
 config/locales/server.en.yml                  |   1 +
 ...log_out_invite_redemption_invited_users.rb |  32 +++
 spec/models/invite_redeemer_spec.rb           |  54 ++++-
 spec/models/invite_spec.rb                    |  14 +-
 spec/requests/invites_controller_spec.rb      | 172 +++++++++++----
 13 files changed, 507 insertions(+), 223 deletions(-)
 create mode 100644 db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 68937d5e7d..c9ad115707 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -1,4 +1,4 @@
-import { alias, not, or, readOnly } from "@ember/object/computed";
+import { alias, bool, not, readOnly } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import EmberObject from "@ember/object";
@@ -29,6 +29,9 @@ export default Controller.extend(
     invitedBy: readOnly("model.invited_by"),
     email: alias("model.email"),
     accountEmail: alias("email"),
+    existingUserId: readOnly("model.existing_user_id"),
+    existingUserCanRedeem: readOnly("model.existing_user_can_redeem"),
+    existingUserRedeeming: bool("existingUserId"),
     hiddenEmail: alias("model.hidden_email"),
     emailVerifiedByLink: alias("model.email_verified_by_link"),
     differentExternalEmail: alias("model.different_external_email"),
@@ -40,13 +43,6 @@ export default Controller.extend(
     authOptions: null,
     inviteImageUrl: getUrl("/images/envelope.svg"),
     isInviteLink: readOnly("model.is_invite_link"),
-    submitDisabled: or(
-      "emailValidation.failed",
-      "usernameValidation.failed",
-      "passwordValidation.failed",
-      "nameValidation.failed",
-      "userFieldsValidation.failed"
-    ),
     rejectedEmails: null,
 
     init() {
@@ -81,6 +77,15 @@ export default Controller.extend(
       });
     },
 
+    @discourseComputed("existingUserId")
+    subheaderMessage(existingUserId) {
+      if (existingUserId) {
+        return I18n.t("invites.existing_user_can_redeem");
+      } else {
+        return I18n.t("create_account.subheader_title");
+      }
+    },
+
     @discourseComputed("email")
     yourEmailMessage(email) {
       return I18n.t("invites.your_email", { email });
@@ -100,6 +105,37 @@ export default Controller.extend(
       );
     },
 
+    @discourseComputed(
+      "emailValidation.failed",
+      "usernameValidation.failed",
+      "passwordValidation.failed",
+      "nameValidation.failed",
+      "userFieldsValidation.failed",
+      "existingUserRedeeming",
+      "existingUserCanRedeem"
+    )
+    submitDisabled(
+      emailValidationFailed,
+      usernameValidationFailed,
+      passwordValidationFailed,
+      nameValidationFailed,
+      userFieldsValidationFailed,
+      existingUserRedeeming,
+      existingUserCanRedeem
+    ) {
+      if (existingUserRedeeming) {
+        return !existingUserCanRedeem;
+      }
+
+      return (
+        emailValidationFailed ||
+        usernameValidationFailed ||
+        passwordValidationFailed ||
+        nameValidationFailed ||
+        userFieldsValidationFailed
+      );
+    },
+
     @discourseComputed(
       "externalAuthsEnabled",
       "externalAuthsOnly",
@@ -118,13 +154,20 @@ export default Controller.extend(
     @discourseComputed(
       "externalAuthsOnly",
       "authOptions",
-      "emailValidation.failed"
+      "emailValidation.failed",
+      "existingUserRedeeming"
     )
-    shouldDisplayForm(externalAuthsOnly, authOptions, emailValidationFailed) {
+    shouldDisplayForm(
+      externalAuthsOnly,
+      authOptions,
+      emailValidationFailed,
+      existingUserRedeeming
+    ) {
       return (
         (this.siteSettings.enable_local_logins ||
           (externalAuthsOnly && authOptions && !emailValidationFailed)) &&
-        !this.siteSettings.enable_discourse_connect
+        !this.siteSettings.enable_discourse_connect &&
+        !existingUserRedeeming
       );
     },
 
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index 51b11885ee..c7d9122c4e 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -4,7 +4,7 @@
       <h1 class="login-title">{{this.welcomeTitle}}</h1>
       <img src={{this.wavingHandURL}} alt="" class="waving-hand">
       {{#unless this.successMessage}}
-        <p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
+        <p class="login-subheader">{{this.subheaderMessage}}</p>
       {{/unless}}
     </div>
 
@@ -131,6 +131,13 @@
                 {{/if}}
               </form>
             {{/if}}
+            {{#if this.existingUserRedeeming}}
+              {{#if this.existingUserCanRedeem}}
+                <DButton @class="btn-primary" @action={{action "submit"}} @type="submit" @disabled={{this.submitDisabled}} @label="invites.accept_invite" />
+              {{else}}
+                <div class="alert alert-error">{{i18n "invites.existing_user_cannot_redeem"}}</div>
+              {{/if}}
+            {{/if}}
           {{/if}}
         </div>
       </div>
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 8f65340be0..5c5275c12e 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -12,7 +12,6 @@ class InvitesController < ApplicationController
 
   before_action :ensure_invites_allowed, only: [:show, :perform_accept_invitation]
   before_action :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation]
-  before_action :ensure_not_logged_in, only: :perform_accept_invitation
 
   def show
     expires_now
@@ -22,90 +21,9 @@ class InvitesController < ApplicationController
     invite = Invite.find_by(invite_key: params[:id])
 
     if invite.present? && invite.redeemable?
-      if current_user
-        redeemed = false
-
-        begin
-          invite.redeem(email: current_user.email)
-          redeemed = true
-        rescue ActiveRecord::RecordNotSaved, Invite::UserExists
-          # This is not ideal but `Invite#redeem` raises either `Invite::UserExists` or `ActiveRecord::RecordNotSaved`
-          # error when it fails to redeem the invite. If redemption fails for a logged in user, we will just ignore it.
-        end
-
-        if redeemed && (topic = invite.topics.first) && current_user.guardian.can_see?(topic)
-          create_topic_invite_notifications(invite, current_user)
-          return redirect_to(topic.url)
-        end
-
-        return redirect_to(path("/"))
-      end
-
-      email = Email.obfuscate(invite.email)
-
-      # Show email if the user already authenticated their email
-      different_external_email = false
-
-      if session[:authentication]
-        auth_result = Auth::Result.from_session_data(session[:authentication], user: nil)
-        if invite.email == auth_result.email
-          email = invite.email
-        else
-          different_external_email = true
-        end
-      end
-
-      email_verified_by_link = invite.email_token.present? && params[:t] == invite.email_token
-
-      if email_verified_by_link
-        email = invite.email
-      end
-
-      hidden_email = email != invite.email
-
-      if hidden_email || invite.email.nil?
-        username = ""
-      else
-        username = UserNameSuggester.suggest(invite.email)
-      end
-
-      info = {
-        invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
-        email: email,
-        hidden_email: hidden_email,
-        username: username,
-        is_invite_link: invite.is_invite_link?,
-        email_verified_by_link: email_verified_by_link
-      }
-
-      if different_external_email
-        info[:different_external_email] = true
-      end
-
-      if staged_user = User.where(staged: true).with_email(invite.email).first
-        info[:username] = staged_user.username
-        info[:user_fields] = staged_user.user_fields
-      end
-
-      store_preloaded("invite_info", MultiJson.dump(info))
-
-      secure_session["invite-key"] = invite.invite_key
-
-      render layout: 'application'
+      show_invite(invite)
     else
-      flash.now[:error] = if invite.blank?
-        I18n.t('invite.not_found', base_url: Discourse.base_url)
-      elsif invite.redeemed?
-        if invite.is_invite_link?
-          I18n.t('invite.not_found_template_link', site_name: SiteSetting.title, base_url: Discourse.base_url)
-        else
-          I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
-        end
-      elsif invite.expired?
-        I18n.t('invite.expired', base_url: Discourse.base_url)
-      end
-
-      render layout: 'no_ember'
+      show_irredeemable_invite(invite)
     end
   rescue RateLimiter::LimitExceeded => e
     flash.now[:error] = e.description
@@ -277,24 +195,33 @@ class InvitesController < ApplicationController
     params.permit(:email, :username, :name, :password, :timezone, :email_token, user_custom_fields: {})
 
     invite = Invite.find_by(invite_key: params[:id])
+    redeeming_user = current_user
 
     if invite.present?
       begin
         attrs = {
-          username: params[:username],
-          name: params[:name],
-          password: params[:password],
-          user_custom_fields: params[:user_custom_fields],
           ip_address: request.remote_ip,
           session: session
         }
 
-        if invite.is_invite_link?
-          params.require(:email)
-          attrs[:email] = params[:email]
+        if redeeming_user
+          attrs[:redeeming_user] = redeeming_user
         else
-          attrs[:email] = invite.email
-          attrs[:email_token] = params[:email_token] if params[:email_token].present?
+          attrs[:username] = params[:username]
+          attrs[:name] = params[:name]
+          attrs[:password] = params[:password]
+          attrs[:user_custom_fields] = params[:user_custom_fields]
+
+          # If the invite is not scoped to an email then we allow the
+          # user to provide it themselves
+          if invite.is_invite_link?
+            params.require(:email)
+            attrs[:email] = params[:email]
+          else
+            # Otherwise we always use the email from the invitation.
+            attrs[:email] = invite.email
+            attrs[:email_token] = params[:email_token] if params[:email_token].present?
+          end
         end
 
         user = invite.redeem(**attrs)
@@ -306,7 +233,10 @@ class InvitesController < ApplicationController
         return render json: failed_json.merge(message: I18n.t('invite.not_found_json')), status: 404
       end
 
-      log_on_user(user) if user.active? && user.guardian.can_access_forum?
+      if !redeeming_user && user.active? && user.guardian.can_access_forum?
+        log_on_user(user)
+      end
+
       user.update_timezone_if_missing(params[:timezone])
       post_process_invite(user)
       create_topic_invite_notifications(invite, user)
@@ -316,6 +246,10 @@ class InvitesController < ApplicationController
 
       if user.present?
         if user.active? && user.guardian.can_access_forum?
+          if redeeming_user
+            response[:message] = I18n.t("invite.existing_user_success")
+          end
+
           if user.guardian.can_see?(topic)
             response[:redirect_to] = path(topic.relative_url)
           else
@@ -424,6 +358,84 @@ class InvitesController < ApplicationController
 
   private
 
+  def show_invite(invite)
+    email = Email.obfuscate(invite.email)
+
+    # Show email if the user already authenticated their email
+    different_external_email = false
+
+    if session[:authentication]
+      auth_result = Auth::Result.from_session_data(session[:authentication], user: nil)
+      if invite.email == auth_result.email
+        email = invite.email
+      else
+        different_external_email = true
+      end
+    end
+
+    email_verified_by_link = invite.email_token.present? && params[:t] == invite.email_token
+
+    if email_verified_by_link
+      email = invite.email
+    end
+
+    hidden_email = email != invite.email
+
+    if hidden_email || invite.email.nil?
+      username = ""
+    else
+      username = UserNameSuggester.suggest(invite.email)
+    end
+
+    info = {
+      invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
+      email: email,
+      hidden_email: hidden_email,
+      username: username,
+      is_invite_link: invite.is_invite_link?,
+      email_verified_by_link: email_verified_by_link
+    }
+
+    if different_external_email
+      info[:different_external_email] = true
+    end
+
+    if staged_user = User.where(staged: true).with_email(invite.email).first
+      info[:username] = staged_user.username
+      info[:user_fields] = staged_user.user_fields
+    end
+
+    if current_user
+      info[:existing_user_id] = current_user.id
+      info[:existing_user_can_redeem] = invite.can_be_redeemed_by?(current_user)
+      info[:email] = current_user.email
+      info[:username] = current_user.username
+    end
+
+    store_preloaded("invite_info", MultiJson.dump(info))
+
+    secure_session["invite-key"] = invite.invite_key
+
+    render layout: 'application'
+  end
+
+  def show_irredeemable_invite(invite)
+    flash.now[:error] = \
+      if invite.blank?
+        I18n.t('invite.not_found', base_url: Discourse.base_url)
+      elsif invite.redeemed?
+        if invite.is_invite_link?
+          I18n.t('invite.not_found_template_link', site_name: SiteSetting.title, base_url: Discourse.base_url)
+        else
+          I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
+        end
+      elsif invite.expired?
+        I18n.t('invite.expired', base_url: Discourse.base_url)
+      end
+
+    render layout: 'no_ember'
+  end
+
   def ensure_invites_allowed
     if (!SiteSetting.enable_local_logins && Discourse.enabled_auth_providers.count == 0 && !SiteSetting.enable_discourse_connect)
       raise Discourse::NotFound
@@ -438,14 +450,6 @@ class InvitesController < ApplicationController
     end
   end
 
-  def ensure_not_logged_in
-    if current_user
-      flash[:error] = I18n.t("login.already_logged_in")
-      render layout: 'no_ember'
-      false
-    end
-  end
-
   def groups_can_see_topic?(groups, topic)
     if topic&.read_restricted_category?
       topic_groups = topic.category.groups
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 68d8a367a8..d05ba4351f 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -159,7 +159,7 @@ class SessionController < ApplicationController
 
         if SiteSetting.must_approve_users? && !user.approved?
           if invite.present? && user.invited_user.blank?
-            redeem_invitation(invite, sso)
+            redeem_invitation(invite, sso, user)
           end
 
           if SiteSetting.discourse_connect_not_approved_url.present?
@@ -173,7 +173,7 @@ class SessionController < ApplicationController
         # the user has not already redeemed an invite
         # (covers the same SSO user visiting an invite link)
         elsif invite.present? && user.invited_user.blank?
-          redeem_invitation(invite, sso)
+          redeem_invitation(invite, sso, user)
 
           # we directly call user.activate here instead of going
           # through the UserActivator path because we assume the account
@@ -772,14 +772,15 @@ class SessionController < ApplicationController
     invite
   end
 
-  def redeem_invitation(invite, sso)
+  def redeem_invitation(invite, sso, redeeming_user)
     InviteRedeemer.new(
       invite: invite,
       username: sso.username,
       name: sso.name,
       ip_address: request.remote_ip,
       session: session,
-      email: sso.email
+      email: sso.email,
+      redeeming_user: redeeming_user
     ).redeem
     secure_session["invite-key"] = nil
 
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 0907aaccbe..8cd7dbdd03 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -69,7 +69,7 @@ class EmailToken < ActiveRecord::Base
       user.create_reviewable if !skip_reviewable
       user.set_automatic_groups
       DiscourseEvent.trigger(:user_confirmed_email, user)
-      Invite.redeem_from_email(user.email) if scope == EmailToken.scopes[:signup]
+      Invite.redeem_for_existing_user(user) if scope == EmailToken.scopes[:signup]
 
       user.reload
     end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 4b0c92620e..917b486f29 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -90,6 +90,22 @@ class Invite < ActiveRecord::Base
     end
   end
 
+  def email_matches?(email)
+    email.downcase == self.email.downcase
+  end
+
+  def domain_matches?(email)
+    _, domain = email.split('@')
+    self.domain == domain
+  end
+
+  def can_be_redeemed_by?(user)
+    return false if !self.redeemable?
+    return true if self.email.blank? && self.domain.blank?
+    return true if self.email.present? && email_matches?(user.email)
+    self.domain.present? && domain_matches?(user.email)
+  end
+
   def expired?
     expires_at < Time.zone.now
   end
@@ -172,7 +188,17 @@ class Invite < ActiveRecord::Base
     invite.reload
   end
 
-  def redeem(email: nil, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil, session: nil, email_token: nil)
+  def redeem(
+    email: nil,
+    username: nil,
+    name: nil,
+    password: nil,
+    user_custom_fields: nil,
+    ip_address: nil,
+    session: nil,
+    email_token: nil,
+    redeeming_user: nil
+  )
     return if !redeemable?
 
     email = self.email if email.blank? && !is_invite_link?
@@ -186,14 +212,15 @@ class Invite < ActiveRecord::Base
       user_custom_fields: user_custom_fields,
       ip_address: ip_address,
       session: session,
-      email_token: email_token
+      email_token: email_token,
+      redeeming_user: redeeming_user
     ).redeem
   end
 
-  def self.redeem_from_email(email)
-    invite = Invite.find_by(email: Email.downcase(email))
+  def self.redeem_for_existing_user(user)
+    invite = Invite.find_by(email: Email.downcase(user.email))
     if invite.present? && invite.redeemable?
-      InviteRedeemer.new(invite: invite, email: invite.email).redeem
+      InviteRedeemer.new(invite: invite, redeeming_user: user).redeem
     end
     invite
   end
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index ed0a115f4b..ba823aaf51 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -1,6 +1,41 @@
 # frozen_string_literal: true
 
-InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_custom_fields, :ip_address, :session, :email_token, keyword_init: true) do
+class InviteRedeemer
+  attr_reader :invite,
+    :email,
+    :username,
+    :name,
+    :password,
+    :user_custom_fields,
+    :ip_address,
+    :session,
+    :email_token,
+    :redeeming_user
+
+  def initialize(
+    invite: nil,
+    email: nil,
+    username: nil,
+    name: nil,
+    password: nil,
+    user_custom_fields: nil,
+    ip_address: nil,
+    session: nil,
+    email_token: nil,
+    redeeming_user: nil)
+
+    @invite = invite
+    @email = email
+    @username = username
+    @name = name
+    @password = password
+    @user_custom_fields = user_custom_fields
+    @ip_address = ip_address
+    @session = session
+    @email_token = email_token
+    @redeeming_user = redeeming_user
+  end
+
   def redeem
     Invite.transaction do
       if can_redeem_invite? && mark_invite_redeemed
@@ -82,42 +117,64 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
   private
 
   def can_redeem_invite?
-    return false unless invite.redeemable?
+    return false if !invite.redeemable?
 
-    # Invite has already been redeemed
+    # Invite has already been redeemed by anyone.
     if !invite.is_invite_link? && InvitedUser.exists?(invite_id: invite.id)
       return false
     end
 
-    validate_invite_email!
+    # Email will not be present if we are claiming an invite link, which
+    # does not have an email or domain scope on the invitation.
+    if email.present? || redeeming_user.present?
+      email_to_check = redeeming_user&.email || email
 
-    existing_user = get_existing_user
+      if invite.email.present? && !invite.email_matches?(email_to_check)
+        raise ActiveRecord::RecordNotSaved.new(I18n.t('invite.not_matching_email'))
+      end
 
-    if existing_user.present? && InvitedUser.exists?(user_id: existing_user.id, invite_id: invite.id)
+      if invite.domain.present? && !invite.domain_matches?(email_to_check)
+        raise ActiveRecord::RecordNotSaved.new(I18n.t('invite.domain_not_allowed'))
+      end
+    end
+
+    # Anon user is trying to redeem an invitation, if an existing user already
+    # redeemed it then we cannot redeem now.
+    redeeming_user ||= User.where(admin: false, staged: false).find_by_email(email)
+    if redeeming_user.present? && InvitedUser.exists?(user_id: redeeming_user.id, invite_id: invite.id)
       return false
     end
 
     true
   end
 
-  def validate_invite_email!
-    return if email.blank?
-
-    if invite.email.present? && email.downcase != invite.email.downcase
-      raise ActiveRecord::RecordNotSaved.new(I18n.t('invite.not_matching_email'))
-    end
-
-    if invite.domain.present?
-      username, domain = email.split('@')
-
-      if domain.present? && invite.domain != domain
-        raise ActiveRecord::RecordNotSaved.new(I18n.t('invite.domain_not_allowed'))
-      end
-    end
-  end
-
   def invited_user
-    @invited_user ||= get_invited_user
+    return @invited_user if defined?(@invited_user)
+
+    # The redeeming user is an already logged in user or a user who is
+    # activating their account who is redeeming the invite,
+    # which is valid for existing users to be invited to topics or groups.
+    if redeeming_user.present?
+      @invited_user = redeeming_user
+      return @invited_user
+    end
+
+    # If there was no logged in user then we must attempt to create
+    # one based on the provided params.
+    invited_user ||= InviteRedeemer.create_user_from_invite(
+      email: email,
+      invite: invite,
+      username: username,
+      name: name,
+      password: password,
+      user_custom_fields: user_custom_fields,
+      ip_address: ip_address,
+      session: session,
+      email_token: email_token
+    )
+    invited_user.send_welcome_message = false
+    @invited_user = invited_user
+    @invited_user
   end
 
   def process_invitation
@@ -138,28 +195,6 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
     @invited_user_record.present?
   end
 
-  def get_invited_user
-    result = get_existing_user
-
-    result ||= InviteRedeemer.create_user_from_invite(
-      email: email,
-      invite: invite,
-      username: username,
-      name: name,
-      password: password,
-      user_custom_fields: user_custom_fields,
-      ip_address: ip_address,
-      session: session,
-      email_token: email_token
-    )
-    result.send_welcome_message = false
-    result
-  end
-
-  def get_existing_user
-    User.where(admin: false, staged: false).find_by_email(email)
-  end
-
   def add_to_private_topics_if_invited
     topic_ids = Topic.where(archetype: Archetype::private_message).includes(:invites).where(invites: { email: email }).pluck(:id)
     topic_ids.each do |id|
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2653d79eb3..fe77f335f8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2089,6 +2089,8 @@ en:
       success: "Your account has been created and you're now logged in."
       name_label: "Name"
       password_label: "Password"
+      existing_user_can_redeem: "Redeem your invitation to a topic or group."
+      existing_user_cannot_redeem: "This invitation cannot be redeemed. Please ask the person who invited you to send you a new invitation."
 
     password_reset:
       continue: "Continue to %{site_name}"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6e55cf5ed9..e853452a01 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -266,6 +266,7 @@ en:
     max_redemptions_allowed_one: "for email invites should be 1."
     redemption_count_less_than_max: "should be less than %{max_redemptions_allowed}."
     email_xor_domain: "Email and domain fields are not allowed at the same time"
+    existing_user_success: "Invite redeemed successfully"
 
   bulk_invite:
     file_should_be_csv: "The uploaded file should be of csv format."
diff --git a/db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb b/db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb
new file mode 100644
index 0000000000..e87a27e3b0
--- /dev/null
+++ b/db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class SecurityLogOutInviteRedemptionInvitedUsers < ActiveRecord::Migration[7.0]
+  def up
+    # 20220606061813 was added shortly before the vulnerability was introduced
+    vulnerable_since = DB.query_single("SELECT created_at FROM schema_migration_details WHERE version='20220606061813'")[0]
+
+    DB.exec(<<~SQL, vulnerable_since: vulnerable_since)
+      DELETE FROM user_auth_tokens
+      WHERE user_id IN (
+        SELECT DISTINCT user_id
+        FROM invited_users
+        JOIN users ON invited_users.user_id = users.id
+        WHERE invited_users.redeemed_at > :vulnerable_since
+      )
+    SQL
+
+    DB.exec(<<~SQL, vulnerable_since: vulnerable_since)
+      DELETE FROM user_api_keys
+      WHERE user_id IN (
+        SELECT DISTINCT user_id
+        FROM invited_users
+        JOIN users ON invited_users.user_id = users.id
+        WHERE invited_users.redeemed_at > :vulnerable_since
+      )
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index fc4c82244f..e944f45903 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -242,6 +242,40 @@ RSpec.describe InviteRedeemer do
       expect(invite.invited_users.first).to be_present
     end
 
+    it "raises an error if the email does not match the invite email" do
+      redeemer = InviteRedeemer.new(invite: invite, email: "blah@test.com", username: username, name: name)
+      expect { redeemer.redeem }.to raise_error(ActiveRecord::RecordNotSaved, I18n.t("invite.not_matching_email"))
+    end
+
+    context "when a redeeming user is passed in" do
+      fab!(:redeeming_user) { Fabricate(:user, email: "foobar@example.com") }
+
+      it "raises an error if the email does not match the invite email" do
+        redeeming_user.update!(email: "foo@bar.com")
+        redeemer = InviteRedeemer.new(invite: invite, redeeming_user: redeeming_user)
+        expect { redeemer.redeem }.to raise_error(ActiveRecord::RecordNotSaved, I18n.t("invite.not_matching_email"))
+      end
+    end
+
+    context 'with domain' do
+      fab!(:invite) { Fabricate(:invite, email: nil, domain: "test.com") }
+
+      it "raises an error if the email domain does not match the invite domain" do
+        redeemer = InviteRedeemer.new(invite: invite, email: "blah@somesite.com", username: username, name: name)
+        expect { redeemer.redeem }.to raise_error(ActiveRecord::RecordNotSaved, I18n.t("invite.domain_not_allowed"))
+      end
+
+      context "when a redeeming user is passed in" do
+        fab!(:redeeming_user) { Fabricate(:user, email: "foo@test.com") }
+
+        it "raises an error if the user's email domain does not match the invite domain" do
+          redeeming_user.update!(email: "foo@bar.com")
+          redeemer = InviteRedeemer.new(invite: invite, redeeming_user: redeeming_user)
+          expect { redeemer.redeem }.to raise_error(ActiveRecord::RecordNotSaved, I18n.t("invite.domain_not_allowed"))
+        end
+      end
+    end
+
     context 'with invite_link' do
       fab!(:invite_link) { Fabricate(:invite, email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required]) }
       let(:invite_redeemer) { InviteRedeemer.new(invite: invite_link, email: 'foo@example.com') }
@@ -257,7 +291,7 @@ RSpec.describe InviteRedeemer do
       end
 
       it "should not redeem the invite if InvitedUser record already exists for email" do
-        user = invite_redeemer.redeem
+        invite_redeemer.redeem
         invite_link.reload
 
         another_invite_redeemer = InviteRedeemer.new(invite: invite_link, email: 'foo@example.com')
@@ -266,14 +300,28 @@ RSpec.describe InviteRedeemer do
       end
 
       it "should redeem the invite if InvitedUser record does not exists for email" do
-        user = invite_redeemer.redeem
+        invite_redeemer.redeem
         invite_link.reload
 
         another_invite_redeemer = InviteRedeemer.new(invite: invite_link, email: 'bar@example.com')
         another_user = another_invite_redeemer.redeem
         expect(another_user.is_a?(User)).to eq(true)
       end
-    end
 
+      it "raises an error if the email is already being used by an existing user" do
+        Fabricate(:user, email: 'foo@example.com')
+        expect { invite_redeemer.redeem }.to raise_error(ActiveRecord::RecordInvalid, /Primary email has already been taken/)
+      end
+
+      context "when a redeeming user is passed in" do
+        fab!(:redeeming_user) { Fabricate(:user, email: 'foo@example.com') }
+
+        it "does not create a new user" do
+          expect do
+            InviteRedeemer.new(invite: invite_link, redeeming_user: redeeming_user).redeem
+          end.not_to change { User.count }
+        end
+      end
+    end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 2691659db3..0a1f9de9f3 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -338,38 +338,38 @@ RSpec.describe Invite do
     end
   end
 
-  describe '#redeem_from_email' do
+  describe '#redeem_for_existing_user' do
     fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
     fab!(:user) { Fabricate(:user, email: invite.email) }
 
     it 'redeems the invite from email' do
-      Invite.redeem_from_email(user.email)
+      Invite.redeem_for_existing_user(user)
       expect(invite.reload).to be_redeemed
     end
 
     it 'does not redeem the invite if email does not match' do
-      Invite.redeem_from_email('test2@example.com')
+      user.update!(email: 'test2@example.com')
+      Invite.redeem_for_existing_user(user)
       expect(invite.reload).not_to be_redeemed
     end
 
     it 'does not work with expired invites' do
       invite.update!(expires_at: 1.day.ago)
-      Invite.redeem_from_email(user.email)
+      Invite.redeem_for_existing_user(user)
       expect(invite).not_to be_redeemed
     end
 
     it 'does not work with deleted invites' do
       invite.trash!
-      Invite.redeem_from_email(user.email)
+      Invite.redeem_for_existing_user(user)
       expect(invite).not_to be_redeemed
     end
 
     it 'does not work with invalidated invites' do
       invite.update!(invalidated_at: 1.day.ago)
-      Invite.redeem_from_email(user.email)
+      Invite.redeem_for_existing_user(user)
       expect(invite).not_to be_redeemed
     end
-
   end
 
   describe 'scopes' do
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 01332a0b99..e450296d87 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -78,63 +78,68 @@ RSpec.describe InvitesController do
         sign_in(user)
       end
 
-      it "redeems the invite when user's email matches invite's email before redirecting to secured topic url" do
+      it "shows the accept invite page when user's email matches the invite email" do
         invite.update_columns(email: user.email)
-        group.add_owner(invite.invited_by)
 
-        secured_category = Fabricate(:category)
-        secured_category.permissions = { group.name => :full }
-        secured_category.save!
+        get "/invites/#{invite.invite_key}"
+        expect(response.status).to eq(200)
+        expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
+        expect(response.body).not_to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
 
-        topic = Fabricate(:topic, category: secured_category)
-        TopicInvite.create!(invite: invite, topic: topic)
-        InvitedGroup.create!(invite: invite, group: group)
-
-        expect do
-          get "/invites/#{invite.invite_key}"
-        end.to change { InvitedUser.exists?(invite: invite, user: user) }.to(true)
-
-        expect(response).to redirect_to(topic.url)
-        expect(user.reload.groups).to include(group)
-
-        expect(Notification.exists?(user: user, notification_type: Notification.types[:invited_to_topic], topic: topic))
-          .to eq(true)
-
-        expect(Notification.exists?(user: invite.invited_by, notification_type: Notification.types[:invitee_accepted]))
-          .to eq(true)
+        expect(response.body).to have_tag('div#data-preloaded') do |element|
+          json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
+          invite_info = JSON.parse(json['invite_info'])
+          expect(invite_info['username']).to eq(user.username)
+          expect(invite_info['email']).to eq(user.email)
+          expect(invite_info['existing_user_id']).to eq(user.id)
+          expect(invite_info['existing_user_can_redeem']).to eq(true)
+        end
       end
 
-      it "redeems the invite when user's email domain matches the domain an invite link is restricted to" do
+      it "shows the accept invite page when user's email domain matches the domain an invite link is restricted to" do
         invite.update!(email: nil, domain: 'discourse.org')
         user.update!(email: "someguy@discourse.org")
-        topic = Fabricate(:topic)
-        TopicInvite.create!(invite: invite, topic: topic)
-        group.add_owner(invite.invited_by)
-        InvitedGroup.create!(invite: invite, group: group)
 
-        expect do
-          get "/invites/#{invite.invite_key}"
-        end.to change { InvitedUser.exists?(invite: invite, user: user) }.to(true)
+        get "/invites/#{invite.invite_key}"
+        expect(response.status).to eq(200)
+        expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
+        expect(response.body).not_to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
 
-        expect(response).to redirect_to(topic.url)
-        expect(user.reload.groups).to include(group)
+        expect(response.body).to have_tag('div#data-preloaded') do |element|
+          json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
+          invite_info = JSON.parse(json['invite_info'])
+          expect(invite_info['username']).to eq(user.username)
+          expect(invite_info['email']).to eq(user.email)
+          expect(invite_info['existing_user_id']).to eq(user.id)
+          expect(invite_info['existing_user_can_redeem']).to eq(true)
+        end
       end
 
-      it "redirects to root if a logged in user tries to view an invite link restricted to a certain domain but user's email domain does not match" do
+      it "does not allow the user to accept the invite when their email domain does not match the domain of the invite" do
         user.update!(email: "someguy@discourse.com")
         invite.update!(email: nil, domain: 'discourse.org')
 
-        expect { get "/invites/#{invite.invite_key}" }.not_to change { InvitedUser.count }
+        get "/invites/#{invite.invite_key}"
+        expect(response.status).to eq(200)
 
-        expect(response).to redirect_to("/")
+        expect(response.body).to have_tag('div#data-preloaded') do |element|
+          json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
+          invite_info = JSON.parse(json['invite_info'])
+          expect(invite_info['existing_user_can_redeem']).to eq(false)
+        end
       end
 
-      it "redirects to root if a tries to view an invite meant for a specific email that is not the user's" do
+      it "does not allow the user to accept the invite when their email does not match the invite" do
         invite.update_columns(email: "notuseremail@discourse.org")
 
-        expect { get "/invites/#{invite.invite_key}" }.not_to change { InvitedUser.count }
+        get "/invites/#{invite.invite_key}"
+        expect(response.status).to eq(200)
 
-        expect(response).to redirect_to("/")
+        expect(response.body).to have_tag('div#data-preloaded') do |element|
+          json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
+          invite_info = JSON.parse(json['invite_info'])
+          expect(invite_info['existing_user_can_redeem']).to eq(false)
+        end
       end
     end
 
@@ -848,8 +853,9 @@ RSpec.describe InvitesController do
       fab!(:invite) { Fabricate(:invite, email: nil, emailed_status: Invite.emailed_status_types[:not_required]) }
 
       it 'sends an activation email and does not activate the user' do
-        expect { put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' } }
-          .not_to change { UserAuthToken.count }
+        expect {
+          put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+        }.not_to change { UserAuthToken.count }
 
         expect(response.status).to eq(200)
         expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
@@ -870,6 +876,24 @@ RSpec.describe InvitesController do
         expect(job_args['user_id']).to eq(invited_user.id)
         expect(EmailToken.hash_token(job_args['email_token'])).to eq(tokens.first.token_hash)
       end
+
+      it "does not automatically log in the user if their email matches an existing user's and shows an error" do
+        Fabricate(:user, email: 'test@example.com')
+        put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+        expect(session[:current_user_id]).to be_blank
+        expect(response.status).to eq(412)
+        expect(response.parsed_body['message']).to include("Primary email has already been taken")
+        expect(invite.reload.redemption_count).to eq(0)
+      end
+
+      it "does not automatically log in the user if their email matches an existing admin's and shows an error" do
+        Fabricate(:admin, email: 'test@example.com')
+        put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+        expect(session[:current_user_id]).to be_blank
+        expect(response.status).to eq(412)
+        expect(response.parsed_body['message']).to include("Primary email has already been taken")
+        expect(invite.reload.redemption_count).to eq(0)
+      end
     end
 
     context 'when new registrations are disabled' do
@@ -889,15 +913,75 @@ RSpec.describe InvitesController do
 
     context 'when user is already logged in' do
       fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
-      fab!(:user) { sign_in(Fabricate(:user)) }
+      fab!(:user) { Fabricate(:user, email: 'test@example.com') }
+      fab!(:group) { Fabricate(:group) }
 
-      it 'does not redeem the invite' do
+      before { sign_in(user) }
+
+      it 'redeems the invitation and creates the invite accepted notification' do
         put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
         expect(response.status).to eq(200)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
         invite.reload
-        expect(invite.invited_users).to be_blank
-        expect(invite.redeemed?).to be_falsey
-        expect(response.body).to include(I18n.t('login.already_logged_in', current_user: user.username))
+        expect(invite.invited_users.first.user).to eq(user)
+        expect(invite.redeemed?).to be_truthy
+        expect(
+          Notification.exists?(
+            user: invite.invited_by, notification_type: Notification.types[:invitee_accepted]
+          )
+        ).to eq(true)
+      end
+
+      it 'redirects to the first topic the user was invited to and creates the topic notification' do
+        topic = Fabricate(:topic)
+        TopicInvite.create!(invite: invite, topic: topic)
+        put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+        expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+      end
+
+      it "adds the user to the groups specified on the invite and allows them to access the secure topic" do
+        group.add_owner(invite.invited_by)
+        secured_category = Fabricate(:category)
+        secured_category.permissions = { group.name => :full }
+        secured_category.save!
+
+        topic = Fabricate(:topic, category: secured_category)
+        TopicInvite.create!(invite: invite, topic: topic)
+        InvitedGroup.create!(invite: invite, group: group)
+
+        put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
+        expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+        invite.reload
+        expect(invite.redeemed?).to be_truthy
+        expect(user.reload.groups).to include(group)
+        expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+      end
+
+      it "does not try to log in the user automatically" do
+        expect do
+          put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        end.not_to change { UserAuthToken.count }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
+      end
+
+      it "errors if the user's email doesn't match the invite email" do
+        user.update!(email: "blah@test.com")
+        put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        expect(response.status).to eq(412)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.not_matching_email"))
+      end
+
+      it "errors if the user's email domain doesn't match the invite domain" do
+        user.update!(email: "blah@test.com")
+        invite.update!(email: nil, domain: "example.com")
+        put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        expect(response.status).to eq(412)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.domain_not_allowed"))
       end
     end
 

From e3da085e316d7849f09f260d0dcb5e8973a1d50a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 1 Nov 2022 17:00:05 +0000
Subject: [PATCH 332/332] Version bump to v2.9.0.beta11 (#18822)

---
 lib/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.rb b/lib/version.rb
index 906748ccba..d3777983db 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -10,7 +10,7 @@ module Discourse
       MAJOR = 2
       MINOR = 9
       TINY  = 0
-      PRE   = 'beta10'
+      PRE   = 'beta11'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end