Merge branch 'main' into a-pnpm

# Conflicts: # app/assets/javascripts/bootstrap-json/package.json # app/assets/javascripts/dialog-holder/yarn.lock # app/assets/javascripts/discourse/package.json # app/assets/javascripts/package.json # app/assets/javascripts/yarn.lock # yarn.lock
2022-11-16 23:51:52 +01:00 · 2022-11-16 23:51:52 +01:00 · 6b6ae207b8
commit 6b6ae207b8
parent a31b572b79 bdf78dc5c1
162 changed files with 9690 additions and 6174 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -366,7 +366,7 @@ GEM
    redis (4.7.1)
    redis-namespace (1.9.0)
      redis (>= 4)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
    request_store (1.5.1)
      rack (>= 1.4)
    rexml (3.2.5)
@ -402,7 +402,7 @@ GEM
    rspec-support (3.12.0)
    rss (0.2.9)
      rexml
-    rswag-specs (2.7.0)
+    rswag-specs (2.8.0)
      activesupport (>= 3.1, < 7.1)
      json-schema (>= 2.2, < 4.0)
      railties (>= 3.1, < 7.1)
--- a/app/assets/javascripts/bootstrap-json/index.js
+++ b/app/assets/javascripts/bootstrap-json/index.js
@ -1,7 +1,6 @@
 "use strict";

 const express = require("express");
-const fetch = require("node-fetch");
 const { encode } = require("html-entities");
 const cleanBaseURL = require("clean-base-url");
 const path = require("path");
@ -258,6 +257,7 @@ async function buildFromBootstrap(proxy, baseURL, req, response, preload) {
      url.searchParams.append("preview_theme_id", reqUrlPreviewThemeId);
    }

+    const { default: fetch } = await import("node-fetch");
    const res = await fetch(url, { headers: req.headers });
    const json = await res.json();

@ -310,6 +310,7 @@ async function handleRequest(proxy, baseURL, req, res) {
    req.headers["X-Discourse-Ember-CLI"] = "true";
  }

+  const { default: fetch } = await import("node-fetch");
  const response = await fetch(url, {
    method: req.method,
    body: /GET|HEAD/.test(req.method) ? null : req.body,
--- a/app/assets/javascripts/bootstrap-json/package.json
+++ b/app/assets/javascripts/bootstrap-json/package.json
@ -23,6 +23,6 @@
    "express": "^4.18.2",
    "html-entities": "^2.3.3",
    "jsdom": "^20.0.2",
-    "node-fetch": "^2.6.6"
+    "node-fetch": "^3.3.0"
  }
 }
--- 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
--- a/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.js
--- a/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js
--- a/app/assets/javascripts/discourse/lib/dialog-holder/app/components/dialog-holder.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/app/components/dialog-holder.js
--- a/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js
--- a/app/assets/javascripts/discourse/lib/dialog-holder/index.js
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/index.js
--- a/app/assets/javascripts/dialog-holder/package.json
+++ b/app/assets/javascripts/dialog-holder/package.json
@ -0,0 +1,24 @@
+{
+  "name": "dialog-holder",
+  "version": "1.0.0",
+  "description": "TODO",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [
+    "ember-addon"
+  ],
+  "dependencies": {
+    "a11y-dialog": "7.5.2",
+    "ember-auto-import": "^2.4.3",
+    "ember-cli-babel": "^7.26.10",
+    "ember-cli-htmlbars": "^6.1.1"
+  },
+  "devDependencies": {
+    "webpack": "^5.75.0"
+  },
+  "engines": {
+    "node": "16.* || >= 18",
+    "npm": "please-use-yarn",
+    "yarn": ">= 1.21.1"
+  }
+}
--- a/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
@ -60,18 +60,37 @@ export function registerDeprecationHandler(callback) {

 /**
 * Silence one or more deprecations while running `callback`
- * @async
 * @param {(string|string[])} deprecationIds A single id, or an array of ids, of deprecations to silence
- * @param {function} callback The function to call while deprecations are silenced. Can be asynchronous.
+ * @param {function} callback The function to call while deprecations are silenced.
 */
-export async function withSilencedDeprecations(deprecationIds, callback) {
+export function withSilencedDeprecations(deprecationIds, callback) {
  const idArray = [].concat(deprecationIds);
-  let result;
  try {
    idArray.forEach((id) => disabledDeprecations.add(id));
-    result = callback();
+    const result = callback();
+    if (result instanceof Promise) {
+      throw new Error(
+        "withSilencedDeprecations callback returned a promise. Use withSilencedDeprecationsAsync instead."
+      );
+    }
+    return result;
+  } finally {
+    idArray.forEach((id) => disabledDeprecations.delete(id));
+  }
+}
+
+/**
+ * Silence one or more deprecations while running an async `callback`
+ * @async
+ * @param {(string|string[])} deprecationIds A single id, or an array of ids, of deprecations to silence
+ * @param {function} callback The asynchronous function to call while deprecations are silenced.
+ */
+export async function withSilencedDeprecationsAsync(deprecationIds, callback) {
+  const idArray = [].concat(deprecationIds);
+  try {
+    idArray.forEach((id) => disabledDeprecations.add(id));
+    return await callback();
  } finally {
    idArray.forEach((id) => disabledDeprecations.delete(id));
-    return result;
  }
 }
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@ -238,43 +238,6 @@ const SiteHeaderComponent = MountWidget.extend(
        this.currentUser.on("status-changed", this, "queueRerender");
      }

-      if (!this.siteSettings.enable_user_tips) {
-        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,
-          });
-        }
-      }
-
      const header = document.querySelector("header.d-header");
      this._itsatrap = new ItsATrap(header);
      const dirs = this.currentUser?.redesigned_user_menu_enabled
@ -365,8 +328,6 @@ const SiteHeaderComponent = MountWidget.extend(

      this._itsatrap?.destroy();
      this._itsatrap = null;
-
-      document.removeEventListener("click", this._dismissFirstNotification);
    },

    buildArgs() {
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@ -53,12 +53,13 @@ export default TextField.extend({
    next(() => this.onChange(this.value));
  },

-  @discourseComputed
-  dir() {
+  get dir() {
    if (this.siteSettings.support_mixed_text_direction) {
-      let val = this.value;
-      if (val) {
-        return isRTL(val) ? "rtl" : "ltr";
+      const val = this.get("value");
+      if (val && isRTL(val)) {
+        return "rtl";
+      } else if (val && isLTR(val)) {
+        return "ltr";
      } else {
        return siteDir();
      }
@ -70,21 +71,6 @@ export default TextField.extend({
    cancel(this._timer);
  },

-  keyUp(event) {
-    this._super(event);
-
-    if (this.siteSettings.support_mixed_text_direction) {
-      let val = this.value;
-      if (isRTL(val)) {
-        this.set("dir", "rtl");
-      } else if (isLTR(val)) {
-        this.set("dir", "ltr");
-      } else {
-        this.set("dir", siteDir());
-      }
-    }
-  },
-
  @discourseComputed("placeholderKey")
  placeholder: {
    get() {
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@ -611,7 +611,7 @@ export default Controller.extend(bufferedProperty("model"), {

    // Post related methods
    replyToPost(post) {
-      if (this.currentUser) {
+      if (this.currentUser && this.siteSettings.enable_user_tips) {
        this.currentUser.hideUserTipForever("post_menu");
      }

--- a/app/assets/javascripts/discourse/app/lib/public-js-versions.js
+++ b/app/assets/javascripts/discourse/app/lib/public-js-versions.js
@ -10,5 +10,5 @@ export const PUBLIC_JS_VERSIONS = {
  "diffhtml.min.js": "diffhtml/1.0.0-beta.20/diffhtml.min.js",
  "jquery.magnific-popup.min.js":
    "magnific-popup/1.1.0/jquery.magnific-popup.min.js",
-  "pikaday.js": "pikaday/1.8.0/pikaday.js",
+  "pikaday.js": "pikaday/1.8.2/pikaday.js",
 };
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@ -449,11 +449,13 @@ const User = RestModel.extend({
      .then((result) => {
        this.set("bio_excerpt", result.user.bio_excerpt);
        const userProps = getProperties(
-          this.user_option,
+          result.user.user_option || this.user_option,
          "enable_quoting",
          "enable_defer",
          "external_links_in_new_tab",
-          "dynamic_favicon"
+          "dynamic_favicon",
+          "seen_popups",
+          "skip_new_user_tips"
        );
        User.current()?.setProperties(userProps);
        this.setProperties(updatedState);
@ -1171,11 +1173,17 @@ const User = RestModel.extend({
    // Hide any shown user tips.
    let seenUserTips = this.seen_popups || [];
    if (userTipId) {
-      hideUserTip(userTipId);
-      if (!seenUserTips.includes(userTips[userTipId])) {
-        seenUserTips.push(userTips[userTipId]);
+      if (seenUserTips.includes(userTips[userTipId])) {
+        return;
      }
+
+      hideUserTip(userTipId);
+      seenUserTips.push(userTips[userTipId]);
    } else {
+      if (seenUserTips.includes(-1)) {
+        return;
+      }
+
      hideAllUserTips();
      seenUserTips = [-1];
    }
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@ -1,7 +1,6 @@
-import DiscourseURL, { userPath } from "discourse/lib/url";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
-import { ajax } from "discourse/lib/ajax";
 import { avatarImg } from "discourse/widgets/post";
 import { createWidget } from "discourse/widgets/widget";
 import getURL from "discourse-common/lib/get-url";
@ -88,11 +87,7 @@ createWidget("header-notifications", {
        const count = unread + reviewables;
        if (count > 0) {
          if (this._shouldHighlightAvatar()) {
-            if (this.siteSettings.enable_user_tips) {
-              contents.push(h("span.ring"));
-            } else {
-              this._addAvatarHighlight(contents);
-            }
+            contents.push(h("span.ring"));
          }

          contents.push(
@ -124,11 +119,7 @@ createWidget("header-notifications", {
        const unreadHighPriority = user.unread_high_priority_notifications;
        if (!!unreadHighPriority) {
          if (this._shouldHighlightAvatar()) {
-            if (this.siteSettings.enable_user_tips) {
-              contents.push(h("span.ring"));
-            } else {
-              this._addAvatarHighlight(contents);
-            }
+            contents.push(h("span.ring"));
          }

          // add the counter for the unread high priority
@ -155,52 +146,12 @@ createWidget("header-notifications", {
    return (
      !user.read_first_notification &&
      !user.enforcedSecondFactor &&
-      !attrs.active &&
-      attrs.ringBackdrop
-    );
-  },
-
-  _addAvatarHighlight(contents) {
-    contents.push(h("span.ring"));
-    contents.push(h("span.ring-backdrop-spotlight"));
-    contents.push(
-      h(
-        "span.ring-backdrop",
-        {},
-        h("h1.ring-first-notification", {}, [
-          h(
-            "span",
-            { className: "first-notification" },
-            I18n.t("user.first_notification")
-          ),
-          h("span", { className: "read-later" }, [
-            this.attach("link", {
-              action: "readLater",
-              className: "read-later-link",
-              label: "user.skip_new_user_tips.read_later",
-            }),
-          ]),
-          h("span", {}, [
-            I18n.t("user.skip_new_user_tips.not_first_time"),
-            " ",
-            this.attach("link", {
-              action: "skipNewUserTips",
-              className: "skip-new-user-tips",
-              label: "user.skip_new_user_tips.skip_link",
-              title: "user.skip_new_user_tips.description",
-            }),
-          ]),
-        ])
-      )
+      !attrs.active
    );
  },

  didRenderWidget() {
-    if (
-      !this.currentUser ||
-      !this.siteSettings.enable_user_tips ||
-      !this._shouldHighlightAvatar()
-    ) {
+    if (!this.currentUser || !this._shouldHighlightAvatar()) {
      return;
    }

@ -363,7 +314,6 @@ createWidget("header-icons", {
        this.attach("user-dropdown", {
          active: attrs.userVisible,
          action: "toggleUserMenu",
-          ringBackdrop: attrs.ringBackdrop,
          user: attrs.user,
        })
      );
@ -485,7 +435,6 @@ export default createWidget("header", {
      searchVisible: false,
      hamburgerVisible: false,
      userVisible: false,
-      ringBackdrop: true,
      inTopicContext: false,
    };

@ -508,7 +457,6 @@ export default createWidget("header", {
        hamburgerVisible: state.hamburgerVisible,
        userVisible: state.userVisible,
        searchVisible: state.searchVisible,
-        ringBackdrop: state.ringBackdrop,
        flagCount: attrs.flagCount,
        user: this.currentUser,
        sidebarEnabled: attrs.sidebarEnabled,
@ -631,10 +579,6 @@ export default createWidget("header", {
  },

  toggleUserMenu() {
-    if (this.currentUser.get("read_first_notification")) {
-      this.state.ringBackdrop = false;
-    }
-
    this.state.userVisible = !this.state.userVisible;
    this.toggleBodyScrolling(this.state.userVisible);

@ -731,43 +675,6 @@ export default createWidget("header", {
    }
  },

-  headerDismissFirstNotificationMask() {
-    // Dismiss notifications
-    if (document.body.classList.contains("unread-first-notification")) {
-      document.body.classList.remove("unread-first-notification");
-    }
-    this.store
-      .findStale(
-        "notification",
-        {
-          recent: true,
-          silent: this.get("currentUser.enforcedSecondFactor"),
-          limit: 5,
-        },
-        { cacheKey: "recent-notifications" }
-      )
-      .refresh();
-    // Update UI
-    this.state.ringBackdrop = false;
-    this.scheduleRerender();
-  },
-
-  readLater() {
-    this.headerDismissFirstNotificationMask();
-  },
-
-  skipNewUserTips() {
-    this.headerDismissFirstNotificationMask();
-    ajax(userPath(this.currentUser.username_lower), {
-      type: "PUT",
-      data: {
-        skip_new_user_tips: true,
-      },
-    }).then(() => {
-      this.currentUser.set("skip_new_user_tips", true);
-    });
-  },
-
  headerKeyboardTrigger(msg) {
    switch (msg.type) {
      case "search":
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@ -711,7 +711,7 @@ export default createWidget("post-menu", {
  },

  showMoreActions() {
-    if (this.currentUser) {
+    if (this.currentUser && this.siteSettings.enable_user_tips) {
      this.currentUser.hideUserTipForever("post_menu");
    }

@ -734,7 +734,9 @@ export default createWidget("post-menu", {
      keyValueStore &&
        keyValueStore.set({ key: "likedPostId", value: attrs.id });
      return this.sendWidgetAction("showLogin");
-    } else {
+    }
+
+    if (this.currentUser && this.siteSettings.enable_user_tips) {
      this.currentUser.hideUserTipForever("post_menu");
    }

--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@ -594,7 +594,7 @@ createWidget("post-contents", {
  },

  share() {
-    if (this.currentUser) {
+    if (this.currentUser && this.siteSettings.enable_user_tips) {
      this.currentUser.hideUserTipForever("post_menu");
    }

--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@ -53,6 +53,10 @@ const DEFAULT_QUICK_TIPS = [
    label: I18n.t("search.tips.full_search_key", { modifier: "Ctrl" }),
    description: I18n.t("search.tips.full_search"),
  },
+  {
+    label: "@me",
+    description: I18n.t("search.tips.me"),
+  },
 ];

 let QUICK_TIPS = [];
@ -90,6 +94,12 @@ function createSearchResult({ type, linkField, builder }) {
  return createWidget(`search-result-${type}`, {
    tagName: "ul.list",

+    buildAttributes() {
+      return {
+        "aria-label": `${type} ${I18n.t("search.results")}`,
+      };
+    },
+
    html(attrs) {
      return attrs.results.map((r) => {
        let searchResultId;
@ -640,7 +650,13 @@ createWidget("search-menu-assistant-item", {
    const attributes = {};
    attributes.href = "#";

-    let content = [iconNode(attrs.icon || "search")];
+    let content = [
+      h(
+        "span",
+        { attributes: { "aria-label": I18n.t("search.title") } },
+        iconNode(attrs.icon || "search")
+      ),
+    ];

    if (prefix) {
      content.push(h("span.search-item-prefix", `${prefix} `));
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@ -193,6 +193,12 @@ export default createWidget("search-menu", {
  services: ["search"],
  searchData,

+  buildAttributes() {
+    return {
+      "aria-live": "polite",
+    };
+  },
+
  buildKey: () => "search-menu",

  defaultState(attrs) {
--- a/app/assets/javascripts/discourse/lib/dialog-holder/package.json
+++ b/app/assets/javascripts/discourse/lib/dialog-holder/package.json
@ -1,15 +0,0 @@
-{
-  "name": "dialog-holder",
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "a11y-dialog": "7.5.0",
-    "ember-auto-import": "^2.4.2",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.0"
-  },
-  "devDependencies": {
-    "webpack": "^5.73.0"
-  }
-}
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@ -42,6 +42,7 @@
    "bootstrap-json": "workspace:*",
    "broccoli-asset-rev": "^3.0.0",
    "deepmerge": "^4.2.2",
+    "dialog-holder": "workspace:*",
    "discourse-common": "workspace:*",
    "discourse-ensure-deprecation-order": "workspace:*",
    "discourse-hbr": "workspace:*",
@ -70,7 +71,7 @@
    "ember-rfc176-data": "^0.3.17",
    "ember-source": "~3.28.10",
    "ember-test-selectors": "^6.0.0",
-    "eslint": "^8.26.0",
+    "eslint": "^8.27.0",
    "eslint-plugin-qunit": "^7.3.2",
    "handlebars": "^4.7.7",
    "html-entities": "^2.3.3",
@ -80,7 +81,6 @@
    "markdown-it": "^13.0.1",
    "message-bus-client": "^4.2.0",
    "messageformat": "0.1.5",
-    "node-fetch": "^2.6.7",
    "pretender": "^3.4.7",
    "pretty-text": "workspace:*",
    "qunit": "^2.19.3",
@ -102,11 +102,6 @@
  "ember": {
    "edition": "default"
  },
-  "ember-addon": {
-    "paths": [
-      "lib/dialog-holder"
-    ]
-  },
  "devDependencies": {
    "ember-cached-decorator-polyfill": "^1.0.1",
    "ember-cli-deprecation-workflow": "^2.1.0",
--- a/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js
@ -12,8 +12,6 @@ acceptance("User Tips - first_notification", function (needs) {
  needs.hooks.afterEach(() => hideAllUserTips());

  test("Shows first notification user tip", async function (assert) {
-    this.siteSettings.enable_user_tips = true;
-
    await visit("/t/internationalization-localization/280");
    assert.equal(
      query(".user-tip-title").textContent.trim(),
--- a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
@ -7,8 +7,7 @@ import {
  triggerKeyEvent,
  waitUntil,
 } from "@ember/test-helpers";
-import { count, exists, query } from "discourse/tests/helpers/qunit-helpers";
-import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";

 module("Integration | Component | site-header", function (hooks) {
@ -19,43 +18,6 @@ module("Integration | Component | site-header", function (hooks) {
    this.currentUser.set("read_first_notification", false);
  });

-  test("first notification mask", async function (assert) {
-    await render(hbs`<SiteHeader />`);
-
-    assert.strictEqual(
-      count(".ring-backdrop"),
-      1,
-      "there is the first notification mask"
-    );
-
-    // Click anywhere
-    await click("header.d-header");
-
-    assert.ok(
-      !exists(".ring-backdrop"),
-      "it hides the first notification mask"
-    );
-  });
-
-  test("do not call authenticated endpoints as anonymous", async function (assert) {
-    this.owner.unregister("service:current-user");
-
-    await render(hbs`<SiteHeader />`);
-
-    assert.ok(
-      !exists(".ring-backdrop"),
-      "there is no first notification mask for anonymous users"
-    );
-
-    pretender.get("/notifications", () => {
-      assert.ok(false, "it should not try to refresh notifications");
-      return response(403, {});
-    });
-
-    // Click anywhere
-    await click("header.d-header");
-  });
-
  test("displaying unread and reviewable notifications count when user's notifications and reviewables count are updated", async function (assert) {
    this.currentUser.set("all_unread_notifications_count", 1);
    this.currentUser.set("redesigned_user_menu_enabled", true);
@ -83,22 +45,6 @@ module("Integration | Component | site-header", function (hooks) {
    assert.strictEqual(unreadBadge.textContent, "8");
  });

-  test("user avatar is highlighted when the user receives the first notification", async function (assert) {
-    this.currentUser.set("all_unread_notifications_count", 1);
-    this.currentUser.set("redesigned_user_menu_enabled", true);
-    this.currentUser.set("read_first_notification", false);
-    await render(hbs`<SiteHeader />`);
-    assert.ok(exists(".ring-first-notification"));
-  });
-
-  test("user avatar is not highlighted when the user receives notifications beyond the first one", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
-    this.currentUser.set("all_unread_notifications_count", 1);
-    this.currentUser.set("read_first_notification", true);
-    await render(hbs`<SiteHeader />`);
-    assert.ok(!exists(".ring-first-notification"));
-  });
-
  test("hamburger menu icon shows pending reviewables count", async function (assert) {
    this.currentUser.set("reviewable_count", 1);
    await render(hbs`<SiteHeader />`);
--- a/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js
@ -40,6 +40,20 @@ module("Integration | Component | text-field", function (hooks) {
    assert.strictEqual(query("input").getAttribute("dir"), "ltr");
  });

+  test("updates the dir attribute when value changes", async function (assert) {
+    this.siteSettings.support_mixed_text_direction = true;
+
+    await render(
+      hbs`<TextField id="mytextfield" @value="This is a ltr title" />`
+    );
+
+    assert.strictEqual(query("input").getAttribute("dir"), "ltr");
+
+    await fillIn("#mytextfield", "זהו שם עברי עם מקום עברי");
+
+    assert.strictEqual(query("input").getAttribute("dir"), "rtl");
+  });
+
  test("supports onChange", async function (assert) {
    this.called = false;
    this.newValue = null;
--- a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { render } from "@ember/test-helpers";
 import { query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
-import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
+import { withSilencedDeprecationsAsync } from "discourse-common/lib/deprecated";

 function paste(element, text) {
  let e = new Event("paste");
@ -17,7 +17,7 @@ module("Integration | Component | user-selector", function (hooks) {
  test("pasting a list of usernames", async function (assert) {
    this.set("usernames", "evil,trout");

-    await withSilencedDeprecations(
+    await withSilencedDeprecationsAsync(
      "discourse.user-selector-component",
      async () => {
        await render(
@ -51,7 +51,7 @@ module("Integration | Component | user-selector", function (hooks) {
    this.set("usernames", "mark");
    this.set("excludedUsernames", ["jeff", "sam", "robin"]);

-    await withSilencedDeprecations(
+    await withSilencedDeprecationsAsync(
      "discourse.user-selector-component",
      async () => {
        await render(
--- a/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
@ -1,6 +1,7 @@
 import {
  default as deprecated,
  withSilencedDeprecations,
+  withSilencedDeprecationsAsync,
 } from "discourse-common/lib/deprecated";
 import DeprecationCounter from "discourse/tests/helpers/deprecation-counter";
 import { module, test } from "qunit";
@ -175,4 +176,33 @@ module("Unit | Utility | deprecated", function (hooks) {
      "counter is not incremented"
    );
  });
+
+  test("can silence deprecations with async callback in tests", async function (assert) {
+    await withSilencedDeprecationsAsync("discourse.one", async () => {
+      await Promise.resolve();
+      deprecated("message", { id: "discourse.one" });
+    });
+    assert.strictEqual(
+      this.warnStub.callCount,
+      0,
+      "console.warn is not called"
+    );
+    assert.strictEqual(
+      this.counterStub.callCount,
+      0,
+      "counter is not incremented"
+    );
+
+    deprecated("message", { id: "discourse.one" });
+    assert.strictEqual(
+      this.warnStub.callCount,
+      1,
+      "console.warn is called outside the silenced function"
+    );
+    assert.strictEqual(
+      this.counterStub.callCount,
+      1,
+      "counter is incremented outside the silenced function"
+    );
+  });
 });
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@ -219,7 +219,7 @@ input {
    color: var(--primary);
    background-color: var(--secondary);
    border: 1px solid var(--primary-medium);
-    border-radius: 0;
+    border-radius: var(--d-input-border-radius);
    &:focus {
      @include default-focus;
    }
@ -505,56 +505,6 @@ table {
  }
 }

-.ring-backdrop-spotlight {
-  position: absolute;
-  width: 80px;
-  height: 80px;
-  top: -18px;
-  right: -18px;
-  background-image: radial-gradient(
-    40px at 50% 50%,
-    rgba(255, 255, 255, 0.15) 95%,
-    rgba(var(--always-black-rgb), 0.65) 100%
-  );
-}
-
-.ring-backdrop {
-  position: absolute;
-  width: 80px;
-  height: 80px;
-  top: -18px !important;
-  right: -18px !important;
-  box-shadow: 0 0 0 9999px rgba(var(--always-black-rgb), 0.65);
-  z-index: z("modal", "overlay");
-}
-
-.ring-first-notification {
-  position: absolute;
-  text-align: left;
-  right: 70px;
-  top: 60px;
-  width: 230px;
-  line-height: var(--line-height-medium);
-
-  .first-notification,
-  .read-later {
-    display: block;
-    margin-bottom: 36px;
-  }
-
-  .skip-new-user-tips,
-  .read-later-link {
-    font-size: var(--font-down-1);
-    text-decoration: underline;
-  }
-
-  &,
-  .skip-new-user-tips,
-  .read-later-link {
-    color: #eee;
-  }
-}
-
 .ring {
  $gradient-start: transparent;
  $gradient-end: #090;
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@ -158,7 +158,6 @@ body.invite-page {
      input,
      .select-kit-header {
        padding: 0.75em 0.77em;
-        border-radius: 0.25em;
        min-width: 250px;
        box-shadow: none;
        margin-bottom: 0.25em;
@ -186,7 +185,6 @@ body.invite-page {
        left: 1em;
        top: 10px;
        box-shadow: 0 0 0 0px rgba(var(--tertiary-rgb), 0);
-        border-radius: 0.25em;
        transition: 0.2s ease all;
      }
      .user-field.dropdown label.control-label {
@ -235,7 +233,6 @@ body.invite-page {
      input {
        width: 100%;
        padding: 0.75em 0.5em;
-        border-radius: 0.25em;
        min-width: 250px;
        box-shadow: none;
        margin-bottom: 2em;
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@ -21,6 +21,7 @@
  font-weight: normal;
  color: $text-color;
  background: $bg-color;
+  border-radius: var(--d-button-border-radius);
  cursor: pointer;
  transition: all 0.25s;
  .d-icon {
@ -178,6 +179,7 @@
  color: #000;
  background: #fff;
  border: 1px solid transparent;
+  border-radius: var(--d-border-radius);
  &:hover,
  &:focus {
    box-shadow: shadow("card");
@ -340,6 +342,7 @@
 }

 .btn-mini-toggle {
+  border-radius: var(--d-border-radius);
  padding: 0.4em 0.467em;
  .d-icon {
    color: var(--primary-high);
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@ -31,6 +31,7 @@
    > a,
    button {
      border: none;
+      border-radius: var(--d-nav-pill-border-radius);
      padding: 6px 12px;
      color: var(--primary);
      font-size: var(--font-up-1);
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@ -25,6 +25,7 @@
  background-color: var(--secondary);
  position: relative;
  border: 1px solid var(--primary-medium);
+  border-radius: var(--d-input-border-radius);
  min-height: 0;

  textarea {
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@ -18,6 +18,10 @@ $reply-area-max-width: 1475px !default;
  --topic-body-width: #{$topic-body-width};
  --topic-body-width-padding: #{$topic-body-width-padding};
  --topic-avatar-width: #{$topic-avatar-width};
+  --d-border-radius: initial;
+  --d-nav-pill-border-radius: var(--d-border-radius);
+  --d-button-border-radius: var(--d-border-radius);
+  --d-input-border-radius: var(--d-border-radius);
 }

 $d-sidebar-width: 16em !default;
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@ -74,6 +74,7 @@
    display: flex;
    align-items: stretch;
    &:not(.btn) {
+      border-radius: var(--d-input-border-radius);
      padding-left: 0.5em;
      padding-right: 0.5em;
    }
--- a/app/assets/stylesheets/mobile/ring.scss
+++ b/app/assets/stylesheets/mobile/ring.scss
@ -1,7 +1,3 @@
 .ring {
  top: -7px !important;
 }
-
-.ring-first-notification {
-  top: 40px;
-}
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@ -50,6 +50,7 @@
      margin-right: 0;
      font-size: var(--font-down-1);
      border: 1px solid var(--primary-medium);
+      border-radius: var(--d-input-border-radius);
    }
    > li > a {
      line-height: var(--line-height-large);
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1966,6 +1966,7 @@ class UsersController < ApplicationController
    end

    if SiteSetting.enable_user_status
+      permitted << :status
      permitted << { status: [:emoji, :description, :ends_at] }
    end

--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@ -134,6 +134,16 @@ class ColorScheme < ActiveRecord::Base
      "primary_medium" => "A3A4AA",
      "primary_high" => "CCCCCF",
      "primary" => 'f2f2f2',
+      "primary-50" => 'F5F5F5',
+      "primary-100" => 'DEDFE0',
+      "primary-200" => 'C7C7C7',
+      "primary-300" => 'B6B7BC',
+      "primary-400" => 'A2A3A9',
+      "primary-500" => '8D8F96',
+      "primary-600" => '7A7C84',
+      "primary-700" => '666972',
+      "primary-800" => '535460',
+      "primary-900" => '3F414E',
      "secondary_low" => "CCCCCF",
      "secondary_medium" => "91939A",
      "secondary_high" => "6A6C76",
@ -167,6 +177,16 @@ class ColorScheme < ActiveRecord::Base
      "primary_medium" => "7E918C",
      "primary_high" => "4C6869",
      "primary" => '002B36',
+      "primary-50" => 'F0EBDA',
+      "primary-100" => 'DAD8CA',
+      "primary-200" => 'B2B9B3',
+      "primary-300" => '839496',
+      "primary-400" => '76898C',
+      "primary-500" => '697F83',
+      "primary-600" => '627A7E',
+      "primary-700" => '556F74',
+      "primary-800" => '415F66',
+      "primary-900" => '21454E',
      "secondary_low" => "325458",
      "secondary_medium" => "6C8280",
      "secondary_high" => "97A59D",
@ -199,6 +219,16 @@ class ColorScheme < ActiveRecord::Base
      "primary_medium" => "97A59D",
      "primary_high" => "B5BDB1",
      "primary" => 'FCF6E1',
+      "primary-50" => '21454E',
+      "primary-100" => '415F66',
+      "primary-200" => '556F74',
+      "primary-300" => '627A7E',
+      "primary-400" => '697F83',
+      "primary-500" => '76898C',
+      "primary-600" => '839496',
+      "primary-700" => 'B2B9B3',
+      "primary-800" => 'DAD8CA',
+      "primary-900" => 'F0EBDA',
      "secondary_low" => "B5BDB1",
      "secondary_medium" => "81938D",
      "secondary_high" => "4E6A6B",
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@ -216,7 +216,7 @@ class UserUpdater
      end

      if SiteSetting.enable_user_status?
-        update_user_status(attributes[:status])
+        update_user_status(attributes[:status]) if attributes.has_key?(:status)
      end

      name_changed = user.name_changed?
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@ -422,7 +422,6 @@ ar:
      like_count: "تسجيلات الإعجاب"
      topic_count: "الموضوعات"
      post_count: "المنشورات"
-      user_count: "المستخدمون"
      active_user_count: "المستخدمون النشطون"
      contact: "تواصل معنا"
      contact_info: "في حال حدوث مشكلة خطيرة أو أمر عاجل يؤثر على الموقع، يُرجى مراسلتنا على %{contact_info}."
@ -479,7 +478,6 @@ ar:
      remove_confirmation: "هل تريد بالتأكيد حذف هذه المسودة؟"
      new_topic: "مسودة موضوع جديد"
      new_private_message: "مسودة رسالة خاصة جديدة"
-      topic_reply: "مسودة الرد"
      abandon:
        confirm: "لديك مسودة محفوظة لهذا الموضوع. ماذا تريد أن تفعل بها؟"
        yes_value: "تجاهل"
@ -1315,7 +1313,6 @@ ar:
        not_first_time: "ليست المرة الأولى لك؟"
        skip_link: "تخطي هذه النصائح"
        read_later: "سأقرأها لاحقًا."
-      reset_seen_popups: "عرض نصائح إعداد المستخدم مرة أخرى"
      theme_default_on_all_devices: "جعل هذه السمة الافتراضية على كل أجهزتي"
      color_scheme_default_on_all_devices: "ضبط نظام (أنظمة) الألوان الافتراضي على جميع أجهزتي"
      color_scheme: "نظام الألوان"
@ -1956,15 +1953,6 @@ ar:
      set_custom_status: "تعيين حالة مخصَّصة"
      what_are_you_doing: "ماذا تفعل؟"
      remove_status: "إزالة الحالة"
-    popup:
-      primary: "فهمت!"
-      secondary: "عدم عرض هذه النصائح لي"
-      first_notification:
-        title: "أول إشعار لك!"
-        content: "تُستخدَم الإشعارات لإبقائك على اطِّلاع بما يحدث في المجتمع."
-      topic_timeline:
-        title: "الجدول الزمني للموضوع"
-        content: "مرِّر عبر المنشور بسرعة باستخدام الجدول الزمني للموضوع."
    loading: "جارٍ التحميل..."
    errors:
      prev_page: "في أثناء محاولة التحميل"
@ -2978,9 +2966,6 @@ ar:
      move_to_inbox:
        title: "النقل إلى صندوق الوارد"
        help: "نقل الرسالة مرة أخرى إلى صندوق الوارد"
-      edit_message:
-        help: "تعديل أول منشور في الرسالة"
-        title: "تعديل"
      defer:
        help: "وضع علامة كغير مقروءة"
        title: "تأجيل"
@ -3853,8 +3838,6 @@ ar:
      this_year: "هذا العام"
      position: "الترتيب في صفحة الفئات:"
      default_position: "الترتيب الافتراضي"
-      position_disabled: "سيتم عرض الفئات بترتيب نشاطها. للتحكُّم في ترتيب الفئات في القائمة، "
-      position_disabled_click: 'عليك تفعيل إعداد "تثبيت ترتيب الفئات".'
      minimum_required_tags: "الحد الأدنى من عدد الوسوم المطلوبة في الموضوع:"
      default_slow_mode: 'تفعيل "الوضع البطيء" للموضوعات الجديدة في هذه الفئة.'
      parent: "الفئة الرئيسية"
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@ -153,7 +153,6 @@ be:
      like_count: "перавагі"
      topic_count: "Тэмы"
      post_count: "Паведамленні"
-      user_count: "Карыстальнікі"
      active_user_count: "дзеючыя карыстальнікі"
      contact: "Кантакты"
      contact_info: "У выпадку сур'ёзных праблем з гэтым сайтам, калі ласка, звяжыцеся з намі праз %{contact_info}."
@ -957,8 +956,6 @@ be:
        title: "архіў"
      move_to_inbox:
        title: "Перамясціць у тэчцы Уваходныя"
-      edit_message:
-        title: "рэдагаваць"
      list: "тэмы"
      new: "новая тэма"
      unread: "непрачытаныя"
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@ -261,7 +261,6 @@ bg:
      like_count: "Харесвания"
      topic_count: "Теми"
      post_count: "Публикации"
-      user_count: "Потребители"
      active_user_count: "Активни потребители"
      contact: "Свържете се с нас"
      contact_info: "В случай на критичен или спешен въпрос засягащ този сайт, моля свържете се с нас на адрес %{contact_email}."
@ -309,7 +308,6 @@ bg:
      remove_confirmation: "Сигурни ли сте, че искате да изтриете тази чернова?"
      new_topic: "Проект на нова тема"
      new_private_message: "Нова чернова на лично съобщение"
-      topic_reply: "Проект на отговор"
      abandon:
        confirm: "Имате чернова за тази тема. Какво бихте искали да направите с нея?"
        yes_value: "Отхвърляне"
@ -2117,8 +2115,6 @@ bg:
      move_to_inbox:
        title: "Премести във входящи"
        help: "Премести съобщението обратно във входящи"
-      edit_message:
-        title: "Редактирай"
      defer:
        title: "Отложи "
      list: "Теми"
@ -2650,8 +2646,6 @@ bg:
      review_group_name: "име на групата"
      this_year: "тази година "
      default_position: "Позиция по подразбиране "
-      position_disabled: "Категорията ще се показва в ред на активност. За да контролирате реда на категориите в списъците, "
-      position_disabled_click: 'Разреши "fixed category positions" настройка '
      minimum_required_tags: "Минимален брой етикети на тема"
      parent: "Главна категория"
      notifications:
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@ -277,7 +277,6 @@ bs_BA:
      like_count: "Sviđanja"
      topic_count: "Tema"
      post_count: "Objave"
-      user_count: "Korisnici"
      active_user_count: "Aktivnih korisnika"
      contact: "Kontaktirajte nas"
      contact_info: "U slučaju da forum ne radi, molimo kontaktirajte nas na %{contact_info}."
@ -316,7 +315,6 @@ bs_BA:
      resume: "Nastavi"
      remove: "Ukloni"
      new_topic: "Nacrt nove teme"
-      topic_reply: "skica odgovora"
      abandon:
        yes_value: "Odbaci"
    topic_count_categories:
@ -2012,9 +2010,6 @@ bs_BA:
      move_to_inbox:
        title: "Premjesti u Sanduče"
        help: "Premjesti poruke nazad u Sanduče"
-      edit_message:
-        help: "Izmijeni prvu objavu ove poruke"
-        title: "Izmijeni"
      defer:
        help: "Označi kao nepročitano"
        title: "Defer"
@ -2569,8 +2564,6 @@ bs_BA:
      this_year: "this year"
      position: "Pozicija na stranici kategorije:"
      default_position: "Default Position"
-      position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
-      position_disabled_click: 'enable the "fixed category positions" setting.'
      minimum_required_tags: "Minimalni broj oznaka potrebnih za temu:"
      parent: "Parent Category"
      num_auto_bump_daily: "Broj otvorenih tema koje se svakodnevno automatski izbijaju:"
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@ -267,7 +267,6 @@ ca:
      like_count: "'M'agrada'"
      topic_count: "Temes"
      post_count: "Publicacions"
-      user_count: "Usuaris"
      active_user_count: "Usuaris actius"
      contact: "Contacta amb nosaltres"
      contact_info: "En cas d'una qüestió urgent o greu que afecti aquest lloc web, contacteu amb nosaltres en: %{contact_info}."
@ -314,7 +313,6 @@ ca:
      remove_confirmation: "Esteu segur que voleu suprimir aquest esborrany?"
      new_topic: "Esborrany de tema nou"
      new_private_message: "Nou esborrany de missatge personal"
-      topic_reply: "Esborrany de resposta"
      abandon:
        confirm: "Teniu un esborrany en curs per a aquest tema. Què t'agradaria fer-hi?"
        yes_value: "Descarta"
@ -1933,9 +1931,6 @@ ca:
      move_to_inbox:
        title: "Mou a la safata d'entrada"
        help: "Torna el missatge a la safata d'entrada"
-      edit_message:
-        help: "Edita la primera publicació del missatge"
-        title: "Edita"
      defer:
        help: "Marca com a no llegit"
        title: "Ajorna"
@ -2461,8 +2456,6 @@ ca:
      this_year: "enguany"
      position: "Posició en la pàgina de categories:"
      default_position: "Posició per defecte"
-      position_disabled: "Les categories es mostraran per ordre d'activitat. Per a controlar l'ordre de les categories en llistes, "
-      position_disabled_click: 'activeu la configuració "posicions fixes de categories"'
      minimum_required_tags: "Nombre mínim d'etiquetes necessari en un tema:"
      parent: "Categoria primària"
      num_auto_bump_daily: "Nombre de temes oberts que s'eleven automàticament cada dia:"
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@ -320,7 +320,6 @@ cs:
      like_count: "Líbí se"
      topic_count: "Témata"
      post_count: "Příspěvky"
-      user_count: "Uživatelé"
      active_user_count: "Aktivní uživatelé"
      contact: "Kontaktujte nás"
      contact_info: "V případě kritické chyby nebo urgentní záležitosti ovlivňující tuto stránku nás prosím kontaktujte na %{contact_info}."
@ -377,7 +376,6 @@ cs:
      remove_confirmation: "Opravdu chcete tento koncept smazat?"
      new_topic: "Nový koncept tématu"
      new_private_message: "Nový koncept soukromé zprávy"
-      topic_reply: "Koncept odpovědi"
      abandon:
        confirm: "Máte rozpracovaný koncept tohoto tématu. Co byste s ním chtěli udělat?"
        yes_value: "Zahodit"
@ -1913,9 +1911,6 @@ cs:
      move_to_inbox:
        title: "Přesunout do Přijaté"
        help: "Přesunout zprávu zpět do Přijaté"
-      edit_message:
-        help: "Upravit první příspěvek zprávy"
-        title: "Upravit"
      defer:
        title: "Odložit"
      list: "Témata"
@ -2435,8 +2430,6 @@ cs:
      require_reply_approval: "Požadovat schválení moderátorů pro všechny nové odpovědi"
      this_year: "letos"
      default_position: "Výchozí umístění"
-      position_disabled: "Kategorie jsou zobrazovány podle pořadí aktivity. Pro kontrolu pořadí kategorií v seznamech,"
-      position_disabled_click: 'povolte nastavení "neměnné pozice kategorií" (fixed category positions).'
      minimum_required_tags: "Nejmenší počet tagů požadovaných pro téma:"
      parent: "Nadřazená kategorie"
      num_auto_bump_daily: "Počet otevřených témat, která mají být denně automaticky zvýrazněna:"
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@ -269,7 +269,6 @@ da:
      like_count: "Synes godt om"
      topic_count: "Emner"
      post_count: "Indlæg"
-      user_count: "Brugere"
      active_user_count: "Aktive brugere"
      contact: "Kontakt os"
      contact_info: "I tilfælde af en kritisk begivenhed eller vigtige spørgsmål angående denne side, kontakt os venligst på %{contact_info}."
@ -324,7 +323,6 @@ da:
      remove_confirmation: "Er du sikker på, at du vil offentliggøre dette udkast?"
      new_topic: "Nyt emne-kladde"
      new_private_message: "Ny personlig meddelelseskladde"
-      topic_reply: "Kladde til svar"
      abandon:
        confirm: "Du har et udkast i gang for dette emne. Hvad vil du gerne gøre med det?"
        yes_value: "Kassér"
@ -2308,7 +2306,7 @@ da:
        other: "%{count} indlæg i emnet"
      create: "Nyt emne"
      create_long: "Opret et nyt emne i debatten"
-      open_draft: "Åben kladde"
+      open_draft: "Åbn kladde"
      private_message: "Start en besked"
      archive_message:
        help: "Flyt beskeder til dit arkiv"
@ -2316,9 +2314,6 @@ da:
      move_to_inbox:
        title: "Flyt til Indbakke"
        help: "Flyt beskeder tilbage til Indbakke"
-      edit_message:
-        help: "Rediger det første indlæg af meddelelsen"
-        title: "Rediger"
      defer:
        help: "Markér som ulæst"
        title: "Udsæt"
@ -2999,8 +2994,6 @@ da:
      this_year: "dette år"
      position: "Placering på kategorisiden:"
      default_position: "Standarposition"
-      position_disabled: "Kategorier vil blive vist i rækkefølge efter aktivitet. For at styre rækkefølgen af kategorier i lister, "
-      position_disabled_click: 'skal funktionen "fikserede kategori positioner" slås til.'
      minimum_required_tags: "Minimum antal mærker krævet i et emne:"
      default_slow_mode: 'Aktivér "Langsom tilstand" for nye emner i denne kategori.'
      parent: "Overordnet kategori"
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@ -293,7 +293,6 @@ de:
      like_count: "„Gefällt mir“"
      topic_count: "Themen"
      post_count: "Beiträge"
-      user_count: "Benutzer"
      active_user_count: "Aktive Benutzer"
      contact: "Kontaktiere uns"
      contact_info: "Im Falle eines kritischen Problems oder einer dringenden Angelegenheit, die diese Website betrifft, kontaktiere uns bitte unter %{contact_info}."
@ -350,7 +349,6 @@ de:
      remove_confirmation: "Bist du sicher, dass du diesen Entwurf löschen möchtest?"
      new_topic: "Neuer Entwurf für Thema"
      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?"
        yes_value: "Verwerfen"
@ -1656,15 +1654,6 @@ de:
      set_custom_status: "Benutzerdefinierten Status festlegen"
      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"
@ -2509,9 +2498,6 @@ de:
      move_to_inbox:
        title: "In Posteingang verschieben"
        help: "Nachricht in den Posteingang zurück verschieben"
-      edit_message:
-        help: "Ersten Beitrag dieser Unterhaltung bearbeiten"
-        title: "Bearbeiten"
      defer:
        help: "Als ungelesen markieren"
        title: "Aufschieben"
@ -3230,8 +3216,6 @@ de:
      this_year: "dieses Jahr"
      position: "Position auf der Kategorien-Seite:"
      default_position: "Standardposition"
-      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: '„Langsamer Modus“ für neue Themen in dieser Kategorie aktivieren.'
      parent: "Übergeordnete Kategorie"
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@ -252,7 +252,6 @@ el:
      like_count: "Μου αρέσει"
      topic_count: "Θέματα"
      post_count: "Αναρτήσεις"
-      user_count: "Χρήστες"
      active_user_count: "Ενεργοί χρήστες"
      contact: "Επικοινωνήστε μαζί μας"
      contact_info: "Σε περίπτωση που προκύψει κάποιο κρίσιμο πρόβλημα ή κάποιο επείγον θέμα που αφορά αυτόν τον ιστότοπο, παρακαλούμε να επικοινωνήσετε μαζί μας στο %{contact_info}."
@ -293,7 +292,6 @@ el:
      resume: "Βιογραφικό"
      remove: "Αφαίρεση"
      new_topic: "Νέο προσχέδιο θέματος"
-      topic_reply: "Προσχέδιο απάντησης"
      abandon:
        yes_value: "Απόρριψη"
    topic_count_categories:
@ -1990,9 +1988,6 @@ el:
      move_to_inbox:
        title: "Μετακίνηση στα Εισερχόμενα"
        help: "Μετακίνηση μηνύματος πίσω στα Εισερχόμενα"
-      edit_message:
-        help: "Επεξεργασία της πρώτης ανάρτησης του μηνύματος"
-        title: "Επεξεργασία"
      defer:
        help: "Σήμανση ως μη αναγνωσμένο"
        title: "Αναβολή"
@ -2575,8 +2570,6 @@ el:
      this_year: "φέτος"
      position: "Θέση στη σελίδα κατηγοριών:"
      default_position: "Προκαθορισμένη Θέση"
-      position_disabled: "Οι κατηγορίες εμφανίζονται ανάλογα με το πόσο ενεργές είναι. Για να αλλάξει η σειρά εμφάνισης των κατηγοριών, "
-      position_disabled_click: 'ενεργοποίησε τη ρύθμιση «σταθερές θεσεις κατηγοριών»'
      minimum_required_tags: "Ελάχιστος αριθμός ετικετών που απαιτούνται σε ένα θέμα:"
      parent: "Μητρική Κατηγορία"
      num_auto_bump_daily: "Αριθμός ανοιχτών θεμάτων για αυτόματη ώθηση καθημερινά:"
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@ -1153,13 +1153,9 @@ en:
        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.
        <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>.
-      first_notification: "Your first notification! Select it to begin."
      dynamic_favicon: "Show counts on browser icon"
      skip_new_user_tips:
        description: "Skip new user onboarding tips and badges"
-        not_first_time: "Not your first time?"
-        skip_link: "Skip these tips"
-        read_later: "I'll read it later."
      reset_seen_user_tips: "Show user 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"
@ -2504,6 +2500,7 @@ en:
        other: "<span>%{count}%{plus} results for</span><span class='term'>%{term}</span>"
      title: "Search"
      full_page_title: "Search"
+      results: "results"
      no_results: "No results found."
      no_more_results: "No more results found."
      post_format: "#%{post_number} by %{username}"
@ -2551,6 +2548,7 @@ en:
        status: "filters by topic status"
        full_search: "launches full page search"
        full_search_key: "%{modifier} + Enter"
+        me: "shows only your posts"

      advanced:
        title: Advanced filters
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@ -293,7 +293,6 @@ es:
      like_count: "Me gusta"
      topic_count: "Temas"
      post_count: "Publicaciones"
-      user_count: "Usuarios"
      active_user_count: "Usuarios activos"
      contact: "Contáctanos"
      contact_info: "En caso de un problema crítico o urgente que esté afectando este sitio, contáctanos a través de %{contact_info}."
@ -350,7 +349,6 @@ es:
      remove_confirmation: "¿Seguro que quieres eliminar este borrador?"
      new_topic: "Nuevo borrador de tema"
      new_private_message: "Nuevo borrador de mensaje personal"
-      topic_reply: "Borrador de respuesta"
      abandon:
        confirm: "Tienes un borrador en curso para este tema. ¿Qué te gustaría hacer?"
        yes_value: "Descartar"
@ -1656,15 +1654,6 @@ 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"
@ -2509,9 +2498,6 @@ es:
      move_to_inbox:
        title: "Mover a la bandeja de entrada"
        help: "Restaurar mensaje a la bandeja de entrada"
-      edit_message:
-        help: "Editar la primera publicación del mensaje"
-        title: "Editar"
      defer:
        help: "Marcar como no leído"
        title: "Aplazar"
@ -3230,8 +3216,6 @@ es:
      this_year: "este año"
      position: "Posición en la página de categorías:"
      default_position: "Posición predeterminada"
-      position_disabled: "Las Categorías se mostrarán por orden de actividad. Para controlar el orden en que aparecen en las listas,"
-      position_disabled_click: 'activa la opción «posiciones de categoría fijas».'
      minimum_required_tags: "Número mínimo de etiquetas requeridas en un tema:"
      default_slow_mode: 'Activar «modo lento» en los nuevos temas de esta categoría'
      parent: "Categoría principal"
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@ -241,7 +241,6 @@ et:
      like_count: "Meeldimisi"
      topic_count: "Teemad"
      post_count: "Postitused"
-      user_count: "Kasutajaid"
      active_user_count: "Aktiivsed kasutajad"
      contact: "Võta meiega ühendust"
      contact_info: "Kriitilise vea või edasilükkamatu probleemi korral võta palun meiega ühendust aadressil %{contact_info}."
@ -278,7 +277,6 @@ et:
      remove: "Eemalda"
      remove_confirmation: "Oled kindel, et soovid selle mustandi kustutada?"
      new_topic: "Uus teema mustand"
-      topic_reply: "Mustandi vastus"
    topic_count_categories:
      one: "Vaata %{count} uut või uuendatud teemat"
      other: "Vaata %{count} uut või uuendatud teemat"
@ -1632,9 +1630,6 @@ et:
      move_to_inbox:
        title: "Liiguta Postkasti"
        help: "Liiguta sõnum tagasi Postkasti"
-      edit_message:
-        help: "Muuda sõnumi esimest postitust"
-        title: "Muuda"
      defer:
        help: "Märgi mitteloetuks"
        title: "Lükka edasi"
@ -2163,8 +2158,6 @@ et:
      this_year: "sel aastal"
      position: "Asukoht kategooriate lehel:"
      default_position: "Vaikepositsioon"
-      position_disabled: "Foorumid kuvatakse aktiivsuse järjekorras. Foorumite järjestuse seadistamiseks loeteludes,"
-      position_disabled_click: 'aktiveeri säte "foorumite positsioonid fikseeritud".'
      minimum_required_tags: "Minimaalne nõutud siltide arv teemas:"
      parent: "Emafoorum"
      num_auto_bump_daily: "Avatud teemade arv, mida iga päev automaatselt tõsta:"
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@ -269,7 +269,7 @@ fa_IR:
      like_count: "پسند‌ها "
      topic_count: "موضوعات"
      post_count: "نوشته‌ها"
-      user_count: "کاربران"
+      user_count: "ثبت‌نام‌ها"
      active_user_count: "کاربران فعال"
      contact: "ارتباط با ما"
      contact_info: "در شرایط حساس و مسائل اضطراری مربوط به سایت٬‌ لطفا از طریق %{contact_info} با تماس بگیرید."
@ -322,7 +322,6 @@ fa_IR:
      remove_confirmation: "آیا مطمئن هستید که می‌خواهید این پیش‌نویس را حذف کنید؟"
      new_topic: "پیش‌نویس‌ موضوع جدید"
      new_private_message: "پیش‌نویس پیام شخصی جدید"
-      topic_reply: "پاسخ پیش‌نویس‌"
      abandon:
        confirm: "شما یک پیش‌نویس در این موضوع دارید. دوست داری باهاش چیکار کنی؟"
        yes_value: "حذف"
@ -1554,7 +1553,7 @@ fa_IR:
      set_custom_status: "تنظیم وضعیت سفارشی"
      what_are_you_doing: "داری چیکار می‌کنی؟"
      remove_status: "حذف وضعیت"
-    popup:
+    user_tips:
      primary: "فهمیدم!"
      secondary: "این نکات را به من نشان نده"
      first_notification:
@ -2284,9 +2283,6 @@ fa_IR:
      move_to_inbox:
        title: "انتقال به صندوق دریافت"
        help: "بازگرداندن پیام به صندوق دریافتی"
-      edit_message:
-        help: "ویرایش اولین نوشته از پیام"
-        title: "ویرایش"
      defer:
        help: "علامت به عنوان خوانده نشده"
        title: " واگذار کردن"
@ -2854,8 +2850,6 @@ fa_IR:
      this_year: "امسال"
      position: "موقعیت در صفحه دسته‌بندی:"
      default_position: "موقعیت پیش‌فرض"
-      position_disabled: "دسته‌‌بندی‌ها به‌ترتیب فعالیت نمایش داده می‌شوند. برای کنترل ترتیب دسته‌بندی‌ها"
-      position_disabled_click: 'در تنظیمات "مکان دسته‌بندی ثابت" را فعال کنید.'
      minimum_required_tags: "حداقل تعداد برچسب‌های مورد نیاز در یک تاپیک:"
      parent: "دسته‌بندی مادر"
      notifications:
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@ -293,7 +293,6 @@ fi:
      like_count: "Tykkäyksiä"
      topic_count: "Ketjuja"
      post_count: "Viestejä"
-      user_count: "Käyttäjiä"
      active_user_count: "Aktiivisia käyttäjiä"
      contact: "Ota yhteyttä"
      contact_info: "Sivustoon liittyvissä kiireellisissä asioissa, ota yhteyttä osoitteeseen %{contact_info}."
@ -350,7 +349,6 @@ fi:
      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?"
        yes_value: "Hylkää"
@ -1086,7 +1084,6 @@ 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"
@ -1671,15 +1668,6 @@ fi:
      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"
@ -2525,9 +2513,6 @@ fi:
      move_to_inbox:
        title: "Siirrä saapuneisiin"
        help: "Siirrä takaisin saapuneisiin."
-      edit_message:
-        help: "Muokkaa keskustelun ensimmäistä viestiä"
-        title: "Muokkaa"
      defer:
        help: "Merkitse lukemattomaksi"
        title: "Lykkää"
@ -3248,8 +3233,6 @@ fi:
      this_year: "tänä vuonna"
      position: "Sijoitus aluesivulla:"
      default_position: "Oletussijoitus"
-      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"
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@ -293,7 +293,6 @@ fr:
      like_count: "J'aime"
      topic_count: "Sujets"
      post_count: "Nombre de messages"
-      user_count: "Utilisateurs"
      active_user_count: "Utilisateurs actifs"
      contact: "Nous contacter"
      contact_info: "En cas de problème critique ou de sujet urgent concernant ce site, veuillez nous contacter à : %{contact_info}."
@ -350,7 +349,6 @@ fr:
      remove_confirmation: "Voulez-vous vraiment supprimer ce brouillon ?"
      new_topic: "Nouveau brouillon de sujet"
      new_private_message: "Nouveau brouillon de message direct"
-      topic_reply: "Créer un brouillon de réponse"
      abandon:
        confirm: "Vous avez un brouillon en cours pour ce sujet. Que voulez-vous en faire ?"
        yes_value: "Abandonner"
@ -1086,7 +1084,6 @@ 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"
@ -1671,15 +1668,6 @@ fr:
      set_custom_status: "Définir un statut personnalisé"
      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"
@ -2525,9 +2513,6 @@ fr:
      move_to_inbox:
        title: "Déplacer dans la boîte de réception"
        help: "Déplacer le message dans la boîte de réception"
-      edit_message:
-        help: "Modifier le premier message du message direct"
-        title: "Modifier"
      defer:
        help: "Marquer comme non lu"
        title: "Reporter à plus tard"
@ -3248,8 +3233,6 @@ fr:
      this_year: "cette année"
      position: "Position sur la page des catégories :"
      default_position: "Position par défaut"
-      position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste, "
-      position_disabled_click: 'activez le paramètre « positions de catégorie fixes ».'
      minimum_required_tags: "Nombre minimal d'étiquettes requises dans un sujet :"
      default_slow_mode: 'Activer le mode ralenti pour tous les nouveaux sujets dans cette catégorie'
      parent: "Catégorie parente"
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@ -257,7 +257,6 @@ gl:
      like_count: "Gústames"
      topic_count: "Temas"
      post_count: "Publicacións"
-      user_count: "Usuarios"
      active_user_count: "Usuarios activos"
      contact: "Contacte connosco"
      contact_info: "No caso dunha incidencia crítica ou asunto urxente que afecte este sitio, contacte connosco en %{contact_info}."
@ -299,7 +298,6 @@ gl:
      remove: "Retirar"
      remove_confirmation: "Confirma que quere retirar este borrador?"
      new_topic: "Borrador de novo tema"
-      topic_reply: "Borrador de resposta"
      abandon:
        confirm: "Ten un borrador en curso neste tema. Que lle gustaría facer con iso?"
        yes_value: "Desbotar"
@ -2190,9 +2188,6 @@ gl:
      move_to_inbox:
        title: "Mover á caixa de entrada"
        help: "Mover mensaxes á caixa de entrada"
-      edit_message:
-        help: "Editar a primeira publicación da mensaxe"
-        title: "Editar"
      defer:
        help: "Marcar como non lido"
        title: "Adiar"
@ -2844,8 +2839,6 @@ gl:
      this_year: "este ano"
      position: "Posición na páxina de categorías:"
      default_position: "Posición predeterminada"
-      position_disabled: "As categorías presentaranse en orde de actividade. Para controlar a orde das categorías nas listaxes, "
-      position_disabled_click: 'activar o axuste «posición das categorías fixadas».'
      minimum_required_tags: "Número mínimo de etiquetas requiridas nun tema:"
      parent: "Categoría primaria"
      num_auto_bump_daily: "Número de temas abertos que se promoven automaticamente cada día:"
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@ -358,7 +358,7 @@ he:
      like_count: "לייקים"
      topic_count: "נושאים"
      post_count: "פוסטים"
-      user_count: "משתמשים"
+      user_count: "הרשמות"
      active_user_count: "משתמשים פעילים"
      contact: "יצירת קשר"
      contact_info: "במקרה של בעיה קריטית או דחופה המשפיעה על אתר זה, נא ליצור אתנו קשר דרך: %{contact_info}."
@ -415,7 +415,6 @@ he:
      remove_confirmation: "למחוק את הטיוטה הזאת?"
      new_topic: "טיוטת נושא חדשה"
      new_private_message: "טיוטת הודעה אישית חדשה"
-      topic_reply: "טיוטת תשובה"
      abandon:
        confirm: "יש טיוטה שהתחלת לערוך לנושא הזה. מה לעשות אתה?"
        yes_value: "להשליך"
@ -1201,7 +1200,7 @@ he:
        not_first_time: "לא הפעם הראשונה שלך?"
        skip_link: "דילוג על העצות האלו"
        read_later: "אקרא את זה אחר כך."
-      reset_seen_popups: "להציג את עצות קבלת הפנים שוב"
+      reset_seen_user_tips: "הצגת עצות למשתמש שוב"
      theme_default_on_all_devices: "הגדרת ערכת עיצוב זו כבררת המחדל לכל המכשירים שלי"
      color_scheme_default_on_all_devices: "הגדרת ערכות צבעים כבררת מחדל לכל המכשירים שלי"
      color_scheme: "ערכת צבעים"
@ -1817,7 +1816,7 @@ he:
      set_custom_status: "הגדרת מצב משלך"
      what_are_you_doing: "מה מעלליך?"
      remove_status: "הסרת מצב"
-    popup:
+    user_tips:
      primary: "הבנתי!"
      secondary: "לא להציג יותר את העצות האלה"
      first_notification:
@ -2720,9 +2719,6 @@ he:
      move_to_inbox:
        title: "העברה לדואר נכנס"
        help: "החזרת הודעה לדואר נכנס"
-      edit_message:
-        help: "עריכת פוסט ראשון של ההודעה"
-        title: "עריכה"
      defer:
        help: "סימון כלא נקראו"
        title: "אחר כך"
@ -3518,8 +3514,6 @@ he:
      this_year: "השנה"
      position: "מיקום בעמוד הקטגוריות:"
      default_position: "מיקום ברירת מחדל"
-      position_disabled: "קטגוריות יוצגו על פס סדר הפעילות. כדי לשלוט בסדר הקטגורייות ברשימה,"
-      position_disabled_click: 'אפשרו את ההגדרה "סדר קטגוריות קבוע".'
      minimum_required_tags: "מספר התגיות המזערי הנדרש לנושא:"
      default_slow_mode: 'להפעיל „מצב אטי” לנושאים חדשים בקטגוריה הזאת.'
      parent: "קטגורית אם"
@ -4194,12 +4188,20 @@ he:
            unread_with_count: "לא נקראה (%{count})"
            archive: "ארכיון"
        tags:
+          links:
+            add_tags:
+              content: "הוספת תגיות"
+              title: "לא הוספת תגיות כלל. יש ללחוץ כדי להתחיל."
          none: "עדיין לא הוספת תגיות."
          click_to_get_started: "ללחוץ כאן כדי להתחיל."
          header_link_text: "תגיות"
          header_action_title: "לערוך את תגיות סרגל הצד שלך"
          configure_defaults: "הגדרת ברירות מחדל"
        categories:
+          links:
+            add_categories:
+              content: "הוספת קטגוריות"
+              title: "לא הוספת קטגוריות כלל. יש ללחוץ כדי להתחיל."
          none: "עדיין לא הוספת קטגוריות."
          click_to_get_started: "ללחוץ כאן כדי להתחיל."
          header_link_text: "קטגוריות"
@ -4626,6 +4628,7 @@ he:
        change_settings_short: "הגדרות"
        howto: "איך אני מתקין/ה הרחבות?"
        official: "תוסף רשמי"
+        broken_route: "לא ניתן להגדיר את הקישור אל ‚%{name}’. כדאי לוודא שחוסמי פרסומות מושבתים ואז לנסות לטעון את הדף מחדש."
      backups:
        title: "גיבויים"
        menu:
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@ -324,7 +324,6 @@ hr:
      like_count: "Likeovi"
      topic_count: "Teme"
      post_count: "Objave"
-      user_count: "Korisnici"
      active_user_count: "Aktivni korisnici"
      contact: "Kontaktirajte nas"
      contact_info: "U slučaju kritičnog problema ili hitnosti koje utječu na rad stranice, kontaktirajte nas na %{contact_info}."
@ -381,7 +380,6 @@ hr:
      remove_confirmation: "Jeste li sigurni da želite izbrisati ovaj nacrt?"
      new_topic: "Nova skica teme"
      new_private_message: "Nova skica osobne poruke"
-      topic_reply: "Skica odgovora"
      abandon:
        confirm: "Imate nacrt u tijeku za ovu temu. Što biste željeli učiniti s njom?"
        yes_value: "Odbaci"
@ -2522,9 +2520,6 @@ hr:
      move_to_inbox:
        title: "Premjesti u ulaznu poštu"
        help: "Premjestite poruku nazad u dolazni pretinac"
-      edit_message:
-        help: "Uredite prvu objavu u poruci"
-        title: "Izmijeni"
      defer:
        help: "Označi kao nepročitano"
        title: "Odloži"
@ -3275,8 +3270,6 @@ hr:
      this_year: "ove godine"
      position: "Položaj na stranici kategorija:"
      default_position: "Zadana pozicija"
-      position_disabled: "Kategorije će u nizu biti prikazivane po razini aktivnosti. Za kontrolu redosljeda kategorija u popisu,"
-      position_disabled_click: 'omogućite postavku "fiksa pozicija kategorija".'
      minimum_required_tags: "Minimalan broj oznaka potrebnih u temi:"
      default_slow_mode: 'Omogućite "Spori način rada" za nove teme u ovoj kategoriji.'
      parent: "Nadkategorija"
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@ -293,7 +293,6 @@ hu:
      like_count: "Kedvelés"
      topic_count: "Téma"
      post_count: "Bejegyzés"
-      user_count: "Felhasználó"
      active_user_count: "Aktív felhasználó"
      contact: "Kapcsolat"
      contact_info: "A webhellyel kapcsolatos sürgős vagy kritikus probléma esetén lépjen velünk kapcsolatba a következő elérhetőségen: %{contact_info}."
@ -350,7 +349,6 @@ hu:
      remove_confirmation: "Biztos, hogy törli ezt a vázlatot?"
      new_topic: "Új témavázlat"
      new_private_message: "Új személyesüzenet-vázlat"
-      topic_reply: "Választervezet"
      abandon:
        confirm: "Van egy folyamatban lévő vázlata ehhez a témához. Mit szeretne vele tenni?"
        yes_value: "Elvetés"
@ -2475,9 +2473,6 @@ hu:
      move_to_inbox:
        title: "Áthelyezés a bejövő üzenetek közé"
        help: "Üzenet áthelyezése a Beérkezett üzenetek közé"
-      edit_message:
-        help: "Az üzenet első bejegyzésének szerkesztése"
-        title: "Szerkesztés"
      defer:
        help: "Megjelölés olvasatlanként"
        title: "Elhalasztás"
@ -2999,7 +2994,6 @@ hu:
      this_year: "ez az év"
      position: "Kategóriák oldalon elfoglalt pozíció:"
      default_position: "Alapértelmezett pozíció"
-      position_disabled: "A kategóriák aktivitási sorrendben jelennek meg. A kategóriák sorrendjének listákban való szabályzásához,"
      parent: "Szülő kategória"
      num_auto_bump_daily: "A naponta automatikusan előrehozandó nyitott témák száma:"
      navigate_to_first_post_after_read: "A témák elolvasása után navigáljon az első hozzászóláshoz"
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@ -248,7 +248,6 @@ hy:
      like_count: "Հավանումներ"
      topic_count: "Թեմաներ"
      post_count: "Գրառում"
-      user_count: "Օգտատերեր"
      active_user_count: "Ակտիվ Օգտատերեր"
      contact: "Հետադարձ Կապ"
      contact_info: "Այս կայքի հետ կապված կրիտիկական խնդիրների կամ հրատապ հարցերի դեպքում խնդրում ենք կապվել մեզ հետ %{contact_info} էլ. հասցեով:"
@ -283,7 +282,6 @@ hy:
      resume: "Վերսկսել"
      remove: "Ջնջել"
      new_topic: "Նոր թեմայի սևագիր"
-      topic_reply: "Պատասխանի սևագիր"
      abandon:
        yes_value: "Չեղարկել"
    topic_count_categories:
@ -1859,9 +1857,6 @@ hy:
      move_to_inbox:
        title: "Տեղափոխել Մուտքային արկղ"
        help: "Տեղափոխել հաղորդագրությունը ետ դեպի Մուտքային արկղ"
-      edit_message:
-        help: "Խմբագրել հաղորդագրության առաջին գրառումը"
-        title: "Խմբագրել"
      defer:
        help: "նշել որպես չընթերցված "
        title: "Հետաձգել"
@ -2415,8 +2410,6 @@ hy:
      this_year: "այս տարի"
      position: "Դիրքը կատեգորիայի էջում."
      default_position: "Լռելյայն Դիրքը"
-      position_disabled: "Կատեգորիաները կցուցադրվեն ըստ ակտիվության: Ցանկերում կատեգորիաների դասավորությունը վերահսկելու համար,"
-      position_disabled_click: 'միացրեք "fixed category positions" կարգավորումը:'
      minimum_required_tags: "Թեմայում պահանջվող թեգերի նվազագույն քանակը՝"
      parent: "Մայր Կատեգորիա"
      num_auto_bump_daily: "Օրեկան ավտոմատ բարձրացվող բաց թեմաների քանակը՝"
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@ -259,7 +259,6 @@ id:
      like_count: "Suka"
      topic_count: "Topik"
      post_count: "Pos"
-      user_count: "Pengguna"
      active_user_count: "Pengguna Aktif"
      contact: "Kontak kami"
      contact_info: "Pada kegiatan dari sebuah isu kritikal atau penting terjadi pada situs ini, silahkan kontak kami di %{contact_info}."
@ -316,7 +315,6 @@ id:
      remove_confirmation: "Anda yakin ingin menghapus rancangan ini?"
      new_topic: "Konsep topik baru"
      new_private_message: "Rancangan pesan pribadi baru"
-      topic_reply: "Balasan konsep"
      abandon:
        confirm: "Anda memiliki rancangan yang sedang diproses untuk topik ini. Apa yang ingin Anda lakukan dengannya?"
        yes_value: "Batalkan"
@ -1548,8 +1546,6 @@ id:
        title: "Arsip"
      move_to_inbox:
        title: "Pindah ke Kotak Masuk"
-      edit_message:
-        title: "Ubah"
      list: "Topik"
      new: "topik baru"
      unread: "belum dibaca"
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@ -293,7 +293,6 @@ it:
      like_count: "Mi piace"
      topic_count: "Argomenti"
      post_count: "Messaggi"
-      user_count: "Utenti"
      active_user_count: "Utenti Attivi"
      contact: "Contattaci"
      contact_info: "Nel caso di un problema grave o urgente riguardante il sito, per favore contattaci all'indirizzo %{contact_info}."
@ -350,7 +349,6 @@ it:
      remove_confirmation: "Vuoi davvero eliminare questa bozza?"
      new_topic: "Nuovo argomento in bozza"
      new_private_message: "Nuovo messaggio personale in bozza"
-      topic_reply: "Risposta in bozza"
      abandon:
        confirm: "Hai una bozza in corso per questo argomento. Cosa vorresti fare?"
        yes_value: "Elimina"
@ -2497,9 +2495,6 @@ it:
      move_to_inbox:
        title: "Sposta in posta in arrivo"
        help: "Sposta il messaggio di nuovo nella posta in arrivo"
-      edit_message:
-        help: "Modifica la prima versione del Messaggio"
-        title: "Modifica"
      defer:
        help: "Contrassegna come non letto"
        title: "Leggi più tardi"
@ -3218,8 +3213,6 @@ it:
      this_year: "quest'anno"
      position: "Posizione nella pagina delle Categorie:"
      default_position: "Posizione predefinita"
-      position_disabled: "Le categorie verranno mostrate in ordine d'attività. Per modificare l'ordinamento delle categorie nelle liste,"
-      position_disabled_click: 'attiva l''impostazione "posizione fissa delle categorie".'
      minimum_required_tags: "Numero minimo di etichette richieste per argomento:"
      default_slow_mode: 'Attiva la "modalità lenta" per i nuovi argomenti in questa categoria.'
      parent: "Categoria Superiore"
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@ -261,7 +261,6 @@ ja:
      like_count: "「いいね！」数"
      topic_count: "トピック"
      post_count: "投稿"
-      user_count: "ユーザー"
      active_user_count: "アクティブユーザー"
      contact: "お問い合わせ"
      contact_info: "このサイトに影響を与える重要な問題や緊急の問題が発生した場合は、%{contact_info} までご連絡ください。"
@ -318,7 +317,6 @@ ja:
      remove_confirmation: "この下書きを削除してもよろしいですか？"
      new_topic: "新しいトピックの下書き"
      new_private_message: "新しい個人メッセージの下書き"
-      topic_reply: "返信の下書き"
      abandon:
        confirm: "このトピックの作成中の下書きがあります。どうしますか？"
        yes_value: "破棄"
@ -1029,7 +1027,6 @@ ja:
        not_first_time: "初めてのご利用ではありませんか？"
        skip_link: "これらのヒントをスキップ"
        read_later: "後で読む。"
-      reset_seen_popups: "オンボーディングのヒントを再表示"
      theme_default_on_all_devices: "これをすべてのデバイスのデフォルトのテーマにする"
      color_scheme_default_on_all_devices: "デフォルトの色スキームをすべてのデバイスに設定する"
      color_scheme: "色スキーム"
@ -1600,15 +1597,6 @@ ja:
      set_custom_status: "カスタムステータスを設定する"
      what_are_you_doing: "何をしていますか？"
      remove_status: "ステータスを削除する"
-    popup:
-      primary: "了解！"
-      secondary: "これらのヒントを表示しない"
-      first_notification:
-        title: "はじめての通知です！"
-        content: "通知は、コミュニティーで起きていることの最新情報を提供するために使用されます。"
-      topic_timeline:
-        title: "トピックのタイムライン"
-        content: "トピックタイムラインを使って投稿を素早くスクロールします。"
    loading: "読み込み中..."
    errors:
      prev_page: "次の項目を読み込み中に発生しました:"
@ -2412,9 +2400,6 @@ ja:
      move_to_inbox:
        title: "受信トレイに移動"
        help: "受信トレイにメッセージを戻す"
-      edit_message:
-        help: "メッセージの最初の投稿を編集する"
-        title: "編集"
      defer:
        help: "未読にする"
        title: "取り下げる"
@ -3097,8 +3082,6 @@ ja:
      this_year: "今年"
      position: "カテゴリページの位置:"
      default_position: "デフォルトの位置"
-      position_disabled: "カテゴリはアクティビティ順で表示されます。リスト内のカテゴリの順番を管理するには、 "
-      position_disabled_click: '「カテゴリの位置の固定」の設定を有効にしてください。'
      minimum_required_tags: "トピックに必要なタグの最小数:"
      default_slow_mode: 'このカテゴリの新しいトピックに「低速モード」を有効にします。'
      parent: "親カテゴリ"
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@ -245,7 +245,6 @@ ko:
      like_count: "좋아요"
      topic_count: "글"
      post_count: "게시물"
-      user_count: "사용자"
      active_user_count: "활성 사용자"
      contact: "문의하기"
      contact_info: "이 사이트에 영향을 미치는 중대하거나 긴급한 문제가 발생한 경우 %{contact_info}으로 문의하세요."
@ -299,7 +298,6 @@ ko:
      remove_confirmation: "이 초안을 삭제할까요?"
      new_topic: "새 주제 초안"
      new_private_message: "새 개인 메시지 초안"
-      topic_reply: "초안 댓글"
      abandon:
        confirm: "이 주제에 대한 초안이 있습니다. 어떻게 진행할까요?"
        yes_value: "버리기"
@ -2269,9 +2267,6 @@ ko:
      move_to_inbox:
        title: "받은 편지함으로 이동"
        help: "메시지를 받은 편지함으로 다시 이동"
-      edit_message:
-        help: "메시지의 첫 게시물 편집"
-        title: "편집"
      defer:
        help: "읽지 않음으로 표시"
        title: "연기"
@ -2927,8 +2922,6 @@ ko:
      this_year: "올해"
      position: "카테고리 페이지에서의 위치:"
      default_position: "디폴트 위치"
-      position_disabled: "카테고리는 활동에 따라서 표시됩니다. 목록 내 카테고리 순서를 제어하려면"
-      position_disabled_click: '''고정 카테고리 위치'' 설정을 활성화하세요.'
      minimum_required_tags: "주제에 필요한 최소 태그 수:"
      default_slow_mode: '이 카테고리의 새 주제에 ''느린 모드''를 활성화합니다.'
      parent: "상위 카테고리"
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@ -317,7 +317,6 @@ lt:
      like_count: "Patinka"
      topic_count: "Temos"
      post_count: "Įrašai"
-      user_count: "Nariai"
      active_user_count: "Aktyvūs vartotojai"
      contact: "Kontaktai"
      contact_info: "Atsiradus bet kokiai problemai susijusiai su puslapiu, prašome kontaktuoti %{contact_info}."
@ -369,7 +368,6 @@ lt:
      remove_confirmation: "Ar tikrai norite ištrinti šį juodraštį?"
      new_topic: "Naujos temos juodraštis"
      new_private_message: "Naujas asmeninės žinutės juodraštis"
-      topic_reply: "Atsakymo juodraštis"
      abandon:
        confirm: "Jūs turite nebaigtą juodraštį šiai tema. Ką norėtumėte daryti su juo?"
        yes_value: "Išmesti"
@ -2277,9 +2275,6 @@ lt:
      move_to_inbox:
        title: "Perkelti į Pranešimų dėžutę"
        help: "Perkelti žinutes atgal į Pranešimų dėžutę"
-      edit_message:
-        help: "Redaguokite pirmąjį pranešimo įrašą"
-        title: "Redaguoti"
      defer:
        help: "Pažymėti kaip neskaitytą"
        title: "Atidėti"
@ -2944,8 +2939,6 @@ lt:
      this_year: "šiais metais"
      position: "Pozicija kategorijų puslapyje:"
      default_position: "Numatyta pozicija"
-      position_disabled: "Kategorijos bus rodomos pagal aktyvumą. Tam, kad nustatytum kategorijų rodymo tvarką,"
-      position_disabled_click: 'nueik į "fixed category positions" nustatymus.'
      minimum_required_tags: "Minimalus temoje reikalingas žymų skaičius:"
      default_slow_mode: 'Įgalinkite „lėtąjį režimą“ naujoms šios kategorijos temoms.'
      parent: "Tėvinė kategoriją"
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@ -271,7 +271,6 @@ lv:
      like_count: "Atzinības"
      topic_count: "Tēmas"
      post_count: "Ieraksti"
-      user_count: "Lietotāji"
      active_user_count: "Aktīvi lietotāji"
      contact: "Sazinies ar mums"
      contact_info: "Ar šo vietni saistītu kritisku problēmu gadījumā lūdzu sazinieties ar mums %{contact_info}."
@ -314,7 +313,6 @@ lv:
      remove_confirmation: "Vai tiešām vēlaties dzēst šo melnrakstu?"
      new_topic: "Jaunas tēmas melnraksts"
      new_private_message: "Jauns personīgā ziņojuma melnraksts"
-      topic_reply: "Atbildes projekts"
      abandon:
        confirm: "Šim tematam tiek izstrādāts melnraksts. Ko jūs vēlētos ar to darīt?"
        yes_value: "Izmest"
@ -1980,8 +1978,6 @@ lv:
      move_to_inbox:
        title: "Pārvietot uz iesūtni"
        help: "Atgriezt ziņu uz iesūtni "
-      edit_message:
-        title: "Labot"
      defer:
        title: "Nepiekrist"
      list: "Tēmas"
@ -2421,8 +2417,6 @@ lv:
      review_group_name: "grupas nosaukums"
      this_year: "šogad"
      default_position: "Noklusētā pozīcija"
-      position_disabled: "Sadaļas tiks sakārtotas pēc aktivitātes. Lai kontrolētu sadaļu secību sarakstos,"
-      position_disabled_click: 'ieslēgt iestatījumu "fiksētas sadaļu pozīcijas".'
      parent: "Vecāksadaļa"
      notifications:
        watching:
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@ -262,7 +262,6 @@ nb_NO:
      like_count: "Likes"
      topic_count: "Emner"
      post_count: "Innlegg"
-      user_count: "Brukere"
      active_user_count: "Aktive brukere"
      contact: "Kontakt oss"
      contact_info: "I tilfelle en kritisk hendelse skulle inntreffe eller det er en hastesak som påvirker siden, ta kontakt på %{contact_info}."
@ -309,7 +308,6 @@ nb_NO:
      remove_confirmation: "Er du sikker på at du vil slette dette utkastet?"
      new_topic: "Nytt emneutkast"
      new_private_message: "Nytt personlig meldingsutkast"
-      topic_reply: "Svarutkast"
      abandon:
        confirm: "Du har et pågående utkast for dette emnet. Hva vil du gjøre med det?"
        yes_value: "Forkast"
@ -2223,9 +2221,6 @@ nb_NO:
      move_to_inbox:
        title: "Flytt til innboks"
        help: "Flytt melding tilbake til innboks"
-      edit_message:
-        help: "Rediger første innlegg i meldingen"
-        title: "Rediger"
      defer:
        help: "Merk som ulest"
        title: "Utsett"
@ -2887,8 +2882,6 @@ nb_NO:
      this_year: "dette året"
      position: "Posisjon på kategorisiden:"
      default_position: "Forvalgt posisjon"
-      position_disabled: "Kategorier vil bli vist i henhold til aktivitet. For å styre rekkefølgen av kategorier i listen"
-      position_disabled_click: 'aktiver innstillingen "faste kategoriposisjoner".'
      minimum_required_tags: "Minste antall stikkord som kreves for et emne:"
      default_slow_mode: 'Aktiver "Sakte modus" for nye emner i denne kategorien.'
      parent: "Foreldrekategori"
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@ -358,7 +358,6 @@ pl_PL:
      like_count: "Polubienia"
      topic_count: "Tematy"
      post_count: "Posty"
-      user_count: "Użytkownicy"
      active_user_count: "Aktywni użytkownicy"
      contact: "Kontakt"
      contact_info: "W sprawach wymagających szybkiej reakcji lub związanych z poprawnym funkcjonowaniem serwisu, prosimy o kontakt: %{contact_info}."
@ -415,7 +414,6 @@ pl_PL:
      remove_confirmation: "Czy na pewno chcesz usunąć ten szkic?"
      new_topic: "Nowy szkic tematu"
      new_private_message: "Nowy szkic wiadomości osobistej"
-      topic_reply: "Szkic odpowiedzi"
      abandon:
        confirm: "Masz projekt w toku dla tego tematu. Co chcesz z nim zrobić?"
        yes_value: "Odrzuć"
@ -1196,7 +1194,6 @@ pl_PL:
        not_first_time: "To nie twój pierwszy raz?"
        skip_link: "Pomiń te wskazówki"
        read_later: "Przeczytam to później."
-      reset_seen_popups: "Pokaż ponownie wskazówki wprowadzające"
      theme_default_on_all_devices: "Ustaw to jako domyślny motyw na wszystkich urządzeniach"
      color_scheme_default_on_all_devices: "Ustaw domyślne schematy kolorów na wszystkich moich urządzeniach"
      color_scheme: "Schemat kolorów"
@ -1806,7 +1803,7 @@ pl_PL:
      set_custom_status: "Ustaw własny status"
      what_are_you_doing: "Co robisz?"
      remove_status: "Usuń status"
-    popup:
+    user_tips:
      primary: "Zrozumiano!"
      secondary: "nie pokazuj mi tych wskazówek"
      first_notification:
@ -2730,9 +2727,6 @@ pl_PL:
      move_to_inbox:
        title: "Przenieś do skrzynki odbiorczej"
        help: "Przenieś wiadomość z powrotem do skrzynki odbiorczej"
-      edit_message:
-        help: "Edytuj pierwszy post wiadomości"
-        title: "Edytuj"
      defer:
        help: "Oznacz jako nieprzeczytane"
        title: "Zignoruj"
@ -3528,8 +3522,6 @@ pl_PL:
      this_year: "ten rok"
      position: "Pozycja na stronie kategorii:"
      default_position: "Domyślna pozycja"
-      position_disabled: "Kolejność kategorii będzie uzależniona od aktywności. Aby kontrolować ich kolejność,"
-      position_disabled_click: 'włącz statyczną kolejność kategorii'
      minimum_required_tags: "Minimalna liczba tagów wymaganych w temacie:"
      default_slow_mode: 'Włącz „Tryb powolny” dla nowych tematów w tej kategorii.'
      parent: "Kategoria rodzica"
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@ -270,7 +270,6 @@ pt:
      like_count: "Gostos"
      topic_count: "Tópicos"
      post_count: "Publicações"
-      user_count: "Utilizadores"
      active_user_count: "Utilizadores Activos"
      contact: "Contacte-nos"
      contact_info: "No caso de um problema crítico ou de algum assunto urgente que afecte este sítio, por favor contacte-nos em %{contact_info}."
@ -317,7 +316,6 @@ pt:
      remove: "Remover"
      remove_confirmation: "Tem a certeza que pretende eliminar este rascunho?"
      new_topic: "Novo rascunho de tópico"
-      topic_reply: "Rascunho da resposta"
      abandon:
        confirm: "Tem um rascunho em andamento neste tópico. O que gostaria de fazer com ele?"
        yes_value: "Descartar"
@ -2279,9 +2277,6 @@ pt:
      move_to_inbox:
        title: "Mover para Caixa de Entrada"
        help: "Mover mensagem de volta para a Caixa de Entrada"
-      edit_message:
-        help: "Editar primeira publicação da mensagem"
-        title: "Editar"
      defer:
        help: "Marcar como não lida"
        title: "Diferir"
@ -2930,8 +2925,6 @@ pt:
      review_group_name: "nome do grupo"
      this_year: "este ano"
      default_position: "Posição Padrão"
-      position_disabled: "As categorias serão exibidas por ordem de actividade. Para controlar a ordenação das categorias nas listas,"
-      position_disabled_click: 'ative a definição "categoria em posição fixa".'
      parent: "Categoria Principal"
      notifications:
        title: "alterar o nível de notificação desta categoria"
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@ -293,7 +293,6 @@ pt_BR:
      like_count: "Curtidas"
      topic_count: "Tópicos"
      post_count: "Mensagens"
-      user_count: "Usuários"
      active_user_count: "Usuários(as) ativos(as)"
      contact: "Fale conosco"
      contact_info: "Em caso de algum problema crítico ou assunto urgente relacionado a este site, fale conosco em %{contact_info}."
@ -350,7 +349,6 @@ pt_BR:
      remove_confirmation: "Tem certeza de que deseja excluir este rascunho?"
      new_topic: "Novo rascunho de tópico"
      new_private_message: "Novo rascunho de mensagem"
-      topic_reply: "Rascunho de resposta"
      abandon:
        confirm: "Você tem um rascunho em andamento para este tópico. O que deseja fazer com ele?"
        yes_value: "Descartar"
@ -1086,7 +1084,6 @@ 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"
@ -1671,15 +1668,6 @@ pt_BR:
      set_custom_status: "Definir status personalizados"
      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"
@ -2525,9 +2513,6 @@ pt_BR:
      move_to_inbox:
        title: "Mover para caixa de entrada"
        help: "Mover mensagem de volta para caixa de entrada"
-      edit_message:
-        help: "Editar primeira postagem da mensagem"
-        title: "Editar"
      defer:
        help: "Marcar como não lido"
        title: "Adiar"
@ -3248,8 +3233,6 @@ pt_BR:
      this_year: "este ano"
      position: "Posição na página de categorias:"
      default_position: "Posição padrão"
-      position_disabled: "Categorias serão exibidas em ordem de atividade. Para controlar a ordem das categorias nas listas,"
-      position_disabled_click: 'ative a configuração "posições de categoria fixas".'
      minimum_required_tags: "Número mínimo de etiquetas exigidas em um tópico:"
      default_slow_mode: 'Ative o "Modo lento" para obter novos tópicos nesta categoria.'
      parent: "Categoria principal"
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@ -292,7 +292,6 @@ ro:
      like_count: "Aprecieri"
      topic_count: "Subiecte"
      post_count: "Postări"
-      user_count: "Utilizatori"
      active_user_count: "Utilizatori activi"
      contact: "Contactează-ne"
      contact_info: "În cazul în care o problemă critică sau alt aspect urgent afectează site-ul, contactează-ne la %{contact_info}."
@ -345,7 +344,6 @@ ro:
      remove: "Eliminați"
      remove_confirmation: "Ești sigur că vrei să ștergi această ciornă?"
      new_topic: "Ciornă subiect nou"
-      topic_reply: "Răspuns ciornă"
      abandon:
        confirm: "Ai o schiță în curs pentru acest subiect. Ce ai vrea să faci mai departe?"
        yes_value: "Renunță"
@ -1998,8 +1996,6 @@ ro:
      move_to_inbox:
        title: "Mută în Primite"
        help: "Mută mesajul în Primite"
-      edit_message:
-        title: "Editează"
      defer:
        title: "Amânare"
      list: "Subiecte"
@ -2508,8 +2504,6 @@ ro:
      require_topic_approval: "Cere obligatoriu aprobarea moderatorilor pentru toate discuțiile noi"
      this_year: "anul acesta"
      default_position: "Poziție inițială"
-      position_disabled: "Categoriile vor fi afișate în ordinea activității. Pentru a controla ordinea categoriilor în listă, "
-      position_disabled_click: 'activează setarea "poziția fixă a categoriei".'
      parent: "Categorie părinte"
      num_auto_bump_daily: "Numărul de discuții active care pot primi bump zilnic"
      navigate_to_first_post_after_read: "Navighează la prima postare după ce le citești pe celelalte"
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@ -357,7 +357,6 @@ ru:
      like_count: "Симпатии"
      topic_count: "Темы"
      post_count: "Сообщения"
-      user_count: "Пользователи"
      active_user_count: "Активные пользователи"
      contact: "Контакты"
      contact_info: "В случае возникновения критической ошибки или срочного вопроса, касающегося этого сайта, свяжитесь с нами по адресу %{contact_info}."
@ -414,7 +413,6 @@ ru:
      remove_confirmation: "Вы действительно хотите удалить этот черновик?"
      new_topic: "Черновик новой темы"
      new_private_message: "Черновик нового личного сообщения"
-      topic_reply: "Черновик ответа"
      abandon:
        confirm: "По этой теме есть сохранённый черновик. Что бы вы хотели с ним сделать?"
        yes_value: "Удалить"
@ -1200,7 +1198,6 @@ ru:
        not_first_time: "Не в первый раз?"
        skip_link: "Пропустить эти советы"
        read_later: "Прочитаю позже"
-      reset_seen_popups: "Показывать советы"
      theme_default_on_all_devices: "Сделать эту тему темой по умолчанию на всех моих устройствах"
      color_scheme_default_on_all_devices: "Установить цветовую схему по умолчанию на всех моих устройствах"
      color_scheme: "Цветовая схема"
@ -1813,15 +1810,6 @@ 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: "при попытке загрузки"
@ -2751,9 +2739,6 @@ ru:
      move_to_inbox:
        title: "Переместить во входящие"
        help: "Переместить сообщение во входящие"
-      edit_message:
-        help: "Изменить первое сообщение"
-        title: "Редактировать"
      defer:
        help: "Отметить как непрочитанное"
        title: "Отложить"
@ -3550,8 +3535,6 @@ ru:
      this_year: "за год"
      position: "Позиция на странице раздела:"
      default_position: "Позиция по умолчанию"
-      position_disabled: "Разделы будут отображаться в порядке активности. Чтобы настроить порядок разделов, "
-      position_disabled_click: 'включите настройку "fixed category positions".'
      minimum_required_tags: "Минимальное количество тегов, требуемых в теме:"
      default_slow_mode: 'Включать замедленный режим для тем, создаваемых в этом разделе.'
      parent: "Родительский раздел"
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@ -278,7 +278,6 @@ sk:
      like_count: "Páči sa mi"
      topic_count: "Témy"
      post_count: "Príspevky"
-      user_count: "Používatelia"
      active_user_count: "Aktívni používatelia"
      contact: "Kontaktujte nás"
      contact_info: "V prípade kritickej chyby alebo naliehavej záležitosti nás prosím konaktujte na %{contact_info}."
@ -1485,8 +1484,6 @@ sk:
      move_to_inbox:
        title: "Presunúť do schránky"
        help: "Presunúť správu späť do schránky"
-      edit_message:
-        title: "Upraviť"
      defer:
        title: "Odložiť"
      list: "Témy"
@ -1907,8 +1904,6 @@ sk:
      review_group_name: "názov skupiny"
      this_year: "tento rok"
      default_position: "Predvolená pozícia"
-      position_disabled: "Kategórie budú zobrazené podľa aktivity. Pre možnosť ovládania poradia kategórií v zozname,"
-      position_disabled_click: 'povoľte možnosť "pevné poradie kategórií"'
      parent: "Nadradená kategória"
      notifications:
        watching:
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@ -306,7 +306,6 @@ sl:
      like_count: "Všečki"
      topic_count: "Teme"
      post_count: "Prispevki"
-      user_count: "Uporabniki"
      active_user_count: "Aktivni uporabniki"
      contact: "Pišite nam"
      contact_info: "V primeru kritične napake na strani ali nujne zadeve nam pišite na %{contact_info}."
@ -344,7 +343,6 @@ sl:
      remove: "Odstrani"
      remove_confirmation: "Ali ste prepričani da hočete izbrisati ta osnutek?"
      new_topic: "Nov osnutek teme"
-      topic_reply: "Osnutek odgovora"
      abandon:
        yes_value: "Zavrzi"
    topic_count_categories:
@ -2194,9 +2192,6 @@ sl:
      move_to_inbox:
        title: "Prestavi v Prejeto"
        help: "Prestavi sporočilo nazaj v Prejeto"
-      edit_message:
-        help: "Uredi prvi prispevek sporočila"
-        title: "Uredi"
      defer:
        help: "Označi kot neprebrano"
        title: "Preloži"
@ -2842,8 +2837,6 @@ sl:
      this_year: "to leto"
      position: "Položaj na strani kategorij:"
      default_position: "Privzeta pozicija"
-      position_disabled: "Kategorije bodo razvrščene glede na aktivnost. Za kontrolo razvrščanja kategorij na seznamih, "
-      position_disabled_click: 'omogoči nastavitev "fiksnih položajev kategorij"'
      minimum_required_tags: "Najmanjše število oznak zahtevanih na temi:"
      parent: "Nadrejena kategorija"
      num_auto_bump_daily: "Število odprtih tem, ki se samodejno izpostavijo vsak dan:"
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@ -215,7 +215,6 @@ sq:
      like_count: "Pëlqime"
      topic_count: "Tema"
      post_count: "Postime"
-      user_count: "Anëtarët"
      active_user_count: "Përdorues Aktivë"
      contact: "Na kontaktoni"
      contact_info: "Në rast të një problemi madhor ose të një çështjeje urgjente që prek faqen, ju lutemi të kontaktoni %{contact_info}."
@ -1210,8 +1209,6 @@ sq:
      move_to_inbox:
        title: "Lëviz në Inbox"
        help: "Riktheje mesazhin në inbox"
-      edit_message:
-        title: "Redakto"
      defer:
        title: "Shty"
      list: "Temat"
@ -1589,8 +1586,6 @@ sq:
      review_group_name: "emri i grupit"
      this_year: "këtë vit"
      default_position: "Default Position"
-      position_disabled: "Kategoritue do të renditen sipas aktivitetit. Për të kontrolluar renditjen e kategorive nëpër lista, "
-      position_disabled_click: 'aktivizoni rregullimin "pozicione fikse për kategoritë".'
      parent: "Kategoria prind"
      notifications:
        watching:
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@ -8,200 +8,200 @@ sr:
  js:
    number:
      format:
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
      human:
        storage_units:
          format: "%n %u"
          units:
            byte:
-              one: Bajt
-              few: Bajta
-              other: Bajta
+              one: Бајт
+              few: Бајта
+              other: Бајтова
            gb: GB
            kb: KB
            mb: MB
            tb: TB
      short:
-        thousands: "%{number}k"
-        millions: "%{number}M"
+        thousands: "%{number} хиљ."
+        millions: "%{number} мил."
    dates:
-      time: "HH:mm"
-      time_with_zone: "Hh:mm (z)"
-      time_short_day: "dd, Hh:mm"
+      time: "H.mm"
+      time_with_zone: "HH.mm (z)"
+      time_short_day: "ddd, H.mm"
      timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:Mm"
-      long_no_year_no_time: "D MMM"
-      full_no_year_no_time: "MMMM Do"
-      long_with_year: "D MMM YYYY HH:mm"
-      long_with_year_no_time: "D MMM YYYY"
-      full_with_year_no_time: "MMMM Do, YYYY"
-      long_date_with_year: "MMM D, 'YY LT"
-      long_date_without_year: "MMM D, LT"
-      long_date_with_year_without_time: "MMM D, 'YY"
-      long_date_without_year_with_linebreak: "MMM D <br/>LT"
-      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
-      wrap_ago: "%{date} ranije"
+      long_no_year: "D. MMM, H.mm"
+      long_no_year_no_time: "D. MMM"
+      full_no_year_no_time: "D. MMMM"
+      long_with_year: "D. MMM YYYY H.mm"
+      long_with_year_no_time: "D. MMM YYYY"
+      full_with_year_no_time: "D. MMMM YYYY"
+      long_date_with_year: "D. MMM ’YY LT"
+      long_date_without_year: "D. MMM LT"
+      long_date_with_year_without_time: "D. MMM ’YY"
+      long_date_without_year_with_linebreak: "D. MMM <br/>LT"
+      long_date_with_year_with_linebreak: "D. MMM ’YY <br/>LT"
+      wrap_ago: "пре %{date}"
      wrap_on: "дана %{date}"
      tiny:
-        half_a_minute: "< 1m"
+        half_a_minute: "< 1 мин."
        less_than_x_seconds:
-          one: "< %{count} s"
-          few: "< %{count} s"
-          other: "< %{count} s"
+          one: "< %{count} сек."
+          few: "< %{count} сек."
+          other: "< %{count} сек."
        x_seconds:
-          one: "%{count} sek."
-          few: "%{count} sek."
-          other: "%{count} sek."
+          one: "%{count} сек."
+          few: "%{count} сек."
+          other: "%{count} сек."
        less_than_x_minutes:
-          one: "< %{count}m"
-          few: "< %{count}m"
-          other: "< %{count}m"
+          one: "< %{count} мин."
+          few: "< %{count} мин."
+          other: "< %{count} мин."
        x_minutes:
-          one: "%{count} min"
-          few: "%{count} min"
-          other: "%{count} min"
+          one: "%{count} мин."
+          few: "%{count} мин."
+          other: "%{count} мин."
        about_x_hours:
-          one: "%{count} sat"
-          few: "%{count} sata"
-          other: "%{count} sati"
+          one: "%{count} ч."
+          few: "%{count} ч."
+          other: "%{count} ч."
        x_days:
-          one: "%{count} dan"
-          few: "%{count} dana"
-          other: "%{count} dana"
+          one: "%{count} д."
+          few: "%{count} д."
+          other: "%{count} д."
        x_months:
-          one: "%{count} mes"
-          few: "%{count}mes"
-          other: "%{count}mes"
+          one: "%{count} мес."
+          few: "%{count} мес."
+          other: "%{count} мес."
        about_x_years:
-          one: "%{count} godina"
-          few: "%{count} godine"
-          other: "%{count} godina"
+          one: "%{count} год."
+          few: "%{count} год."
+          other: "%{count} год."
        over_x_years:
-          one: "> %{count} godina"
-          few: "> %{count} godine"
-          other: "> %{count} godina"
+          one: "> %{count} год."
+          few: "> %{count} год."
+          other: "> %{count} год."
        almost_x_years:
-          one: "%{count} godina"
-          few: "%{count} godine"
-          other: "%{count} godina"
-        date_month: "D MMM"
-        date_year: "MMM 'YY"
+          one: "%{count} год."
+          few: "%{count} год."
+          other: "%{count} год."
+        date_month: "D. MMM"
+        date_year: "MMM ’YY"
      medium:
        less_than_x_minutes:
-          one: "manje od %{count} min"
-          few: "manje od %{count} min"
-          other: "manje od %{count} min"
+          one: "мање од %{count} мин."
+          few: "мање од %{count} мин."
+          other: "мање од %{count} мин."
        x_minutes:
-          one: "%{count} min"
-          few: "%{count} min"
-          other: "%{count} min"
+          one: "%{count} мин."
+          few: "%{count} мин."
+          other: "%{count} мин."
        x_hours:
-          one: "%{count} sat"
-          few: "%{count} sata"
-          other: "%{count} sati"
+          one: "%{count} сат"
+          few: "%{count} сата"
+          other: "%{count} сати"
        about_x_hours:
-          one: "oko %{count} sat"
-          few: "oko %{count} sati"
-          other: "oko %{count} sati"
+          one: "око %{count} сат"
+          few: "око %{count} сата"
+          other: "око %{count} сати"
        x_days:
-          one: "%{count} dan"
-          few: "%{count} dana"
-          other: "%{count} dana"
+          one: "%{count} дан"
+          few: "%{count} дана"
+          other: "%{count} дана"
        x_months:
-          one: "%{count} mesec"
-          few: "%{count} meseca"
-          other: "%{count} meseci"
+          one: "%{count} месец"
+          few: "%{count} месеца"
+          other: "%{count} месеци"
        about_x_years:
-          one: "približno %{count} godinu"
-          few: "oko %{count} godine"
-          other: "oko %{count} godina"
-        date_year: "D MMM 'YY"
+          one: "око %{count} године"
+          few: "око %{count} године"
+          other: "око %{count} година"
+        date_year: "D. MMM ’YY"
      medium_with_ago:
        x_minutes:
-          one: "pre %{count} minut"
-          few: "pre %{count} minuta"
-          other: "pre %{count} minuta"
+          one: "%{count} мин. раније"
+          few: "%{count} мин. раније"
+          other: "%{count} мин. раније"
        x_hours:
-          one: "pre %{count} sat"
-          few: "pre %{count} sata"
-          other: "pre %{count} sati"
+          one: "%{count} сат раније"
+          few: "%{count} сата раније"
+          other: "%{count} сати раније"
        x_days:
-          one: "pre %{count} dan"
-          few: "pre %{count} dana"
-          other: "pre %{count} dana"
+          one: "%{count} дан раније"
+          few: "%{count} дана раније"
+          other: "%{count} дана раније"
      later:
        x_days:
-          one: "%{count} dan kasnije"
-          few: "%{count} dana kasnije"
-          other: "%{count} dana kasnije"
+          one: "%{count} дан касније"
+          few: "%{count} дана касније"
+          other: "%{count} дана касније"
        x_months:
-          one: "%{count} mesec kasnije"
-          few: "%{count} meseca kasnije"
-          other: "%{count} meseci kasnije"
+          one: "%{count} месец касније"
+          few: "%{count} месеца касније"
+          other: "%{count} месеци касније"
        x_years:
-          one: "%{count} godina kasnije"
-          few: "%{count} godine kasnije"
-          other: "%{count} godina kasnije"
-      previous_month: "Prethodni mesec"
-      next_month: "Sledeći mesec"
-      placeholder: datum
+          one: "%{count} година касније"
+          few: "%{count} године касније"
+          other: "%{count} година касније"
+      previous_month: "Претходни месец"
+      next_month: "Следећи месец"
+      placeholder: датум
      from_placeholder: "од датума"
      to_placeholder: "до датума"
    share:
-      topic_html: 'Tema: <span class="topic-title">%{topicTitle}</span>'
-      close: "zatvori"
-      twitter: "Podeli na Twitteru"
-      facebook: "Podeli na Facebooku"
-      email: "Pošalji putem e-pošte"
-      url: "Kopiraj i podeli link"
+      topic_html: 'Тема: <span class="topic-title">%{topicTitle}</span>'
+      close: "затвори"
+      twitter: "Подели на Твитеру"
+      facebook: "Подели на Фејсбуку"
+      email: "Пошаљи е-поштом"
+      url: "Копирај и подели линк"
    action_codes:
-      public_topic: "objavi ovu temu javno %{when}"
-      private_topic: "je napravio/la ovu temu kao privatnu poruku %{when}"
-      split_topic: "podeli ovu temu %{when}"
-      invited_user: "pozvan %{who} %{when}"
-      invited_group: "pozvan%{who}%{when}"
-      user_left: "%{who} je sam sebe obrisao iz ove poruke %{when}"
-      removed_user: "uklonjen %{who} %{when}"
-      removed_group: "uklonjen%{who}%{when}"
-      autobumped: "automatski bumpovano %{when}"
+      public_topic: "објављује ову тему %{when}"
+      private_topic: "претвара ову тему у приватну поруку %{when}"
+      split_topic: "раздваја ову тему %{when}"
+      invited_user: "позива корисника %{who} %{when}"
+      invited_group: "позива групу %{who} %{when}"
+      user_left: "%{who} напушта овај разговор %{when}"
+      removed_user: "уклања корисника %{who} %{when}"
+      removed_group: "уклања групу %{who} %{when}"
+      autobumped: "аутоматски ставља на врх %{when}"
      autoclosed:
-        enabled: "zatvoreno %{when}"
-        disabled: "otvoreno %{when}"
+        enabled: "затвара %{when}"
+        disabled: "отвара %{when}"
      closed:
-        enabled: "zatvoreno %{when}"
-        disabled: "otvoreno %{when}"
+        enabled: "затвара %{when}"
+        disabled: "отвара %{when}"
      archived:
-        enabled: "zapakovano %{when}"
-        disabled: "raspakovano %{when}"
+        enabled: "архивира %{when}"
+        disabled: "деархивира %{when}"
      pinned:
-        enabled: "prikačen%{when}"
-        disabled: "otkačen%{when}"
+        enabled: "закачи %{when}"
+        disabled: "откачи %{when}"
      pinned_globally:
-        enabled: "Globalno prikačeno%{when}"
-        disabled: "otkačen%{when}"
+        enabled: "глобално закачи %{when}"
+        disabled: "откачи %{when}"
      visible:
-        enabled: "ulistano %{when}"
-        disabled: "izlistano %{when}"
+        enabled: "укључује %{when}"
+        disabled: "искључује %{when}"
      banner:
-        enabled: "je ovo načinio banerom%{when}. Pojavljivaće se na vrhu svake stranice dok ga korisnik ne ukloni."
-        disabled: "je uklonio ovaj baner%{when}. Više se neće pojavljivati na vrhu svake stranice."
-      forwarded: "je prosledio/la navedenu e-poštu"
-    topic_admin_menu: "opcije teme"
-    emails_are_disabled: "Sva odlazeća epošta je onemogućena globalno od strane administratora. Ni jedna notifikacija neće biti poslata."
+        enabled: "прави транспарент %{when}. Транспарент ће бити приказан на врху сваке странице док га корисник не одбаци."
+        disabled: "уклања овај транспарент %{when}. Транспарент више неће бити приказан на врху сваке странице."
+      forwarded: "прослеђује наведену е-поруку"
+    topic_admin_menu: "радње око теме"
+    emails_are_disabled: "Администратор је глобално онемогућио одлазну е-пошту. Ниједно обавештење неће бити послато."
    software_update_prompt:
-      message: "Ažurirali smo ovaj sajt, <span>molimo vas rifrešujte</span>, u suprotnom može doći do nepredviđenih rezultata."
+      message: "Ажурирали смо сајт. <span>Освежите страницу</span> да бисте избегли непријатности."
      dismiss: "Одбаци"
-    bootstrap_mode_disabled: "Bootstrap mod će biti onemogućen u roku od 24 časa."
+    bootstrap_mode_disabled: "Режим покретања ће бити искључен у року од 24 сата."
    themes:
-      default_description: "zadato"
+      default_description: "Подразумевано"
    s3:
      regions:
-        ap_northeast_1: "Azija Pacifik (Tokio)"
-        ap_northeast_2: "Azija Pacifik (Seul)"
-        ap_east_1: "Azijsko-pacifički region (Hong Kong)"
-        ap_south_1: "Azija Pacifik (Mumbai)"
-        ap_southeast_1: "Azija Pacifik (Singapur)"
+        ap_northeast_1: "Азија-Пацифик (Токио)"
+        ap_northeast_2: "Азија-Пацифик (Сеул)"
+        ap_east_1: "Азија-Пацифик (Хонгконг)"
+        ap_south_1: "Азија-Пацифик (Мумбај)"
+        ap_southeast_1: "Азија-Пацифик (Сингапур)"
        ap_southeast_2: "Azija Pacifik (Sidnej)"
        ca_central_1: "Kanada (centralna)"
        cn_north_1: "Kina (Peking)"
@ -292,7 +292,6 @@ sr:
      like_count: "Sviđanja"
      topic_count: "Teme"
      post_count: "Poruka"
-      user_count: "Korisnici"
      active_user_count: "Aktivni korisnici"
      contact: "Kontaktirajte nas"
      contact_info: "U trenutku kritičnog problema ili hitnog slučaja koji utiče na sajt, molimo vas kontaktirajte nas na %{contact_info}."
@ -337,7 +336,6 @@ sr:
      remove_confirmation: "Da li ste sigurni da želite da uklonite ovaj nacrt?"
      new_topic: "Novi nacrt teme"
      new_private_message: "Nacrt nove privatne poruke"
-      topic_reply: "Nacrt odgovora"
      abandon:
        confirm: "Imate nacrt za ovu temu. Sta želite da učinite sa njim?"
        yes_value: "Odbaci"
@ -1232,8 +1230,6 @@ sr:
      create_long: "Otvori novu Temu"
      archive_message:
        title: "Arhiviraj"
-      edit_message:
-        title: "Izmeni"
      defer:
        title: "Odloži"
      list: "Teme"
@ -1528,8 +1524,6 @@ sr:
      review_group_name: "ime grupe"
      this_year: "ove godine"
      default_position: "Zadana pozicija"
-      position_disabled: "Kategorije će u nizu biti prikazivane po nivou aktivnosti. Za kontrolu redosleda kategorija u listi,"
-      position_disabled_click: 'omogućite postavku "fiksiranje pozicija kategorija" u podešavanjima.'
      parent: "Nadkategorija"
      notifications:
        watching:
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@ -294,7 +294,7 @@ sv:
      like_count: "Gillningar"
      topic_count: "Ämnen"
      post_count: "Inlägg"
-      user_count: "Användare"
+      user_count: "Registreringar"
      active_user_count: "Aktiva användare"
      contact: "Kontakta oss"
      contact_info: "Vid brådskande ärenden rörande webbplatsen, kontakta oss på %{contact_info}."
@ -351,7 +351,6 @@ sv:
      remove_confirmation: "Är du säker på att du vill ta bort detta utkast?"
      new_topic: "Nytt utkast för ämne"
      new_private_message: "Nytt utkast för personligt meddelande"
-      topic_reply: "Svar på utkast"
      abandon:
        confirm: "Du har ett pågående utkast för detta ämne. Vad vill du göra med det?"
        yes_value: "Förkasta"
@ -1087,7 +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"
+      reset_seen_user_tips: "Visa användartips 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"
@ -1675,7 +1674,7 @@ sv:
      set_custom_status: "Ställ in anpassad status"
      what_are_you_doing: "Vad gör du?"
      remove_status: "Ta bort status"
-    popup:
+    user_tips:
      primary: "Jag förstår!"
      secondary: "visa mig inte dessa tips"
      first_notification:
@ -2531,9 +2530,6 @@ sv:
      move_to_inbox:
        title: "Flytta till inkorgen"
        help: "Flytta tillbaka meddelandet till inkorgen"
-      edit_message:
-        help: "Redigera första inlägget av meddelandet"
-        title: "Redigera"
      defer:
        help: "Märk som oläst"
        title: "Skjut upp"
@ -3254,8 +3250,7 @@ sv:
      this_year: "i år"
      position: "Position på kategorisidan:"
      default_position: "Standardposition"
-      position_disabled: "Kategorier kommer att sorteras efter sin aktivitet. För att ställa in sorteringen av kategorier i den här listan "
-      position_disabled_click: 'aktiverar du inställningen "fasta kategoripositioner".'
+      position_disabled: "Kategorier kommer att visas i aktivitetsordning. För att styra ordningen på kategorier i listor, aktivera inställningen <a href='%{url}'>'fasta kategoripositioner'</a>."
      minimum_required_tags: "Minsta antalet taggar som krävs för ett ämne:"
      default_slow_mode: 'Aktivera "Långsamt läge" för nya ämnen i denna kategori.'
      parent: "Överordnad kategori"
@ -5467,6 +5462,7 @@ sv:
        destination: "Mål"
        copy_to_clipboard: "Kopiera permalänk till urklipp"
        delete_confirm: Är du säker på att du vill ta bort den här permalänken?
+        no_permalinks: "Du har inga permalänkar än. Skapa en ny permalänk ovan för att börja se en lista över dina permalänkar här."
        form:
          label: "Ny:"
          add: "Lägg till"
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@ -218,7 +218,6 @@ sw:
      like_count: "Upendo"
      topic_count: "Mada"
      post_count: "Machapisho"
-      user_count: "Watumiaji"
      active_user_count: "Watumiaji wa Mara kwa Mara"
      contact: "Wasiliana Nasi"
      contact_info: "Iwapo kuna suala la muhimu au haraka linalohusiana na mtandao huu, tafadhali wasiliana nasi kupitia %{contact_info}."
@ -1497,9 +1496,6 @@ sw:
      move_to_inbox:
        title: "Hamisha kwenda Kisanduku pokezi"
        help: "Hamisha kwenda Kisanduku pokezi"
-      edit_message:
-        help: "Hariri chapisho la kwanza la ujumbe"
-        title: "Hariri"
      list: "Mada"
      new: "mada mpya"
      unread: "haijasomwa"
@ -1924,7 +1920,6 @@ sw:
      review_group_name: "jina la kikundi"
      this_year: "mwaka huu"
      default_position: "Chaguo Msingi la Nafasi"
-      position_disabled: "Kategoria zitaonyeshwa kulingana na oda ya shughuli. Kudhibiti oda ya kategoria kwenye orodha,"
      minimum_required_tags: "Kiwango cha chini cha lebo zinazohitajika kwenye mada:"
      parent: "Kategoria Miliki"
      notifications:
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@ -156,7 +156,6 @@ te:
      like_count: "ఇష్టాలు"
      topic_count: "విషయాలు"
      post_count: "టపాలు"
-      user_count: "వాడుకరులు"
      active_user_count: "క్రియాశీల సభ్యులు"
      contact: "మమ్ము సంప్రదించండి"
      contact_info: "ఈ సంధర్భంలో క్లిష్టమైన సమస్య లేదా అత్యవసర విషయం సైట్ ను ప్రభావితం చేస్తుంది, దయచేసి మమ్మల్ని సంప్రదించండి %{contact_info}."
@ -849,8 +848,6 @@ te:
    topic:
      create: "కొత్త విషయం"
      create_long: "కొత్త విషయం సృష్టించు"
-      edit_message:
-        title: "సవరించు"
      defer:
        title: "వాయిదావేయి"
      list: "విషయాలు"
@ -1123,8 +1120,6 @@ te:
      review_group_name: "గుంపు పేరు"
      this_year: "ఈ సంవత్సరం"
      default_position: "అప్రమేయ స్థానం"
-      position_disabled: "వర్గాలు కలాపం వరుసలో చూపబడతాయి. జాబితాల్లో వర్గాల వరుసను నియంత్రించడానికి,"
-      position_disabled_click: '"స్థిర వర్గ స్థాయిలు" అమరికను చేతనం చేయండి'
      parent: "తండ్రి వర్గం"
      notifications:
        watching:
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@ -252,7 +252,6 @@ th:
      like_count: "ถูกใจ"
      topic_count: "กระทู้"
      post_count: "โพสต์"
-      user_count: "ผู้ใช้"
      active_user_count: "ผู้ใช้ที่ใช้งานอยู่"
      contact: "ติดต่อเรา"
      contact_info: "ในกรณีที่เกิดเหตุฉุกเฉินหรือประเด็นสำคัญที่ส่งผลต่อเว็บไซต์นี้ กรุณาติดต่อเราที่ %{contact_info}"
@ -291,7 +290,6 @@ th:
      resume: "ดำเนินการต่อ"
      remove: "ลบ"
      new_topic: "แบบร่างกระทู้ใหม่"
-      topic_reply: "ตอบแบบร่าง"
    topic_count_categories:
      other: "ดู %{count} กระทู้ใหม่หรือที่อัปเดต"
    topic_count_latest:
@ -1669,9 +1667,6 @@ th:
      move_to_inbox:
        title: "ย้ายไปกล่องขาเข้า"
        help: "ย้ายข้อความกลับไปกล่องขาเข้า"
-      edit_message:
-        help: "แก้ไขโพสต์แรกของข้อความ"
-        title: "แก้ไข"
      defer:
        help: "ทำเครื่องหมายว่ายังไม่ได้อ่าน"
      list: "กระทู้"
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@ -273,7 +273,6 @@ ur:
      like_count: "لائیکس"
      topic_count: "ٹاپک"
      post_count: "پوسٹ"
-      user_count: "صارفین"
      active_user_count: "متحرک صارفین"
      contact: "ہم سے رابطہ کریں"
      contact_info: "اس سائٹ کے بارے میں کسی اہم مسئلہ یا فوری معاملہ کی صورت میں، براہ مہربانی %{contact_info} پر رابطہ کریں۔"
@ -328,7 +327,6 @@ ur:
      remove_confirmation: "کیا آپ واقعی یہ مسودہ حذف کرنا چاہتے ہیں؟"
      new_topic: "نئے ٹاپک کا ڈرافٹ"
      new_private_message: "نیے ذاتی پیغام کا مسودہ"
-      topic_reply: "جواب ڈرافٹ کریں"
      abandon:
        confirm: "آپ کے پاس اس عنوان کے لئے ایک مسودہ ہے۔ آپ اس کے ساتھ کیا کرنا چاہیں گے؟"
        yes_value: "منسوخ"
@ -2364,9 +2362,6 @@ ur:
      move_to_inbox:
        title: "اِنباکس میں منتقل کریں"
        help: "پیغام واپس اِنباکس میں منتقل کریں"
-      edit_message:
-        help: "پیغام کی پہلی اشاعت میں ترمیم کریں"
-        title: "ترمیم"
      defer:
        help: "بغیر پڑھا نشان زد کریں"
        title: "ملتوی کریں"
@ -3058,8 +3053,6 @@ ur:
      this_year: "اِس سال"
      position: "زمرہ جات کے صفحے پر پوزیشن:"
      default_position: "پہلے سے طے شدہ پوزیشن"
-      position_disabled: "زمرہ جات کو سرگرمی کی ترتیب میں دکھایا جائے گا۔ فہرستوں میں زمروں کی ترتیب کو کنٹرول کرنے کے لیے، "
-      position_disabled_click: '"مقررہ زمرہ جات پوزیشنوں" کی سیٹِنگ فعال کریں۔'
      minimum_required_tags: "ایک ٹاپک میں ضروری ٹیگز کی کم از کم تعداد:"
      default_slow_mode: 'اس زمرے میں نئے عنوانات کے لیے "سلو موڈ" کو فعال کریں۔'
      parent: "بالائی زمرہ"
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@ -261,7 +261,6 @@ vi:
      like_count: "Lượt thích"
      topic_count: "Các chủ đề"
      post_count: "Các bài viết"
-      user_count: "Người dùng"
      active_user_count: "Thành viên tích cực"
      contact: "Liên hệ chúng tôi"
      contact_info: "Trong trường hợp có bất kỳ sự cố nào ảnh hưởng tới trang này, xin vui lòng liên hệ với chúng tôi theo địa chỉ %{contact_info}."
@ -318,7 +317,6 @@ vi:
      remove_confirmation: "Bạn có chắc chắn muốn xóa bản nháp này không?"
      new_topic: "Chủ đề nháp mới"
      new_private_message: "Bản nháp tin nhắn cá nhân mới"
-      topic_reply: "Trả lời nháp"
      abandon:
        confirm: "Bạn đang có một bản nháp cho chủ đề này. Bạn muốn làm gì với nó?"
        yes_value: "Hủy bỏ"
@ -2356,9 +2354,6 @@ vi:
      move_to_inbox:
        title: "Chuyển sang hộp thư"
        help: "Chuyển tin nhắn trở lại hộp thư"
-      edit_message:
-        help: "Chỉnh sửa bài đăng đầu tiên của tin nhắn"
-        title: "Sửa"
      defer:
        help: "đánh dấu là chưa đọc"
        title: "Hoãn"
@ -3031,8 +3026,6 @@ vi:
      this_year: "năm nay"
      position: "Vị trí trên trang danh mục:"
      default_position: "vị trí mặc định"
-      position_disabled: "Chuyên mục sẽ được hiển thị theo thứ tự hoạt động. Để kiểm soát thứ tự chuyên mục trong danh sách, "
-      position_disabled_click: 'bật thiết lập "cố định vị trí chuyên mục".'
      minimum_required_tags: "Số lượng thẻ tối thiểu được yêu cầu trong một chủ đề:"
      default_slow_mode: 'Bật "Chế độ chậm" cho các chủ đề mới trong danh mục này.'
      parent: "Danh mục cha"
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@ -146,7 +146,7 @@ zh_CN:
        enabled: "%{when}公开"
        disabled: "%{when}取消公开"
      banner:
-        enabled: "%{when}将此设置为横幅。在用户关闭前，它将显示在每个页面的顶部。"
+        enabled: "%{when}将此设置为横幅。在用户忽略前，它将显示在每个页面的顶部。"
        disabled: "%{when}移除了此横幅。它将不再显示在每个页面的顶部。"
      forwarded: "转发了上述电子邮件"
    topic_admin_menu: "话题操作"
@ -155,7 +155,7 @@ zh_CN:
    emails_are_disabled_non_staff: "非管理员用户无法向外发送电子邮件。"
    software_update_prompt:
      message: "我们已经更新此站点，请 <span>刷新页面</span>，否则可能会遇到意外行为。"
-      dismiss: "关闭"
+      dismiss: "忽略"
    bootstrap_mode_enabled:
      other: "为了更轻松地启动您的新站点，您现在处于引导模式。所有新用户都将被授予信任级别 1，并且已启用每日摘要电子邮件。引导模式会在达到 %{count} 个用户时自动关闭。"
    bootstrap_mode_disabled: "引导模式将在 24 小时内禁用。"
@ -261,7 +261,6 @@ zh_CN:
      like_count: "赞"
      topic_count: "话题"
      post_count: "帖子"
-      user_count: "用户"
      active_user_count: "活跃用户"
      contact: "联系我们"
      contact_info: "如果出现影响此站点的关键问题或紧急事项，请联系我们：%{contact_info}。"
@ -318,7 +317,6 @@ zh_CN:
      remove_confirmation: "确定要删除此草稿吗？"
      new_topic: "新话题草稿"
      new_private_message: "新个人消息草稿"
-      topic_reply: "草稿回复"
      abandon:
        confirm: "您在此话题下有一个进行中的草稿。您想对它做什么？"
        yes_value: "舍弃"
@ -356,7 +354,7 @@ zh_CN:
    switch_to_anon: "进入匿名模式"
    switch_from_anon: "退出匿名模式"
    banner:
-      close: "关闭此横幅"
+      close: "忽略此横幅"
      edit: "编辑"
    pwa:
      install_banner: "要<a href>在此设备上安装%{title}</a> 吗？"
@ -832,7 +830,7 @@ zh_CN:
          title: "常规"
          description: "您会在别人 @ 您或回复您时收到通知。"
        muted:
-          title: "已设为免打扰"
+          title: "免打扰"
          description: "您不会收到有关此组中消息的任何通知。"
      flair_url: "头像图片"
      flair_upload_description: "使用边长不小于 20px 的正方形图片。"
@ -999,8 +997,8 @@ zh_CN:
        enable: "启用通知"
        each_browser_note: '注意：您必须在您使用的每个浏览器上更改此设置。在“勿扰”模式下，所有通知都将被禁用，无论此设置如何。'
        consent_prompt: "当其他人回复您的帖子时是否接收实时通知？"
-      dismiss: "关闭"
-      dismiss_notifications: "全部关闭"
+      dismiss: "忽略"
+      dismiss_notifications: "全部忽略"
      dismiss_notifications_tooltip: "将所有未读通知标记为已读"
      dismiss_bookmarks_tooltip: "将所有未读书签提醒标记为已读"
      dismiss_messages_tooltip: "将所有未读个人信息通知标记为已读"
@ -1587,15 +1585,6 @@ zh_CN:
      set_custom_status: "设置自定义状态"
      what_are_you_doing: "您在做什么？"
      remove_status: "移除状态"
-    popup:
-      primary: "知道了！"
-      secondary: "不要为我显示这些提示"
-      first_notification:
-        title: "您的第一个通知！"
-        content: "通知用于让您了解社区中发生的最新情况。"
-      topic_timeline:
-        title: "话题时间线"
-        content: "使用话题时间线快速滚动浏览帖子。"
    loading: "正在加载…"
    errors:
      prev_page: "无法加载"
@ -1910,7 +1899,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} 个用户的最大可提及数量限制。没有人会收到通知。"
@ -1946,7 +1935,7 @@ zh_CN:
      reply: "回复"
      cancel: "取消"
      create_topic: "创建话题"
-      create_pm: "消息"
+      create_pm: "发送私信"
      create_whisper: "密语"
      create_shared_draft: "创建共享草稿"
      edit_shared_draft: "编辑共享草稿"
@ -2100,7 +2089,7 @@ zh_CN:
            other: "确定吗？您有 %{count} 个未读书签提醒。"
          messages:
            other: "确定吗？您有 %{count} 条未读个人信息。"
-        dismiss: "关闭"
+        dismiss: "忽略"
        cancel: "取消"
      group_message_summary:
        other: "您的 %{group_name} 收件箱中有 %{count} 条消息"
@ -2328,18 +2317,18 @@ zh_CN:
        reset_bump_dates: "重置提升日期"
        defer: "推迟"
        delete: "删除话题"
-        dismiss: "关闭"
-        dismiss_read: "关闭所有未读话题"
+        dismiss: "忽略"
+        dismiss_read: "忽略所有未读话题"
        dismiss_read_with_selected:
-          other: "关闭 %{count} 个未读"
-        dismiss_button: "关闭…"
+          other: "忽略 %{count} 个未读"
+        dismiss_button: "忽略…"
        dismiss_button_with_selected:
-          other: "关闭（%{count} 个）…"
-        dismiss_tooltip: "仅关闭新帖子或停止跟踪话题"
+          other: "忽略（%{count} 个）…"
+        dismiss_tooltip: "仅忽略新帖子或停止跟踪话题"
        also_dismiss_topics: "停止跟踪这些话题，以便它们不再显示为我的未读话题"
-        dismiss_new: "关闭新话题"
+        dismiss_new: "忽略新话题"
        dismiss_new_with_selected:
-          other: "关闭新话题（%{count} 个）…"
+          other: "忽略新话题（%{count} 个）…"
        toggle: "切换话题批量选择"
        actions: "批量操作"
        change_category: "设置类别…"
@ -2398,9 +2387,6 @@ zh_CN:
      move_to_inbox:
        title: "移至收件箱"
        help: "将消息移回收件箱"
-      edit_message:
-        help: "编辑消息的第一个帖子"
-        title: "编辑"
      defer:
        help: "标记为未读"
        title: "推迟"
@ -2643,7 +2629,7 @@ zh_CN:
          other: "当前全站置顶的话题数：<strong class='badge badge-notification unread'>%{count}</strong>"
        make_banner: "将此话题设为在所有页面顶部显示的横幅。"
        remove_banner: "移除在所有页面顶部显示的横幅。"
-        banner_note: "用户可以通过关闭话题来关闭横幅。任何时候都只能将一个话题设为横幅。"
+        banner_note: "用户可以通过关闭话题来忽略横幅。任何时候都只能将一个话题设为横幅。"
        no_banner_exists: "没有横幅话题。"
        banner_exists: "当前设置了<strong class='badge badge-notification unread'>一个</strong>横幅话题。"
      inviting: "正在邀请…"
@ -2802,7 +2788,7 @@ zh_CN:
      sr_reply_to: "回复 @%{username} 发布的帖子 #%{post_number}"
      notice:
        new_user: "这是 %{user} 首次发帖 - 让我们欢迎他/她加入社区吧！"
-        returning_user: "我们已经有一段时间没有看到 %{user} 了 — 他/他上次发帖是 %{time}。"
+        returning_user: "我们已经有一段时间没有看到 %{user} 了 — 他/她上次发帖是 %{time}。"
      unread: "帖子未读"
      has_replies:
        other: "%{count} 个回复"
@ -3082,8 +3068,6 @@ zh_CN:
      this_year: "今年"
      position: "类别页面上的位置："
      default_position: "默认位置"
-      position_disabled: "类别将按照活动顺序显示。要控制类别在列表中的顺序，"
-      position_disabled_click: '请启用“fixed category positions”设置。'
      minimum_required_tags: "话题中所需的最少标签数："
      default_slow_mode: '为此类别中的新话题启用“慢速模式”。'
      parent: "父类别"
@ -3380,8 +3364,8 @@ zh_CN:
        show_incoming_updated_topics: "%{shortcut} 显示更新的话题"
        search: "%{shortcut} 搜索"
        help: "%{shortcut} 打开键盘帮助"
-        dismiss_new: "%{shortcut} 关闭新话题"
-        dismiss_topics: "%{shortcut} 关闭话题"
+        dismiss_new: "%{shortcut} 忽略新话题"
+        dismiss_topics: "%{shortcut} 忽略话题"
        log_out: "%{shortcut} 退出"
      composing:
        title: "撰写"
@ -3595,7 +3579,7 @@ zh_CN:
      back: "返回"
      forward: "前进"
      share: "分享"
-      dismiss: "关闭"
+      dismiss: "忽略"
    safe_mode:
      enabled: "安全模式已启用，要退出安全模式，请关闭此浏览器窗口"
    image_removed: "（图片被移除）"
@ -3744,7 +3728,7 @@ zh_CN:
        problems_found: "基于您当前站点设置的一些建议"
        new_features:
          title: "\U0001F381 新功能"
-          dismiss: "关闭"
+          dismiss: "忽略"
          learn_more: "了解详情"
        last_checked: "上次检查"
        refresh_problems: "刷新"
@ -4773,7 +4757,7 @@ zh_CN:
          not_listening_to_staff: "不听从管理人员反馈"
          consuming_staff_time: "消耗了过多的管理人员时间"
          combative: "好斗"
-          in_wrong_place: "位置不对"
+          in_wrong_place: "在错误的地方"
          no_constructive_purpose: "除了在社区内引起异议外，他们的行动没有任何建设性的目的"
          custom: "自定义…"
        suspend_message: "电子邮件消息"
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@ -261,7 +261,6 @@ zh_TW:
      like_count: "讚"
      topic_count: "話題"
      post_count: "貼文"
-      user_count: "使用者"
      active_user_count: "活躍使用者"
      contact: "聯絡我們"
      contact_info: "若有重大問題或關係到網站的緊急時間，請透過 %{contact_info} 聯絡我們"
@ -316,7 +315,6 @@ zh_TW:
      remove_confirmation: "您確定要刪除此草稿嗎？"
      new_topic: "新話題草稿"
      new_private_message: "新個人訊息草稿"
-      topic_reply: "回覆草稿"
      abandon:
        confirm: "您有針對此主題的草稿。您想用它做什麼？"
        yes_value: "捨棄"
@ -1932,9 +1930,6 @@ zh_TW:
      move_to_inbox:
        title: "移動到收件匣"
        help: "把訊息移動到收件匣"
-      edit_message:
-        help: "編輯這個訊息的第一篇貼文"
-        title: "編輯"
      defer:
        title: "延遲"
      list: "話題"
@ -2448,8 +2443,7 @@ zh_TW:
      this_year: "今年"
      position: "在分類頁面上的位置："
      default_position: "預設的位置"
-      position_disabled: "分類的顯示將會以活躍度為排序依據。若要控制分類排序方法，"
-      position_disabled_click: '請啟用"固定分類位置"設定'
+      position_disabled: "類別將按活動順序顯示。若要控制清單中類別的順序，請啟用 <a href='%{url}'>「固定類別位置」</a> 設定。"
      minimum_required_tags: "話題標籤的最低要求數量："
      parent: "父分類"
      num_auto_bump_daily: "每日自動上浮的主題數："
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@ -2213,7 +2213,7 @@ ar:
    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: "تم إيقافه: استخدم الإعداد 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`."
@ -2313,7 +2313,6 @@ ar:
    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: "اختيار علامات التبويب المرئية في لوحة المعلومات"
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@ -2001,7 +2001,7 @@ 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: 'VERALTET: Verwende stattdessen die Einstellung secure_uploads, wird in Discourse 3.0 entfernt.'
+    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“."
@ -2101,7 +2101,6 @@ de:
    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 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."
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@ -2004,7 +2004,7 @@ 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_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»."
@ -2104,7 +2104,6 @@ es:
    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."
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@ -1241,7 +1241,6 @@ fa_IR:
    enable_sitemap: "یک نقشه سایت برای سایت خود ایجاد کنید و آن را در پرونده robots.txt قرار دهید."
    sitemap_page_size: "تعداد آدرس‌های اینترنتی که باید در هر صفحه نقشه سایت گنجانده شود. حداکثر ۵۰٫۰۰۰"
    enable_user_status: "(آزمایشی) به کاربران اجازه می‌دهد، که پیام وضعیت را تغییر دهند (شکلک + توضیحات)."
-    enable_onboarding_popups: "(آزمایشی) پنجره‌های بازشونده آموزشی را فعال کنید که ویژگی‌های کلیدی را برای کاربران توضیح دهد"
    use_name_for_username_suggestions: "هنگام پیشنهاد نام‌کاربری از نام کامل، کاربر استفاده کنید."
    errors:
      invalid_email: "آدرس ایمیل نامعتبر"
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@ -2004,7 +2004,7 @@ 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_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."
@ -2104,7 +2104,6 @@ fi:
    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ä."
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@ -2004,7 +2004,7 @@ 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_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 »."
@ -2104,7 +2104,6 @@ fr:
    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."
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@ -67,6 +67,7 @@ he:
      modifier_values: "המחליפים ב־about.json מכילים ערכים שגויים: %{errors}"
      git: "שגיאה בעת שכפול מאגר git, הגישה נדחיתה או שהמאגר לא נמצא"
      git_ref_not_found: "לא ניתן למשוך (checkout) הפניית git:‏ %{ref}"
+      git_unsupported_scheme: "לא ניתן לשבט מאגר git: אין תמיכה בסכמה"
      unpack_failed: "חילוץ הקובץ נכשל"
      file_too_big: "הקובץ גדול מדי ללא דחיסה."
      unknown_file_type: "הקובץ שהעלית הוא כפי הנראה אינה ערכת עיצוב תקנית של Discourse."
@ -690,6 +691,7 @@ he:
      disallowed_topic_tags: "לנושא זה יש תגיות שאסור להשתמש בהן בקטגוריה הזו: ‚%{tags}’"
      disallowed_tags_generic: "לנושא זה יש תגיות אסורות."
      slug_contains_non_ascii_chars: "מכיל תווים שאינם בתחום ASCII"
+      is_already_in_use: "כבר בשימוש"
    cannot_delete:
      uncategorized: "קטגוריה זו נחשבת למיוחדת. היא מיועדת לשימוש כמתחם לנושאים מחוסרי קטגוריה, אין אפשרות למחוק אותה."
      has_subcategories: "לא ניתן להסיר קטגוריה זו משום שיש בה תת־קטגוריות."
@ -1514,6 +1516,7 @@ he:
    search_ignore_accents: "התעלמות מסימנים דיאקריטיים בחיפוש אחר טקסט."
    category_search_priority_low_weight: "משקל שהוחל על הדירוג בעדיפות חיפוש נמוכה בקטגוריות."
    category_search_priority_high_weight: "משקל שהוחל על הדירוג בעדיפות חיפוש גבוהה בקטגוריות."
+    default_composer_category: "הקטגוריה המשמשת לאכלוס מראש של רשימת הקטגוריות הנפתחת בעת יצירת נושא חדש."
    allow_uncategorized_topics: "לאפשר לפתוח נושאים ללא קטגוריה. אזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את ההגדרה הזאת. "
    allow_duplicate_topic_titles: "לאפשר נושאים עם כותרות זהות או כפולות."
    allow_duplicate_topic_titles_category: "לאפשר נושאים עם כותרות זהות, כפולות אם הם לא באותה הקטגוריה. ההגדרה allow_duplicate_topic_titles (לאפשר כותרות נושאים כפולות) חייבת להיות מושבתת."
@ -2110,7 +2113,7 @@ he:
    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: "יצא מכלל שימוש: נא להשתמש בהגדרה 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’ (גודל העלאות מרבי להטמעה כתמונה בקילובתים)."
@ -2210,7 +2213,6 @@ 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: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
@ -2285,6 +2287,7 @@ he:
      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}"
+      invalid_uncategorized_category_setting: "אי אפשר לבחור בקטגוריה שאינה בין הקטגוריות אם הרשאת נושאים שאינם בקטגוריה אסורה"
    placeholder:
      discourse_connect_provider_secrets:
        key: "www.example.com"
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@ -2001,7 +2001,7 @@ 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_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'."
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@ -1952,7 +1952,7 @@ 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_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' 設定よりも小さい場合、その埋め込みを許可します。"
@ -2052,7 +2052,6 @@ ja:
    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: "表示するダッシュボードのタブを選択します。"
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@ -2004,7 +2004,7 @@ 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_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\"."
@ -2104,7 +2104,6 @@ pt_BR:
    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."
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@ -641,6 +641,7 @@ sv:
      disallowed_topic_tags: "Detta ämne har taggar som inte tillåts för kategorin: '%{tags}'"
      disallowed_tags_generic: "Detta ämne har otillåtna taggar."
      slug_contains_non_ascii_chars: "innehåller icke-ascii tecken"
+      is_already_in_use: "används redan"
    cannot_delete:
      uncategorized: "Denna kategori är speciell. Den är avsedd för att innehålla ämnen som inte har en kategori; den kan inte raderas."
      has_subcategories: "Du kan inte ta bort den här kategorin eftersom den har underkategorier."
@ -1411,6 +1412,7 @@ sv:
    search_ignore_accents: "Ignorera accenttecken när du söker efter text."
    category_search_priority_low_weight: "Vikt tillämpad på rangordning vid låg sökprioritet för kategori"
    category_search_priority_high_weight: "Vikt tillämpad på rangordning vid hög sökprioritet för kategori"
+    default_composer_category: "Kategorin som används för att fylla i rullgardinsmenyn för kategori när du skapar ett nytt ämne."
    allow_uncategorized_topics: "Tillåt att ämnen skapas utan en kategori. VARNING: Om det finns några okategoriserade ämnen så måste dessa omkategoriseras innan den här inställningen stängs av."
    allow_duplicate_topic_titles: "Tillåt ämnen med identiska rubriker."
    allow_duplicate_topic_titles_category: "Tillåt ämnen med identiska dubblettitlar om kategorin skiljer sig åt. allow_duplicate_topic_titles måste inaktiveras."
@ -2008,7 +2010,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: 'UTFASAT: Använd inställningen secure_uploads istället, kommer att tas bort i Discourse 3.0.'
+    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'."
@ -2109,7 +2111,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"
+    enable_user_tips: "(experimentell) Aktivera nya användartips 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."
@ -2184,6 +2186,7 @@ sv:
      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."
      delete_rejected_email_after_days: "Den här inställningen kan inte vara lägre än inställningen delete_email_logs_after_days eller större än %{max}"
+      invalid_uncategorized_category_setting: "Kategorin Okategoriserade kan inte väljas om tillåt okategoriserade ämnen inte är tillåtet"
    placeholder:
      discourse_connect_provider_secrets:
        key: "www.exempel.se"
--- a/Show More
+++ b/Show More